chore: add function to aggregate pool fees

White-Whale-Defi-Platform · Jan 10, 2024 · 2efeff4 · 2efeff4
1 parent ac41765
commit 2efeff4
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/white-whale/Cargo.toml b/packages/white-whale/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "white-whale"
-version = "1.1.1"
+version = "1.1.2"
 edition.workspace = true
 authors = ["Kerber0x <[email protected]>"]
 description = "Common White Whale types and utils"

diff --git a/packages/white-whale/src/pool_network/pair.rs b/packages/white-whale/src/pool_network/pair.rs
@@ -1,8 +1,8 @@
-use crate::fee::Fee;
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{Addr, Decimal, StdError, StdResult, Uint128};
 use cw20::Cw20ReceiveMsg;
 
+use crate::fee::Fee;
 use crate::pool_network::asset::{Asset, AssetInfo, PairInfo, PairType};
 
 #[cw_serde]
@@ -160,6 +160,29 @@ impl PoolFee {
 
         Ok(())
     }
+
+    /// aggregates all the fees into a single decimal
+    pub fn aggregate(&self) -> StdResult<Decimal> {
+        let total_fee = {
+            let base_fee = self
+                .protocol_fee
+                .share
+                .checked_add(self.swap_fee.share)?
+                .checked_add(self.burn_fee.share)?;
+
+            #[cfg(feature = "osmosis")]
+            {
+                base_fee.checked_add(self.osmosis_fee.share)?
+            }
+
+            #[cfg(not(feature = "osmosis"))]
+            {
+                base_fee
+            }
+        };
+
+        Ok(total_fee)
+    }
 }
 
 #[cw_serde]

diff --git a/packages/white-whale/src/pool_network/trio.rs b/packages/white-whale/src/pool_network/trio.rs
@@ -176,6 +176,29 @@ impl PoolFee {
 
         Ok(())
     }
+
+    /// aggregates all the fees into a single decimal
+    pub fn aggregate(&self) -> StdResult<Decimal> {
+        let total_fee = {
+            let base_fee = self
+                .protocol_fee
+                .share
+                .checked_add(self.swap_fee.share)?
+                .checked_add(self.burn_fee.share)?;
+
+            #[cfg(feature = "osmosis")]
+            {
+                base_fee.checked_add(self.osmosis_fee.share)?
+            }
+
+            #[cfg(not(feature = "osmosis"))]
+            {
+                base_fee
+            }
+        };
+
+        Ok(total_fee)
+    }
 }
 
 #[cw_serde]