Swap non vault funds

smart-contracts/osmosis/contracts/cl-vault/schema/cl-vault.json

@@ -575,6 +575,14 @@
                     "items": {
                       "$ref": "#/definitions/SwapOperation"
                     }
+                  },
+                  "twap_window_seconds": {
+                    "type": [
+                      "integer",
+                      "null"
+                    ],
+                    "format": "uint64",
+                    "minimum": 0.0
                   }
                 },
                 "additionalProperties": false
@@ -710,12 +718,12 @@
       "SwapOperation": {
         "type": "object",
         "required": [
-          "pool_id_0",
-          "pool_id_1",
+          "pool_id_base",
+          "pool_id_quote",
           "token_in_denom"
         ],
         "properties": {
-          "forced_swap_route_token_0": {
+          "forced_swap_route_base": {
             "type": [
               "array",
               "null"
@@ -724,7 +732,7 @@
               "$ref": "#/definitions/SwapAmountInRoute"
             }
           },
-          "forced_swap_route_token_1": {
+          "forced_swap_route_quote": {
             "type": [
               "array",
               "null"
@@ -733,12 +741,12 @@
               "$ref": "#/definitions/SwapAmountInRoute"
             }
           },
-          "pool_id_0": {
+          "pool_id_base": {
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
           },
-          "pool_id_1": {
+          "pool_id_quote": {
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0

smart-contracts/osmosis/contracts/cl-vault/schema/raw/execute.json

@@ -455,6 +455,14 @@
                   "items": {
                     "$ref": "#/definitions/SwapOperation"
                   }
+                },
+                "twap_window_seconds": {
+                  "type": [
+                    "integer",
+                    "null"
+                  ],
+                  "format": "uint64",
+                  "minimum": 0.0
                 }
               },
               "additionalProperties": false
@@ -590,12 +598,12 @@
     "SwapOperation": {
       "type": "object",
       "required": [
-        "pool_id_0",
-        "pool_id_1",
+        "pool_id_base",
+        "pool_id_quote",
         "token_in_denom"
       ],
       "properties": {
-        "forced_swap_route_token_0": {
+        "forced_swap_route_base": {
           "type": [
             "array",
             "null"
@@ -604,7 +612,7 @@
             "$ref": "#/definitions/SwapAmountInRoute"
           }
         },
-        "forced_swap_route_token_1": {
+        "forced_swap_route_quote": {
           "type": [
             "array",
             "null"
@@ -613,12 +621,12 @@
             "$ref": "#/definitions/SwapAmountInRoute"
           }
         },
-        "pool_id_0": {
+        "pool_id_base": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0
         },
-        "pool_id_1": {
+        "pool_id_quote": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0

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

@@ -77,10 +77,9 @@ pub fn execute(
 ) -> Result<Response, ContractError> {
     match msg {
         cw_vault_multi_standard::VaultStandardExecuteMsg::AnyDeposit {
-            amount: _,
-            asset: _,
             recipient,
             max_slippage,
+            .. // asset and amount fields are not used in this implementation, they are for CW20 tokens
         } => execute_any_deposit(deps, env, info, recipient, max_slippage),
         cw_vault_multi_standard::VaultStandardExecuteMsg::ExactDeposit { recipient } => {
             execute_exact_deposit(deps, env, info, recipient)
@@ -137,9 +136,10 @@ pub fn execute(
                         claim_after,
                     )?,
                 ),
-                crate::msg::ExtensionExecuteMsg::SwapNonVaultFunds { swap_operations } => {
-                    execute_swap_non_vault_funds(deps, env, info, swap_operations)
-                }
+                crate::msg::ExtensionExecuteMsg::SwapNonVaultFunds {
+                    swap_operations,
+                    twap_window_seconds,
+                } => execute_swap_non_vault_funds(deps, env, swap_operations, twap_window_seconds),
                 crate::msg::ExtensionExecuteMsg::CollectRewards {} => {
                     execute_collect_rewards(deps, env)
                 }

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

@@ -24,6 +24,9 @@ pub enum ContractError {
     #[error("Position Not Found")]
     PositionNotFound,
 
+    #[error("Pool Id not provided")]
+    PoolIdNotProvided {},
+
     #[error("Sent the wrong amount of denoms")]
     IncorrectAmountFunds,
 
@@ -33,6 +36,9 @@ pub enum ContractError {
     #[error("ratio_of_swappable_funds_to_use should be >0 and <=1")]
     InvalidRatioOfSwappableFundsToUse,
 
+    #[error("Invalid swap direction")]
+    InvalidSwapDirection,
+
     #[error("Cannot do two swaps at the same time")]
     SwapInProgress,
 

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

@@ -14,7 +14,7 @@ use crate::{
 };
 use cosmwasm_std::{
     Addr, Coin, Decimal, Decimal256, Deps, DepsMut, Env, Fraction, QuerierWrapper, Storage,
-    Uint128, Uint256,
+    Timestamp, Uint128, Uint256,
 };
 
 use super::coinlist::CoinList;
@@ -27,8 +27,8 @@ pub fn get_range_admin(deps: Deps) -> Result<Addr, ContractError> {
 pub fn get_asset0_value(
     storage: &dyn Storage,
     querier: &QuerierWrapper,
-    token0: Uint128,
-    token1: Uint128,
+    token0_amount: Uint128,
+    token1_amount: Uint128,
 ) -> Result<Uint128, ContractError> {
     let pool_config = POOL_CONFIG.load(storage)?;
 
@@ -38,26 +38,50 @@ pub fn get_asset0_value(
         .spot_price
         .parse()?;
 
-    let total = token0
-        .checked_add(token1.multiply_ratio(spot_price.denominator(), spot_price.numerator()))?;
+    let total = token0_amount.checked_add(
+        token1_amount.multiply_ratio(spot_price.denominator(), spot_price.numerator()),
+    )?;
 
     Ok(total)
 }
 
-pub fn get_twap_price(
+pub fn get_position_balance(
     storage: &dyn Storage,
     querier: &QuerierWrapper,
-    env: &Env,
+) -> Result<(Decimal, Decimal), ContractError> {
+    let position = get_position(storage, querier)?;
+    let asset0_amount = Uint128::from_str(&position.clone().asset0.unwrap_or_default().amount)?;
+    let asset1_amount = Uint128::from_str(&position.clone().asset1.unwrap_or_default().amount)?;
+
+    // Handle cases where either asset amount is zero
+    if asset0_amount.is_zero() && asset1_amount.is_zero() {
+        return Ok((Decimal::zero(), Decimal::zero()));
+    }
+
+    // Get the total amount of the vault's position in asset0 denom
+    let asset_0_value = get_asset0_value(storage, querier, asset0_amount, asset1_amount)?;
+
+    // Calculate the ratio of the vault's position in asset0 and asset1 using Decimal for safe division
+    let asset_0_ratio = Decimal::from_ratio(asset0_amount, asset_0_value);
+    let asset_1_ratio = Decimal::from_ratio(asset1_amount, asset_0_value);
+
+    Ok((asset_0_ratio, asset_1_ratio))
+}
+
+pub fn get_twap_price(
+    querier: &QuerierWrapper,
+    block_time: Timestamp,
     twap_window_seconds: u64,
+    pool_id: u64,
+    token0_denom: String,
+    token1_denom: String,
 ) -> Result<Decimal, ContractError> {
-    let pool_config = POOL_CONFIG.load(storage)?;
-
     let twap_querier = TwapQuerier::new(querier);
-    let start_of_window = env.block.time.minus_seconds(twap_window_seconds);
+    let start_of_window = block_time.minus_seconds(twap_window_seconds);
     let twap_price = twap_querier.arithmetic_twap_to_now(
-        pool_config.pool_id,
-        pool_config.token0,
-        pool_config.token1,
+        pool_id,
+        token0_denom,
+        token1_denom,
         Some(OsmoTimestamp {
             seconds: start_of_window.seconds().try_into()?,
             nanos: 0,
@@ -101,16 +125,15 @@ pub fn get_depositable_tokens(
         position.asset0.unwrap_or_default().try_into()?,
         position.asset1.unwrap_or_default().try_into()?,
     );
-    compute_deposit_and_refund_tokens(&assets, token0, token1)
+    compute_deposit_and_refund_tokens(&assets, (token0.amount, token1.amount))
 }
 
 fn compute_deposit_and_refund_tokens(
     assets: &PoolAssets,
-    provided_base: Coin,
-    provided_quote: Coin,
+    tokens_provided: (Uint128, Uint128),
 ) -> Result<DepositInfo, ContractError> {
-    let provided_base_amount: Uint256 = provided_base.amount.into();
-    let provided_quote_amount: Uint256 = provided_quote.amount.into();
+    let provided_base_amount: Uint256 = tokens_provided.0.into();
+    let provided_quote_amount: Uint256 = tokens_provided.1.into();
 
     let base_deposit = if assets.quote.amount.is_zero() {
         provided_base_amount
@@ -393,7 +416,8 @@ mod tests {
             base: token0.clone(),
             quote: token1.clone(),
         };
-        let result = compute_deposit_and_refund_tokens(&assets, token0, token1).unwrap();
+        let result =
+            compute_deposit_and_refund_tokens(&assets, (token0.amount, token1.amount)).unwrap();
         assert_eq!(
             result,
             DepositInfo {
@@ -423,7 +447,8 @@ mod tests {
             },
             quote: token1.clone(),
         };
-        let result = compute_deposit_and_refund_tokens(&assets, token0, token1).unwrap();
+        let result =
+            compute_deposit_and_refund_tokens(&assets, (token0.amount, token1.amount)).unwrap();
         assert_eq!(
             result,
             DepositInfo {
@@ -453,7 +478,8 @@ mod tests {
             },
             base: token0.clone(),
         };
-        let result = compute_deposit_and_refund_tokens(&assets, token0, token1).unwrap();
+        let result =
+            compute_deposit_and_refund_tokens(&assets, (token0.amount, token1.amount)).unwrap();
         assert_eq!(
             result,
             DepositInfo {
@@ -480,9 +506,11 @@ mod tests {
             base: token0.clone(),
             quote: token1.clone(),
         };
-        let result =
-            compute_deposit_and_refund_tokens(&assets, coin(2000, "token0"), coin(5000, "token1"))
-                .unwrap();
+        let result = compute_deposit_and_refund_tokens(
+            &assets,
+            (coin(2000, "token0").amount, coin(5000, "token1").amount),
+        )
+        .unwrap();
         assert_eq!(
             result,
             DepositInfo {
@@ -509,9 +537,11 @@ mod tests {
             base: token0.clone(),
             quote: token1.clone(),
         };
-        let result =
-            compute_deposit_and_refund_tokens(&assets, coin(2000, "token0"), coin(3000, "token1"))
-                .unwrap();
+        let result = compute_deposit_and_refund_tokens(
+            &assets,
+            (coin(2000, "token0").amount, coin(3000, "token1").amount),
+        )
+        .unwrap();
         assert_eq!(
             result,
             DepositInfo {