Add is_claimable flag to reward response

Arena-DAO · Feb 14, 2024 · 2816beb · 2816beb
1 parent 30bfeab
commit 2816beb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/contracts/external/dao-voting-incentives/schema/dao-voting-incentives.json b/contracts/external/dao-voting-incentives/schema/dao-voting-incentives.json
@@ -620,14 +620,18 @@
       "type": "object",
       "required": [
         "amount",
-        "denom"
+        "denom",
+        "is_claimable"
       ],
       "properties": {
         "amount": {
           "$ref": "#/definitions/Uint128"
         },
         "denom": {
           "$ref": "#/definitions/CheckedDenom"
+        },
+        "is_claimable": {
+          "type": "boolean"
         }
       },
       "additionalProperties": false,

diff --git a/contracts/external/dao-voting-incentives/src/msg.rs b/contracts/external/dao-voting-incentives/src/msg.rs
@@ -53,4 +53,5 @@ pub enum MigrateMsg {
 pub struct RewardResponse {
     pub denom: CheckedDenom,
     pub amount: Uint128,
+    pub is_claimable: bool,
 }
diff --git a/contracts/external/dao-voting-incentives/src/state.rs b/contracts/external/dao-voting-incentives/src/state.rs
@@ -48,6 +48,7 @@ pub fn reward(deps: Deps, contract: &Addr, addr: &Addr) -> Result<RewardResponse
             Ok(RewardResponse {
                 denom: config.denom,
                 amount: calculate_reward(config.total_votes, user_votes, balance)?,
+                is_claimable: true,
             })
         }
         None => {
@@ -58,6 +59,7 @@ pub fn reward(deps: Deps, contract: &Addr, addr: &Addr) -> Result<RewardResponse
             Ok(RewardResponse {
                 denom: config.denom,
                 amount: calculate_reward(config.total_votes, user_votes, balance)?,
+                is_claimable: false,
             })
         }
     }

diff --git a/contracts/external/dao-voting-incentives/src/tests.rs b/contracts/external/dao-voting-incentives/src/tests.rs
@@ -6,7 +6,7 @@ use cosmwasm_std::{
 };
 
 use cw20::{BalanceResponse, Cw20Coin, Cw20QueryMsg, Cw20ReceiveMsg};
-use cw_denom::UncheckedDenom;
+use cw_denom::{CheckedDenom, UncheckedDenom};
 use cw_multi_test::{error::AnyResult, App, AppBuilder, AppResponse, Executor};
 use cw_utils::Expiration;
 use dao_testing::{
@@ -17,7 +17,7 @@ use dao_voting::{proposal::SingleChoiceProposeMsg, threshold::Threshold};
 
 use crate::{
     contract::{migrate, CONTRACT_NAME, CONTRACT_VERSION},
-    msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg},
+    msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, RewardResponse},
     state::Config,
 };
 
@@ -492,6 +492,26 @@ pub fn test_hooks() {
     );
     assert!(result.is_err());
 
+    // Check rewards
+    let rewards: RewardResponse = context
+        .app
+        .wrap()
+        .query_wasm_smart(
+            dao_voting_incentives_addr.clone(),
+            &QueryMsg::Rewards {
+                address: ADDR1.to_string(),
+            },
+        )
+        .unwrap();
+    assert_eq!(
+        rewards,
+        RewardResponse {
+            denom: CheckedDenom::Native(DENOM.to_string()),
+            amount: Uint128::new(500),
+            is_claimable: true,
+        }
+    );
+
     // User claims rewards
     let result = context.app.execute_contract(
         Addr::unchecked(ADDR1),