Merge pull request #403 from astroport-fi/merge/features_020224

Release v3.11.0
astroport-fi · Feb 2, 2024 · d6adad9 · d6adad9
2 parents fc992ee + f1aff86
commit d6adad9
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/tokenomics/incentives/Cargo.toml b/contracts/tokenomics/incentives/Cargo.toml
@@ -3,6 +3,10 @@ name = "astroport-incentives"
 version = "1.0.0"
 authors = ["Astroport"]
 edition = "2021"
+description = "Astroport Incentives Contract distributing rewards to LP stakers"
+license = "GPL-3.0-only"
+repository = "https://github.com/astroport-fi/astroport"
+homepage = "https://astroport.fi"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -17,7 +21,7 @@ cosmwasm-schema = "1.4"
 cw2 = "1"
 cw20 = "1"
 cw-utils = "1"
-astroport = { path = "../../../packages/astroport" }
+astroport = { path = "../../../packages/astroport", version = "3.11.0" }
 thiserror = "1"
 itertools = "0.11"
 

diff --git a/contracts/tokenomics/incentives/src/query.rs b/contracts/tokenomics/incentives/src/query.rs
@@ -11,7 +11,8 @@ use astroport::incentives::{QueryMsg, RewardType, ScheduleResponse, MAX_PAGE_LIM
 
 use crate::error::ContractError;
 use crate::state::{
-    list_pool_stakers, PoolInfo, UserInfo, BLOCKED_TOKENS, CONFIG, EXTERNAL_REWARD_SCHEDULES,
+    list_pool_stakers, PoolInfo, UserInfo, ACTIVE_POOLS, BLOCKED_TOKENS, CONFIG,
+    EXTERNAL_REWARD_SCHEDULES, POOLS,
 };
 use crate::utils::{asset_info_key, from_key_to_asset_info};
 
@@ -93,9 +94,42 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractErro
             start_after,
             limit,
         )?)?),
+        QueryMsg::ListPools { start_after, limit } => {
+            Ok(to_json_binary(&list_pools(deps, start_after, limit)?)?)
+        }
+        QueryMsg::ActivePools {} => {
+            let pools = ACTIVE_POOLS
+                .load(deps.storage)?
+                .into_iter()
+                .map(|(asset_info, alloc_points)| (asset_info.to_string(), alloc_points))
+                .collect_vec();
+            Ok(to_json_binary(&pools)?)
+        }
     }
 }
 
+fn list_pools(
+    deps: Deps,
+    start_after: Option<String>,
+    limit: Option<u8>,
+) -> StdResult<Vec<String>> {
+    let limit = limit.unwrap_or(MAX_PAGE_LIMIT) as usize;
+    POOLS
+        .keys_raw(
+            deps.storage,
+            start_after
+                .map(|lp_token| determine_asset_info(&lp_token, deps.api))
+                .transpose()?
+                .as_ref()
+                .map(Bound::exclusive),
+            None,
+            Order::Ascending,
+        )
+        .map(|item| String::from_utf8(item).map_err(StdError::invalid_utf8))
+        .take(limit)
+        .collect()
+}
+
 fn query_blocked_tokens(
     deps: Deps,
     start_after: Option<AssetInfo>,

diff --git a/contracts/tokenomics/incentives/tests/helper/helper.rs b/contracts/tokenomics/incentives/tests/helper/helper.rs
@@ -893,6 +893,26 @@ impl Helper {
             .unwrap()
     }
 
+    pub fn all_pools(&self) -> Vec<String> {
+        self.app
+            .wrap()
+            .query_wasm_smart(
+                &self.generator,
+                &QueryMsg::ListPools {
+                    start_after: None,
+                    limit: None,
+                },
+            )
+            .unwrap()
+    }
+
+    pub fn active_pools(&self) -> Vec<(String, Uint128)> {
+        self.app
+            .wrap()
+            .query_wasm_smart(&self.generator, &QueryMsg::ActivePools {})
+            .unwrap()
+    }
+
     pub fn create_pair(&mut self, asset_infos: &[AssetInfo]) -> AnyResult<PairInfo> {
         let asset_infos = asset_infos.to_vec();
         self.app