Merge branch 'main' into feat/archway_deployment

White-Whale-Defi-Platform · Sep 2, 2024 · 3ae418f · 3ae418f
2 parents f48673a + 0e8c174
commit 3ae418f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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.6"
+version = "1.1.7"
 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
@@ -273,35 +273,57 @@ pub fn aggregate_fees(
                 Ok(operations) => {
                     let execute_swap_operations_msg =
                         to_json_binary(&router::ExecuteMsg::ExecuteSwapOperations {
-                            operations,
+                            operations: operations.clone(),
                             minimum_receive: None,
                             to: None,
                             max_spread: Some(Decimal::percent(50u64)),
                         })?;
-
-                    match offer_asset_info.clone() {
-                        AssetInfo::Token { contract_addr } => {
-                            aggregate_fees_messages.push(CosmosMsg::Wasm(WasmMsg::Execute {
-                                contract_addr,
-                                funds: vec![],
-                                msg: to_json_binary(&Cw20ExecuteMsg::Send {
-                                    contract: config.pool_router.to_string(),
-                                    amount: balance,
-                                    msg: execute_swap_operations_msg,
-                                })?,
-                            }));
+                    let operations_simulation: StdResult<router::SimulateSwapOperationsResponse> =
+                        deps.querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
+                            contract_addr: config.pool_router.to_string(),
+                            msg: to_json_binary(&router::QueryMsg::SimulateSwapOperations {
+                                offer_amount: balance,
+                                operations: operations.clone(),
+                            })?,
+                        }));
+
+                    match operations_simulation {
+                        Ok(_) => {
+                            if balance < MINIMUM_AGGREGABLE_BALANCE {
+                                continue;
+                            }
+                            match offer_asset_info.clone() {
+                                AssetInfo::Token { contract_addr } => {
+                                    aggregate_fees_messages.push(CosmosMsg::Wasm(
+                                        WasmMsg::Execute {
+                                            contract_addr,
+                                            funds: vec![],
+                                            msg: to_json_binary(&Cw20ExecuteMsg::Send {
+                                                contract: config.pool_router.to_string(),
+                                                amount: balance,
+                                                msg: execute_swap_operations_msg,
+                                            })?,
+                                        },
+                                    ));
+                                }
+                                AssetInfo::NativeToken { denom } => {
+                                    aggregate_fees_messages.push(CosmosMsg::Wasm(
+                                        WasmMsg::Execute {
+                                            contract_addr: config.pool_router.to_string(),
+                                            funds: vec![Coin {
+                                                denom,
+                                                amount: balance,
+                                            }],
+                                            msg: execute_swap_operations_msg,
+                                        },
+                                    ));
+                                }
+                            };
                         }
-                        AssetInfo::NativeToken { denom } => {
-                            aggregate_fees_messages.push(CosmosMsg::Wasm(WasmMsg::Execute {
-                                contract_addr: config.pool_router.to_string(),
-                                funds: vec![Coin {
-                                    denom,
-                                    amount: balance,
-                                }],
-                                msg: execute_swap_operations_msg,
-                            }));
+                        Err(_) => {
+                            continue;
                         }
-                    };
+                    }
                 }
                 Err(_) => {
                     // if there is no swap route, skip swap and keep the asset in contract