fix: add max_spread param to router operations simulation

White-Whale-Defi-Platform · Sep 3, 2024 · 3e52f55 · 3e52f55
1 parent a96fecb
commit 3e52f55
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,8 +39,8 @@ prost = { version = "0.11.9", default-features = false, features = [
 ] }
 prost-types = { version = "0.11.9", default-features = false }
 # for local development
-#white-whale-std = { path = "packages/white-whale-std" }
-white-whale-std = { version = "1.1.5" }
+white-whale-std = { path = "packages/white-whale-std" }
+#white-whale-std = { version = "1.1.5" }
 white-whale-testing = { path = "./packages/white-whale-testing" }
 cw-multi-test = { version = "0.16.5" }
 uint = "0.9.5"

diff --git a/contracts/liquidity_hub/fee_collector/Cargo.toml b/contracts/liquidity_hub/fee_collector/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fee_collector"
-version = "1.1.7"
+version = "1.1.8"
 authors = ["Kerber0x <[email protected]>"]
 edition.workspace = true
 description = "Contract to collect the fees accrued by the pools and vaults in the liquidity hub"

diff --git a/contracts/liquidity_hub/fee_collector/src/commands.rs b/contracts/liquidity_hub/fee_collector/src/commands.rs
@@ -231,7 +231,7 @@ pub fn aggregate_fees(
                         })?,
                     }))?;
 
-                if balance_response.balance > Uint128::zero() {
+                if balance_response.balance > MINIMUM_AGGREGABLE_BALANCE {
                     // if balance is greater than zero, some swap will occur
                     // Increase the allowance for the cw20 token so the router can perform the swap
                     aggregate_fees_messages.push(CosmosMsg::Wasm(WasmMsg::Execute {
@@ -284,6 +284,7 @@ pub fn aggregate_fees(
                             msg: to_json_binary(&router::QueryMsg::SimulateSwapOperations {
                                 offer_amount: balance,
                                 operations: operations.clone(),
+                                max_spread: Some(Decimal::percent(50u64)),
                             })?,
                         }));
 
@@ -365,7 +366,7 @@ pub fn forward_fees(
                     factory_addr: config.vault_factory.to_string(),
                     factory_type: FactoryType::Vault {
                         start_after: None,
-                        limit: Some(30u32),
+                        limit: Some(60u32),
                     },
                 },
             })?,
@@ -384,7 +385,7 @@ pub fn forward_fees(
                     factory_addr: config.pool_factory.to_string(),
                     factory_type: FactoryType::Pool {
                         start_after: None,
-                        limit: Some(30u32),
+                        limit: Some(60u32),
                     },
                 },
             })?,
@@ -404,7 +405,7 @@ pub fn forward_fees(
                     factory_addr: config.vault_factory.to_string(),
                     factory_type: FactoryType::Vault {
                         start_after: None,
-                        limit: Some(30u32),
+                        limit: Some(60u32),
                     },
                 },
             })?,
@@ -423,7 +424,7 @@ pub fn forward_fees(
                     factory_addr: config.pool_factory.to_string(),
                     factory_type: FactoryType::Pool {
                         start_after: None,
-                        limit: Some(30u32),
+                        limit: Some(60u32),
                     },
                 },
             })?,

diff --git a/contracts/liquidity_hub/fee_collector/src/tests/integration.rs b/contracts/liquidity_hub/fee_collector/src/tests/integration.rs
@@ -814,7 +814,7 @@ fn collect_cw20_fees_for_specific_contracts_successfully() {
                 amount: Uint128::new(200_000u128),
                 msg: to_json_binary(&pool_network::pair::Cw20HookMsg::Swap {
                     belief_price: None,
-                    max_spread: Some(Decimal::percent(30u64)),
+                    max_spread: Some(Decimal::percent(50u64)),
                     to: None,
                 })
                 .unwrap(),
@@ -3311,7 +3311,7 @@ fn collect_and_distribute_fees_successfully() {
                     amount: Uint128::new(200_000u128),
                 },
                 belief_price: None,
-                max_spread: Some(Decimal::percent(30u64)),
+                max_spread: Some(Decimal::percent(50u64)),
                 to: None,
             },
             &[Coin {
@@ -4737,7 +4737,7 @@ fn collect_and_distribute_fees_with_expiring_epoch_successfully() {
                 amount: Uint128::new(200_000u128),
             },
             belief_price: None,
-            max_spread: Some(Decimal::percent(30u64)),
+            max_spread: Some(Decimal::percent(50u64)),
             to: None,
         },
         &[Coin {

diff --git a/contracts/liquidity_hub/pool-network/stableswap_3pool/Cargo.toml b/contracts/liquidity_hub/pool-network/stableswap_3pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stableswap-3pool"
-version = "1.2.5"
+version = "1.2.6"
 authors = ["Adam J. Weigold <[email protected]>"]
 edition.workspace = true
 license.workspace = true

diff --git a/contracts/liquidity_hub/pool-network/stableswap_3pool/src/commands.rs b/contracts/liquidity_hub/pool-network/stableswap_3pool/src/commands.rs
@@ -455,17 +455,12 @@ pub fn swap(
         amount: swap_computation.return_amount,
     };
 
-    let fees = swap_computation
-        .swap_fee_amount
-        .checked_add(swap_computation.protocol_fee_amount)?
-        .checked_add(swap_computation.burn_fee_amount)?;
-
     // check max spread limit if exist
     swap::assert_max_spread(
         belief_price,
         max_spread,
         offer_asset.amount,
-        return_asset.amount.checked_add(fees)?,
+        return_asset.amount,
         swap_computation.spread_amount,
     )?;
 

diff --git a/contracts/liquidity_hub/pool-network/terraswap_factory/Cargo.toml b/contracts/liquidity_hub/pool-network/terraswap_factory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "terraswap-factory"
-version = "1.2.4"
+version = "1.2.5"
 authors = [
   "Terraform Labs, PTE.",
   "DELIGHT LABS",

diff --git a/contracts/liquidity_hub/pool-network/terraswap_factory/src/state.rs b/contracts/liquidity_hub/pool-network/terraswap_factory/src/state.rs
@@ -57,7 +57,7 @@ pub fn trio_key(asset_infos: &[AssetInfoRaw; 3]) -> Vec<u8> {
 }
 
 // settings for pagination
-const MAX_LIMIT: u32 = 30;
+const MAX_LIMIT: u32 = 60;
 const DEFAULT_LIMIT: u32 = 10;
 pub fn read_pairs(
     storage: &dyn Storage,

diff --git a/contracts/liquidity_hub/pool-network/terraswap_pair/Cargo.toml b/contracts/liquidity_hub/pool-network/terraswap_pair/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "terraswap-pair"
-version = "1.3.7"
+version = "1.3.8"
 authors = [
   "Terraform Labs, PTE.",
   "DELIGHT LABS",

diff --git a/contracts/liquidity_hub/pool-network/terraswap_pair/src/commands.rs b/contracts/liquidity_hub/pool-network/terraswap_pair/src/commands.rs
@@ -411,29 +411,12 @@ pub fn swap(
         amount: swap_computation.return_amount,
     };
 
-    let fees = {
-        let base_fees = swap_computation
-            .swap_fee_amount
-            .checked_add(swap_computation.protocol_fee_amount)?
-            .checked_add(swap_computation.burn_fee_amount)?;
-
-        #[cfg(feature = "osmosis")]
-        {
-            base_fees.checked_add(swap_computation.osmosis_fee_amount)?
-        }
-
-        #[cfg(not(feature = "osmosis"))]
-        {
-            base_fees
-        }
-    };
-
     // check max spread limit if exist
     swap::assert_max_spread(
         belief_price,
         max_spread,
         offer_asset.amount,
-        return_asset.amount.checked_add(fees)?,
+        return_asset.amount,
         swap_computation.spread_amount,
     )?;