Feat/earn liquidity

Cargo.toml

@@ -15,11 +15,11 @@ schemars = "0.8.1"
 cosmwasm-schema = "1.1.4"
 cw-utils = "0.13"
 anyhow = "1"
-elys-bindings = { version = "0.7.0", git = "https://github.com/elys-network/bindings", tag = "v0.7.0" }
+elys-bindings = { version = "0.8.0", git = "https://github.com/elys-network/bindings", tag = "v0.8.0" }
 
 [dev-dependencies]
 cw-multi-test = "0.13.4"
-elys-bindings = { version = "0.7.0", git = "https://github.com/elys-network/bindings", tag = "v0.7.0", features = [
+elys-bindings = { version = "0.8.0", git = "https://github.com/elys-network/bindings", tag = "v0.8.0", features = [
     "testing",
 ] }
 

src/action/mod.rs

@@ -29,6 +29,7 @@ pub mod query {
         mod get_delegations;
         mod get_unbonding_delegations;
         mod get_commitments;
+        mod get_pools;
 
         use cosmwasm_std::Deps;
         use crate::ContractError;
@@ -41,5 +42,6 @@ pub mod query {
         pub use get_delegations::get_delegations;
         pub use get_unbonding_delegations::get_unbonding_delegations;
         pub use get_commitments::get_commitments;
+        pub use get_pools::get_pools;
     }
 }

src/action/query/earn/get_pools.rs

@@ -0,0 +1,9 @@
+use super::*;
+use crate::{bindings::{querier::ElysQuerier, query::ElysQuery}, msg::query_resp::earn::{FilterType, QueryEarnPoolResponse}};
+use crate::types::PageRequest;
+
+pub fn get_pools(deps: Deps<ElysQuery>, pool_ids: Option<Vec<u64>>, filter_type: FilterType, pagination: Option<PageRequest>) -> Result<QueryEarnPoolResponse, ContractError> {
+    let querier = ElysQuerier::new(&deps.querier);
+    let resp = querier.get_all_pools(pool_ids, filter_type as i32, pagination)?;
+    Ok(resp)
+}

src/bindings/querier.rs

@@ -13,7 +13,8 @@ use super::{
         QueryGetPriceResponse},
 };
 
-use crate::types::{BalanceBorrowed, QueryAprResponse};
+use crate::msg::query_resp::earn::QueryEarnPoolResponse;
+use crate::types::{BalanceBorrowed, QueryAprResponse, PageRequest};
 use elys_bindings::types::BalanceAvailable;
 
 #[allow(dead_code)]
@@ -179,4 +180,12 @@ impl<'a> ElysQuerier<'a> {
         let resp: QueryGetPriceResponse = self.querier.query(&request)?;
         Ok(resp)
     }
+
+    pub fn get_all_pools(&self, pool_ids: Option<Vec<u64>>, filter_type: i32, pagination: Option<PageRequest>) -> StdResult<QueryEarnPoolResponse> {
+        let pools_query = ElysQuery::get_all_pools(pool_ids, filter_type, pagination);
+        let request: QueryRequest<ElysQuery> = QueryRequest::Custom(pools_query);
+
+        let resp: QueryEarnPoolResponse = self.querier.query(&request)?;
+        Ok(resp)
+    }
 }

src/bindings/query.rs

@@ -1,7 +1,7 @@
 #[allow(unused_imports)]
 use super::query_resp::*;
 #[allow(unused_imports)]
-use crate::types::{BalanceBorrowed, QueryAprResponse};
+use crate::types::{BalanceBorrowed, QueryAprResponse, PageRequest};
 #[allow(unused_imports)]
 use elys_bindings::types::BalanceAvailable;
 
@@ -10,6 +10,9 @@ use cosmwasm_schema::{cw_serde, QueryResponses};
 #[allow(unused_imports)]
 use cosmwasm_std::{CustomQuery, Decimal, Coin};
 
+#[allow(unused_imports)]
+use crate::msg::query_resp::earn::QueryEarnPoolResponse;
+
 #[cw_serde]
 #[derive(QueryResponses)]
 pub enum ElysQuery {
@@ -44,7 +47,9 @@ pub enum ElysQuery {
     #[returns(Decimal)]
     AmmPriceByDenom{token_in: Coin, discount: Decimal},
     #[returns(QueryGetPriceResponse)]
-    OraclePrice{asset: String, source: String, timestamp: u64}
+    OraclePrice{asset: String, source: String, timestamp: u64},
+    #[returns(QueryEarnPoolResponse)]
+    AmmEarnMiningPoolAll{pool_ids: Option<Vec<u64>>, filter_type: i32, pagination: Option<PageRequest>}
 }
 
 impl CustomQuery for ElysQuery {}
@@ -97,4 +102,7 @@ impl ElysQuery {
     pub fn get_oracle_price(asset: String, source: String, timestamp: u64) -> Self {
         ElysQuery::OraclePrice{ asset, source, timestamp }
     }
+    pub fn get_all_pools(pool_ids: Option<Vec<u64>>, filter_type: i32, pagination: Option<PageRequest>) -> Self {
+        ElysQuery::AmmEarnMiningPoolAll{ pool_ids, filter_type, pagination }
+    }
 }

src/bindings/query_resp.rs

@@ -134,4 +134,4 @@ pub struct Price {
 #[cw_serde]
 pub struct QueryGetPriceResponse {
 	pub price: Price,
-}
+}

src/entry_point/query.rs

@@ -28,5 +28,8 @@ pub fn query(deps: Deps<ElysQuery>, _env: Env, msg: QueryMsg) -> Result<Binary,
         GetDelegations { delegator_addr } => Ok(to_json_binary(&earn::get_delegations(deps, delegator_addr)?)?),
         GetUnbondingDelegations { delegator_addr } => Ok(to_json_binary(&earn::get_unbonding_delegations(deps, delegator_addr)?)?),
         GetCommitments { delegator_addr } => Ok(to_json_binary(&earn::get_commitments(deps, delegator_addr)?)?),
+
+        // Liquidity Pools
+        GetLiquidityPools { pool_ids, filter_type, pagination} => Ok(to_json_binary(&earn::get_pools(deps, pool_ids, filter_type, pagination)?)?),
     }
 }

src/msg/mod.rs

@@ -33,5 +33,7 @@ pub mod query_resp {
         pub use get_elys_earn_details_resp::GetElysEarnProgramResp;
         mod get_usdc_earn_details_resp;
         pub use get_usdc_earn_details_resp::GetUsdcEarnProgramResp;
+        mod get_pool_resp;
+        pub use get_pool_resp::{QueryEarnPoolResponse, FilterType};
     }
 }

src/msg/query_msg.rs

@@ -5,6 +5,8 @@ use super::query_resp::earn::*;
 use cosmwasm_schema::{cw_serde, QueryResponses};
 #[allow(unused_imports)]
 use crate::bindings::query_resp::*;
+#[allow(unused_imports)]
+use crate::types::PageRequest;
 
 #[cw_serde]
 #[derive(QueryResponses)]
@@ -44,4 +46,6 @@ pub enum QueryMsg {
     GetUnbondingDelegations { delegator_addr: String },
     #[returns(QueryShowCommitmentsResponse)]
     GetCommitments { delegator_addr: String },
+    #[returns(QueryEarnPoolResponse)]
+    GetLiquidityPools { pool_ids: Option<Vec<u64>>, filter_type: FilterType, pagination: Option<PageRequest> },
 }

src/msg/query_resp/earn/get_pool_resp.rs

@@ -0,0 +1,34 @@
+
+use cosmwasm_std::{Decimal, Uint128, Coin};
+use cosmwasm_schema::cw_serde;
+
+#[cw_serde]
+pub enum FilterType {
+    FilterAll = 0,
+	FilterPerpetual = 1,
+	FilterFixedWeight = 2,
+	FilterDynamicWeight = 3,
+}
+
+#[cw_serde]
+pub struct PoolAsset {
+    pub token: Coin, 
+    pub weight: Uint128,
+}
+
+#[cw_serde]
+pub struct PoolResp {
+    pub assets: Vec<PoolAsset>, // eg : [{{"denom":"uatom", "amount":"1000"}, "weight":"10"}, {{"denom":"uusdc", "amount":"100"}, "weight":"1"}, ...]
+    pub pool_ratio: Decimal,
+    pub dex_apr: Decimal,
+    pub eden_apr: Decimal,
+    pub leverage_lp: Decimal,
+    pub perpetual: Decimal,
+    pub tvl: Decimal,
+    pub rewards: Decimal,
+}
+
+#[cw_serde]
+pub struct QueryEarnPoolResponse {
+    pub pools: Option<Vec<PoolResp>>,
+}

src/types/mod.rs

@@ -73,4 +73,4 @@ pub use page_response::PageResponse;
 pub mod denom;
 pub use denom::ElysDenom;
 
-use elys_bindings::types::BalanceAvailable;
+use elys_bindings::types::BalanceAvailable;