fixes

hadronlabs-org · Nov 29, 2024 · cd4ef4c · cd4ef4c
1 parent 7e85b35
commit cd4ef4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/contracts/lsm-share-bond-provider/src/contract.rs b/contracts/lsm-share-bond-provider/src/contract.rs
@@ -119,7 +119,10 @@ fn query_can_be_removed(deps: Deps<NeutronQuery>, env: Env) -> ContractResult<Bi
         .into_iter()
         .filter(|coin| coin.denom != *LOCAL_DENOM.to_string())
         .collect::<Vec<Coin>>();
-    Ok(to_json_binary(&all_balances_except_untrn.is_empty())?)
+    let result = all_balances_except_untrn.is_empty()
+        && PENDING_LSM_SHARES.is_empty(deps.storage)
+        && LSM_SHARES_TO_REDEEM.is_empty(deps.storage);
+    Ok(to_json_binary(&result)?)
 }
 
 fn query_tx_state(deps: Deps<NeutronQuery>) -> ContractResult<Binary> {

diff --git a/contracts/native-bond-provider/src/contract.rs b/contracts/native-bond-provider/src/contract.rs
@@ -110,7 +110,9 @@ fn query_can_be_removed(deps: Deps<NeutronQuery>, env: Env) -> ContractResult<Bi
         .into_iter()
         .filter(|coin| coin.denom != *LOCAL_DENOM.to_string())
         .collect::<Vec<Coin>>();
-    Ok(to_json_binary(&all_balances_except_untrn.is_empty())?)
+    let non_staked_balance = NON_STAKED_BALANCE.load(deps.storage)?;
+    let result = all_balances_except_untrn.is_empty() && (non_staked_balance.is_zero());
+    Ok(to_json_binary(&result)?)
 }
 
 fn query_tx_state(deps: Deps<NeutronQuery>, _env: Env) -> ContractResult<Binary> {