Feat/swap opt cw dex 040

smart-contracts/Cargo.toml

@@ -15,6 +15,7 @@ members = [
   "contracts/cl-vault",
   "contracts/merkle-incentives",
   "contracts/range-middleware",
+  "contracts/dex-router-osmosis"
 ]
 
 [workspace.dependencies]
@@ -31,13 +32,15 @@ cw20 = "1.1.2"
 cw20-base = {version = "1.1.2", features = ["library"]}
 cw20-staking = "0.11.1"
 apollo-cw-asset = "0.1.2"
-cw-dex = {git = "https://github.com/quasar-finance/cw-dex", branch = "feat/deprecate-osmo-gamm"}
+mars-owner = "2.0.0"
+quasar-types = { path = "packages/quasar-types" }
+dex-router-osmosis = { path = "contracts/dex-router-osmosis", features = ["library"] }
 
 # SDK
 cosmos-sdk-proto = {version = "0.21.1", default-features = false}
 
 # Osmosis
-osmosis-std = "0.24.0"
+osmosis-std = "0.25.0"
 osmosis-std-derive = "0.20.1"
 
 # Serialization & Tools
@@ -52,6 +55,6 @@ num_enum = "0.7.2"
 base64 = "0.22.0"
 
 # Testing
-cw-multi-test = "1.1.0" # {git = "https://github.com/njerschow/cw-multi-test.git"}
-osmosis-test-tube = "24.0.1"
+cw-multi-test = "1.2.0"
+osmosis-test-tube = "25.0.0"
 proptest = "1.2.0"

smart-contracts/contracts/README.md

@@ -20,7 +20,7 @@ In the smart contracts directory, run:
 docker run --rm -v "$(pwd)":/code \
 --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
 --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-cosmwasm/workspace-optimizer:0.15.0
+cosmwasm/workspace-optimizer:0.16.0
 ```
 this builds all contracts in the contracts directory and places the wasm files in `smart-contracts/artifacts`.
 We need to use the workspace optimizer because we have a separate directory where our packages reside.

smart-contracts/contracts/cl-vault/Cargo.toml

@@ -36,7 +36,7 @@ library = []
 optimize = """docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.15.0
+  cosmwasm/rust-optimizer:0.16.0
 """
 
 [dependencies]
@@ -53,11 +53,10 @@ cw-utils = { workspace = true }
 cw2 = { workspace = true }
 num_enum = { workspace = true }
 apollo-cw-asset = { workspace = true }
+dex-router-osmosis = {workspace = true}
+# cw-dex-osmosis = {workspace = true}
 
 ## todo update this in dex router code first as this has been deprecated
-cw-dex = { workspace = true }
-
-cw-dex-router = {git = "https://github.com/quasar-finance/cw-dex-router", branch = "feat/deprecate-osmo-gamm", features = ["library", "osmosis"]}
 cw-vault-multi-standard = {git = "https://github.com/quasar-finance/cw-vault-standard", branch ="master", features = ["lockup", "force-unlock"]}
 
 [dev-dependencies]

smart-contracts/contracts/cl-vault/src/contract.rs

@@ -113,8 +113,7 @@ pub fn execute(
                     max_slippage,
                     ratio_of_swappable_funds_to_use,
                     twap_window_seconds,
-                    recommended_swap_route,
-                    force_swap_route,
+                    forced_swap_route,
                     claim_after,
                 }) => prepend_claim_msg(
                     &env,
@@ -127,15 +126,13 @@ pub fn execute(
                         max_slippage,
                         ratio_of_swappable_funds_to_use,
                         twap_window_seconds,
-                        recommended_swap_route,
-                        force_swap_route,
+                        forced_swap_route,
                         claim_after,
                     )?,
                 ),
-                crate::msg::ExtensionExecuteMsg::SwapNonVaultFunds {
-                    force_swap_route,
-                    swap_routes,
-                } => execute_swap_non_vault_funds(deps, env, info, force_swap_route, swap_routes),
+                crate::msg::ExtensionExecuteMsg::SwapNonVaultFunds { swap_operations } => {
+                    execute_swap_non_vault_funds(deps, env, info, swap_operations)
+                }
                 crate::msg::ExtensionExecuteMsg::CollectRewards {} => {
                     execute_collect_rewards(deps, env)
                 }

smart-contracts/contracts/cl-vault/src/error.rs

@@ -98,8 +98,8 @@ pub enum ContractError {
     #[error("Cannot force a recommended route if recommended route is passed in as None")]
     TryForceRouteWithoutRecommendedSwapRoute {},
 
-    #[error("Auto compound swap list is empty")]
-    EmptyCompoundAssetList {},
+    #[error("Swap operations for non vault funds swap cannot be empty")]
+    EmptySwapOperations {},
 
     #[error("Migration status is closed")]
     MigrationStatusClosed {},

smart-contracts/contracts/cl-vault/src/helpers/getters.rs

@@ -182,7 +182,6 @@ pub fn get_depositable_tokens(
 
 //     let liquidity_y = delta_y.checked_div(denominator)?;
 
-//     // todo: check this is what we want
 //     Ok((
 //         liquidity_x.atomics().try_into()?,
 //         liquidity_y.atomics().try_into()?,

smart-contracts/contracts/cl-vault/src/helpers/msgs.rs

@@ -1,14 +1,8 @@
-use apollo_cw_asset::AssetInfo;
 use cosmwasm_std::{
     attr, to_json_binary, Addr, Attribute, BankMsg, Coin, CosmosMsg, Deps, DepsMut, Env, Uint128,
     WasmMsg,
 };
-use cw_dex_router::{
-    msg::{
-        BestPathForPairResponse, ExecuteMsg as DexRouterExecuteMsg, QueryMsg as DexRouterQueryMsg,
-    },
-    operations::SwapOperationsListUnchecked,
-};
+use dex_router_osmosis::msg::ExecuteMsg as DexRouterExecuteMsg;
 use osmosis_std::types::{
     cosmos::base::v1beta1::Coin as OsmoCoin,
     osmosis::{
@@ -89,77 +83,28 @@ pub fn swap_msg(deps: &DepsMut, env: &Env, params: SwapParams) -> Result<CosmosM
 
     // we know we have a dex_router, so we can unwrap
     let dex_router_address = dex_router.clone().unwrap();
-    let offer_asset = AssetInfo::Native(params.token_in_denom.to_string());
-    let native = AssetInfo::Native(params.token_out_denom.to_string());
-    let ask_asset = native;
-
-    let recommended_out: Uint128 = match params.recommended_swap_route.clone() {
-        Some(operations) => deps.querier.query_wasm_smart(
-            dex_router_address.to_string(),
-            &DexRouterQueryMsg::SimulateSwapOperations {
-                offer_amount: params.token_in_amount,
-                operations,
-            },
-        )?,
-        None => 0u128.into(),
-    };
-    let best_path: Option<BestPathForPairResponse> = deps.querier.query_wasm_smart(
-        dex_router_address.to_string(),
-        &DexRouterQueryMsg::BestPathForPair {
-            offer_asset: offer_asset.into(),
-            ask_asset: ask_asset.into(),
-            exclude_paths: None,
-            offer_amount: params.token_in_amount,
-        },
-    )?;
-    let best_out = match best_path.clone() {
-        Some(best_path) => best_path.return_amount,
-        None => 0u128.into(),
-    };
 
     // if we need to force the route
-    if params.force_swap_route {
-        match params.recommended_swap_route {
-            Some(recommended_swap_route) => cw_dex_execute_swap_operations_msg(
+    if params.forced_swap_route.is_some() {
+        match params.forced_swap_route {
+            Some(forced_swap_route) => cw_dex_execute_swap_operations_msg(
                 &dex_router_address,
-                recommended_swap_route,
-                params.token_out_min_amount,
-                &params.token_in_denom.to_string(),
+                forced_swap_route,
+                params.token_in_denom.to_string(),
                 params.token_in_amount,
+                params.token_out_denom.to_string(),
+                params.token_out_min_amount,
             ),
             None => Err(ContractError::TryForceRouteWithoutRecommendedSwapRoute {}),
         }
-    } else if best_out.is_zero() && recommended_out.is_zero() {
-        Ok(osmosis_swap_exact_amount_in_msg(
-            env,
-            pool_route,
-            params.token_in_amount,
-            &params.token_in_denom.to_string(),
-            params.token_out_min_amount,
-        ))
-    } else if best_out.ge(&recommended_out) {
-        let operations = best_path
-            .ok_or(ContractError::MissingBestPath {})?
-            .operations
-            .into();
-        cw_dex_execute_swap_operations_msg(
-            &dex_router_address,
-            operations,
-            params.token_out_min_amount,
-            &params.token_in_denom.to_string(),
-            params.token_in_amount,
-        )
     } else {
-        // recommended_out > best_out
-        let recommended_swap_route = params
-            .recommended_swap_route
-            .ok_or(ContractError::MissingRecommendedSwapRoute {})?;
         cw_dex_execute_swap_operations_msg(
             &dex_router_address,
-            recommended_swap_route, // will be some here
-            params.token_out_min_amount,
-            &params.token_in_denom.to_string(),
+            vec![], // will be None here, should it be None?
+            params.token_in_denom.to_string(),
             params.token_in_amount,
+            params.token_out_denom.to_string(),
+            params.token_out_min_amount,
         )
     }
 }
@@ -185,21 +130,22 @@ fn osmosis_swap_exact_amount_in_msg(
 
 fn cw_dex_execute_swap_operations_msg(
     dex_router_address: &Addr,
-    operations: SwapOperationsListUnchecked,
-    token_out_min_amount: Uint128,
-    token_in_denom: &String,
+    path: Vec<SwapAmountInRoute>,
+    token_in_denom: String,
     token_in_amount: Uint128,
+    token_out_denom: String,
+    token_out_min_amount: Uint128,
 ) -> Result<CosmosMsg, ContractError> {
     let swap_msg: CosmosMsg = WasmMsg::Execute {
         contract_addr: dex_router_address.to_string(),
-        msg: to_json_binary(&DexRouterExecuteMsg::ExecuteSwapOperations {
-            operations,
+        msg: to_json_binary(&DexRouterExecuteMsg::Swap {
+            path: Some(path),
+            out_denom: token_out_denom,
             minimum_receive: Some(token_out_min_amount),
             to: None,
-            offer_amount: None,
         })?,
         funds: vec![Coin {
-            denom: token_in_denom.to_string(),
+            denom: token_in_denom,
             amount: token_in_amount,
         }],
     }

smart-contracts/contracts/cl-vault/src/msg.rs

@@ -1,15 +1,14 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{Addr, Decimal, Uint128};
-use cw_dex_router::operations::SwapOperationsListUnchecked;
 use cw_vault_multi_standard::{VaultStandardExecuteMsg, VaultStandardQueryMsg};
+use osmosis_std::types::osmosis::poolmanager::v1beta1::SwapAmountInRoute;
 
 use crate::{
     query::{
         AssetsBalanceResponse, PoolResponse, PositionResponse, RangeAdminResponse,
         UserSharesBalanceResponse, VerifyTickCacheResponse,
     },
     state::{Metadata, VaultConfig},
-    vault::autocompound::SwapAsset,
 };
 
 /// Extension execute messages for an apollo autocompounding vault
@@ -31,10 +30,7 @@ pub enum ExtensionExecuteMsg {
     /// MigrationStep
     MigrationStep { amount_of_users: Uint128 },
     /// SwapNonVaultFunds
-    SwapNonVaultFunds {
-        force_swap_route: bool,
-        swap_routes: Vec<SwapAsset>,
-    },
+    SwapNonVaultFunds { swap_operations: Vec<SwapOperation> },
 }
 
 /// Extension messages for Authz. This interface basically reexports certain vault functionality
@@ -90,10 +86,8 @@ pub struct ModifyRangeMsg {
     pub ratio_of_swappable_funds_to_use: Decimal,
     /// twap window to use in seconds
     pub twap_window_seconds: u64,
-    /// recommended swap route to take
-    pub recommended_swap_route: Option<SwapOperationsListUnchecked>,
-    /// whether or not to force the swap route
-    pub force_swap_route: bool,
+    /// forced swap route to take
+    pub forced_swap_route: Option<Vec<SwapAmountInRoute>>,
     /// claim_after optional field, if we off chain computed that incentives have some forfeit duration. this will be persisted in POSITION state
     pub claim_after: Option<u64>,
 }
@@ -103,6 +97,16 @@ pub struct MergePositionMsg {
     pub position_ids: Vec<u64>,
 }
 
+// struct used by swap.rs on swap non vault funds
+#[cw_serde]
+pub struct SwapOperation {
+    pub token_in_denom: String,
+    pub pool_id_0: u64, // the osmosis pool_id as mandatory to have at least the chance to swap on CL pools
+    pub pool_id_1: u64, // the osmosis pool_id as mandatory to have at least the chance to swap on CL pools
+    pub forced_swap_route_token_0: Option<Vec<SwapAmountInRoute>>,
+    pub forced_swap_route_token_1: Option<Vec<SwapAmountInRoute>>,
+}
+
 /// Extension query messages for an apollo autocompounding vault
 #[cw_serde]
 pub enum ExtensionQueryMsg {

smart-contracts/contracts/cl-vault/src/state.rs

@@ -4,8 +4,8 @@ use crate::{
 };
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Decimal, Decimal256, Uint128};
-use cw_dex_router::operations::SwapOperationsListUnchecked;
 use cw_storage_plus::{Deque, Item, Map};
+use osmosis_std::types::osmosis::poolmanager::v1beta1::SwapAmountInRoute;
 
 /// metadata useful for display purposes
 #[cw_serde]
@@ -28,7 +28,7 @@ pub struct VaultConfig {
     pub performance_fee: Decimal,
     /// Account to receive fee payments
     pub treasury: Addr,
-    /// swap max slippage // TODO: This is unused. This should be used on any swap operations where we pass an offchain computed slippage parameter
+    /// swap max slippage
     pub swap_max_slippage: Decimal,
     /// Dex router address
     pub dex_router: Addr,
@@ -61,7 +61,6 @@ pub const MIGRATION_STATUS: Item<MigrationStatus> = Item::new("migration_status"
 #[cw_serde]
 pub struct PoolConfig {
     pub pool_id: u64,
-    // todo: Verify in instantiate message
     pub token0: String,
     pub token1: String,
 }
@@ -150,9 +149,7 @@ pub struct ModifyRangeState {
     // the twap window to use for the swap in seconds
     pub twap_window_seconds: u64,
     // the recommended path to take for the swap
-    pub recommended_swap_route: Option<SwapOperationsListUnchecked>,
-    // whether or not to force the swap route
-    pub force_swap_route: bool,
+    pub forced_swap_route: Option<Vec<SwapAmountInRoute>>,
 }
 
 pub const MODIFY_RANGE_STATE: Item<Option<ModifyRangeState>> = Item::new("modify_range_state");