Merge pull request #4 from PFC-developer/fix/2024-08-07-previous-batches

Fix/2024 08 07 previous batches

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
-members = ["contracts/token", "contracts/hub", "contracts/hub-tf", "packages/*"]
+members = ["contracts/token", "contracts/hub", "contracts/hub-tf",
+    "packages/*"]
 resolver = '1'
 
 [profile.release.package.pfc-steak]

contracts/hub-tf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pfc-steak-hub-tf"
-version = "3.0.18"
+version = "3.0.19"
 authors = ["larry <[email protected]>", "PFC <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later"

contracts/hub-tf/src/contract.rs

@@ -181,6 +181,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
             start_after,
             limit,
         } => to_json_binary(&queries::unbond_requests_by_user(deps, user, start_after, limit)?),
+        QueryMsg::Unreconciled {} => to_json_binary(&queries::previous_batches_unreconciled(deps)?),
     }
 }
 

contracts/hub-tf/src/execute.rs

@@ -353,11 +353,10 @@ pub fn harvest(deps: DepsMut, env: Env) -> StdResult<Response> {
 
 /// NOTE:
 /// 1. When delegation Native denom here, we don't need to use a `SubMsg` to handle the received
-///    coins,
-/// because we have already withdrawn all claimable staking rewards previously in the same atomic
-/// execution.
+///    coins, because we have already withdrawn all claimable staking rewards previously in the same
+///    atomic execution.
 /// 2. Same as with `bond`, in the latest implementation we only delegate staking rewards with the
-/// validator that has the smallest delegation amount.
+///    validator that has the smallest delegation amount.
 pub fn reinvest(deps: DepsMut, env: Env) -> StdResult<Response> {
     let state = State::default();
     let denom = state.denom.load(deps.storage)?;
@@ -720,7 +719,7 @@ pub fn reconcile(deps: DepsMut, env: Env) -> StdResult<Response> {
     let all_batches = previous_batches()
         .idx
         .reconciled
-        .prefix("false".into())
+        .prefix("false".to_string())
         .range(deps.storage, None, None, Order::Ascending)
         .map(|item| {
             let (_, v) = item?;

contracts/hub-tf/src/queries.rs

@@ -113,6 +113,18 @@ pub fn previous_batches(
         })
         .collect()
 }
+pub fn previous_batches_unreconciled(deps: Deps) -> StdResult<Vec<Batch>> {
+    state::previous_batches()
+        .idx
+        .reconciled
+        .prefix("false".into())
+        .range(deps.storage, None, None, Order::Ascending)
+        .map(|item| {
+            let (_, v) = item?;
+            Ok(v)
+        })
+        .collect()
+}
 
 pub fn unbond_requests_by_batch(
     deps: Deps,

contracts/hub-tf/src/state.rs

@@ -144,7 +144,7 @@ pub fn unbond_requests<'a>()
 
 pub struct PreviousBatchesIndexes<'a> {
     // pk goes to second tuple element
-    pub reconciled: MultiIndex<'a, String, Batch, String>,
+    pub reconciled: MultiIndex<'a, String, Batch, u64>,
 }
 
 impl<'a> IndexList<Batch> for PreviousBatchesIndexes<'a> {

contracts/hub/src/contract.rs

@@ -212,6 +212,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
             start_after,
             limit,
         } => to_json_binary(&queries::unbond_requests_by_user(deps, user, start_after, limit)?),
+        QueryMsg::Unreconciled {} => to_json_binary(&queries::previous_batches_unreconciled(deps)?),
     }
 }
 

contracts/hub/src/execute.rs

@@ -307,11 +307,10 @@ pub fn harvest(deps: DepsMut, env: Env) -> StdResult<Response> {
 
 /// NOTE:
 /// 1. When delegation Native denom here, we don't need to use a `SubMsg` to handle the received
-///    coins,
-/// because we have already withdrawn all claimable staking rewards previously in the same atomic
-/// execution.
+///    coins, because we have already withdrawn all claimable staking rewards previously in the same
+///    atomic execution.
 /// 2. Same as with `bond`, in the latest implementation we only delegate staking rewards with the
-/// validator that has the smallest delegation amount.
+///    validator that has the smallest delegation amount.
 pub fn reinvest(deps: DepsMut, env: Env) -> StdResult<Response> {
     let state = State::default();
     let denom = state.denom.load(deps.storage)?;

contracts/hub/src/queries.rs

@@ -13,6 +13,7 @@ use pfc_steak::hub::{
 use crate::{
     helpers::{query_cw20_total_supply, query_delegations},
     state::State,
+    types::BooleanKey,
 };
 
 const MAX_LIMIT: u32 = 30;
@@ -110,7 +111,21 @@ pub fn previous_batches(
         })
         .collect()
 }
+pub fn previous_batches_unreconciled(deps: Deps) -> StdResult<Vec<Batch>> {
+    let state = State::default();
 
+    state
+        .previous_batches
+        .idx
+        .reconciled
+        .prefix(BooleanKey::new(false))
+        .range(deps.storage, None, None, Order::Ascending)
+        .map(|item| {
+            let (_, v) = item?;
+            Ok(v)
+        })
+        .collect()
+}
 pub fn unbond_requests_by_batch(
     deps: Deps,
     id: u64,

justfile

@@ -2,7 +2,7 @@ check:
   cargo check --target wasm32-unknown-unknown --lib
 
 clippy:
-  cargo  clippy --tests
+  cargo +nightly clippy --tests
 
 format:
     cargo +nightly fmt
@@ -20,11 +20,11 @@ optimize-arm:
     --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
     --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
     --platform linux/arm64 \
-    cosmwasm/workspace-optimizer-arm64:0.15.1
+    cosmwasm/optimizer-arm64:0.16.0
 
 optimize-x86:
   docker run --rm -v "$(pwd)":/code \
     --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
     --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
     --platform linux/amd64 \
-    cosmwasm/workspace-optimizer:0.15.1
+    cosmwasm/optimizer:0.16.0

packages/steak/src/hub.rs

@@ -188,6 +188,8 @@ pub enum QueryMsg {
     State {},
     /// The current batch on unbonding requests pending submission. Response: `PendingBatch`
     PendingBatch {},
+    /// list of batches with reconciled == false
+    Unreconciled {},
     /// Query an individual batch that has previously been submitted for unbonding but have not yet
     /// fully withdrawn. Response: `Batch`
     PreviousBatch(u64),