support cl pool just query swap

packages/pool/src/concentrated.rs

@@ -0,0 +1,79 @@
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::{Coin, Decimal, Deps, Uint256};
+use ibcx_interface::types::SwapRoute;
+use {Decimal, StdResult};
+
+use crate::{OsmosisPool, PoolError};
+
+#[cw_serde]
+pub struct Pool {
+    #[serde(rename = "@type")]
+    pub type_url: String,
+    pub address: String,
+    pub id: String,
+
+    pub incentives_address: String,
+    pub spread_rewards_address: String,
+
+    pub token0: String,
+    pub token1: String,
+
+    pub current_tick_liquidity: String,
+    pub current_sqrt_price: String,
+    pub current_tick: String,
+    pub tick_spacing: String,
+
+    pub spread_factor: String,
+    pub exponent_at_price_one: String,
+    pub last_liquidity_update: String,
+}
+
+impl OsmosisPool for Pool {
+    fn get_id(&self) -> u64 {
+        self.id.parse().unwrap()
+    }
+
+    fn get_type(&self) -> &str {
+        "concentrated_liquidity_pool"
+    }
+
+    fn get_spread_factor(&self) -> StdResult<Decimal> {
+        self.spread_factor.parse()
+    }
+
+    fn clone_box(&self) -> Box<dyn OsmosisPool> {
+        Box::new(self.clone())
+    }
+
+    fn swap_exact_amount_in(
+        &mut self,
+        deps: &Deps,
+        input_amount: Coin,
+        output_denom: String,
+        min_output_amount: Uint256,
+        spread_factor: Decimal,
+    ) -> Result<Uint256, PoolError> {
+        Ok(SwapRoutes(vec![SwapRoute {
+            pool_id: self.get_id(),
+            token_denom: output_denom,
+        }])
+        .sim_swap_exact_in(&deps.querier, &self.address, input_amount)?
+        .into())
+    }
+
+    fn swap_exact_amount_out(
+        &mut self,
+        deps: &Deps,
+        input_denom: String,
+        max_input_amount: Uint256,
+        output_amount: Coin,
+        spread_factor: Decimal,
+    ) -> Result<Uint256, PoolError> {
+        Ok(SwapRoutes(vec![SwapRoute {
+            pool_id: self.get_id(),
+            token_denom: input_denom,
+        }])
+        .sim_swap_exact_out(&deps.querier, &self.address, output_amount)?
+        .into())
+    }
+}

packages/pool/src/lib.rs

@@ -1,4 +1,4 @@
-mod cl;
+mod concentrated;
 mod error;
 mod sim;
 mod stable;
@@ -13,7 +13,7 @@ use osmosis_std::types::osmosis::poolmanager::v1beta1::PoolRequest;
 pub use error::PoolError;
 pub use sim::Simulator;
 
-pub use cl::Pool as CLPool;
+pub use concentrated::Pool as ConcentratedPool;
 pub use stable::Pool as StablePool;
 pub use weighted::Pool as WeightedPool;
 
@@ -24,8 +24,6 @@ pub trait OsmosisPool {
 
     fn get_spread_factor(&self) -> StdResult<Decimal>;
 
-    fn get_exit_fee(&self) -> StdResult<Decimal>;
-
     fn clone_box(&self) -> Box<dyn OsmosisPool>;
 
     fn swap_exact_amount_in(
@@ -55,7 +53,6 @@ impl Clone for Box<dyn OsmosisPool> {
 #[cw_serde]
 #[serde(untagged)]
 pub enum Pool {
-    CL(CLPool),
     CW {
         #[serde(rename = "@type")]
         type_url: String,
@@ -66,6 +63,7 @@ pub enum Pool {
     },
     Stable(StablePool),
     Weighted(WeightedPool),
+    Concentrated(ConcentratedPool),
 }
 
 impl Pool {
@@ -99,6 +97,7 @@ pub fn query_pools(
             match v.pool {
                 Pool::Stable(p) => Ok(Box::new(p)),
                 Pool::Weighted(p) => Ok(Box::new(p)),
+                Pool::Concentrated(p) => Ok(Box::new(p)),
                 _ => Err(PoolError::UnsupportedPoolType),
             }
         })

packages/pool/src/stable.rs

@@ -295,10 +295,6 @@ impl OsmosisPool for Pool {
         Ok(self.pool_params.swap_fee)
     }
 
-    fn get_exit_fee(&self) -> StdResult<Decimal> {
-        Ok(self.pool_params.exit_fee)
-    }
-
     fn clone_box(&self) -> Box<dyn OsmosisPool> {
         Box::new(self.clone())
     }

packages/pool/src/weighted.rs

@@ -213,15 +213,14 @@ impl OsmosisPool for Pool {
     fn get_id(&self) -> u64 {
         self.id.parse::<u64>().unwrap()
     }
+
     fn get_type(&self) -> &str {
         "weighted_pool"
     }
+
     fn get_spread_factor(&self) -> StdResult<Decimal> {
         Ok(self.pool_params.swap_fee)
     }
-    fn get_exit_fee(&self) -> StdResult<Decimal> {
-        Ok(self.pool_params.exit_fee)
-    }
 
     fn clone_box(&self) -> Box<dyn OsmosisPool> {
         Box::new(self.clone())