add max claimable tokens query

proto/stride/claim/query.proto

@@ -94,6 +94,7 @@ message QueryTotalClaimableRequest {
   string airdrop_identifier = 1
       [ (gogoproto.moretags) = "yaml:\"airdrop_identifier\"" ];
   string address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ];
+  bool include_claimed = 3;
 }
 
 message QueryTotalClaimableResponse {

proto/stride/claim/tx.proto

@@ -29,9 +29,7 @@ message MsgSetAirdropAllocations {
 
 message MsgSetAirdropAllocationsResponse {}
 
-message MsgClaimFreeAmount {
-  string user = 1;
-}
+message MsgClaimFreeAmount { string user = 1; }
 
 message MsgClaimFreeAmountResponse {
   repeated cosmos.base.v1beta1.Coin claimed_amount = 3 [

scripts/airdrop.sh

@@ -0,0 +1,51 @@
+### AIRDROP TESTING FLOW
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source ${SCRIPT_DIR}/vars.sh
+
+# First, start the network with `make start-docker`
+# Then, run this script with `bash scripts/airdrop.sh`
+
+# NOTE: First, store the keys using the following mnemonics
+# distributor address: stride1z835j3j65nqr6ng257q0xkkc9gta72gf48txwl
+# distributor mnemonic: barrel salmon half click confirm crunch sense defy salute process cart fiscal sport clump weasel render private manage picture spell wreck hill frozen before
+$STRIDE_MAIN_CMD keys add distributor-test --recover
+
+# airdrop-test address: stride1nf6v2paty9m22l3ecm7dpakq2c92ueyununayr
+# airdrop claimer mnemonic: royal auction state december october hip monster hotel south help bulk supreme history give deliver pigeon license gold carpet rabbit raw wool fatigue donate
+$STRIDE_MAIN_CMD keys add airdrop-test --recover
+
+
+## AIRDROP SETUP
+# Transfer uatom from gaia to stride, so that we can liquid stake later
+$GAIA_MAIN_CMD tx ibc-transfer transfer transfer channel-0 stride1nf6v2paty9m22l3ecm7dpakq2c92ueyununayr 1000000uatom --from ${GAIA_VAL_PREFIX}1 -y 
+sleep 5
+
+
+# Fund the distributor account
+$STRIDE_MAIN_CMD tx bank send val1 stride1z835j3j65nqr6ng257q0xkkc9gta72gf48txwl 600000ustrd --from val1
+sleep 5
+# Fund the airdrop account
+$STRIDE_MAIN_CMD tx bank send val1 stride1nf6v2paty9m22l3ecm7dpakq2c92ueyununayr 1000000000ustrd --from val1
+sleep 5
+
+# Create the airdrop, so that the airdrop account can claim tokens
+$STRIDE_MAIN_CMD tx claim create-airdrop stride 1666792900 40000000 ustrd --from distributor-test
+sleep 5
+# Set airdrop allocations
+$STRIDE_MAIN_CMD tx claim set-airdrop-allocations stride stride1nf6v2paty9m22l3ecm7dpakq2c92ueyununayr 1 --from distributor-test
+sleep 5
+
+
+# AIRDROP CLAIMS
+# Check balances before claims
+$STRIDE_MAIN_CMD query bank balances stride1nf6v2paty9m22l3ecm7dpakq2c92ueyununayr
+# NOTE: You can claim here using the CLI, or from the frontend!
+# Claim 20% of the free tokens
+$STRIDE_MAIN_CMD tx claim claim-free-amount --from airdrop-test --gas 400000
+sleep 5
+# Stake, to claim another 20%
+$STRIDE_MAIN_CMD tx staking delegate stridevaloper1nnurja9zt97huqvsfuartetyjx63tc5zrj5x9f 100ustrd --from airdrop-test --gas 400000
+sleep 5
+# Liquid stake, to claim the final 20% of tokens
+$STRIDE_MAIN_CMD tx stakeibc liquid-stake 1000 uatom --from airdrop-test --gas 400000
+sleep 5

x/claim/client/cli/query.go

@@ -180,8 +180,8 @@ $ %s query claim claimable-for-action stride1h4astdfzjhcwahtfrh24qtvndzzh49xvqtf
 // GetCmdQueryClaimable implements the query claimables command.
 func GetCmdQueryTotalClaimable() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "total-claimable [airdrop-identifier] [address]",
-		Args:  cobra.ExactArgs(2),
+		Use:   "total-claimable [airdrop-identifier] [address] [include-claimed]",
+		Args:  cobra.ExactArgs(3),
 		Short: "Query the total claimable amount remaining for an account.",
 		Long: strings.TrimSpace(
 			fmt.Sprintf(`Query the total claimable amount remaining for an account.
@@ -201,6 +201,7 @@ $ %s query claim total-claimable stride stride1h4astdfzjhcwahtfrh24qtvndzzh49xvq
 			res, err := queryClient.TotalClaimable(context.Background(), &types.QueryTotalClaimableRequest{
 				AirdropIdentifier: args[0],
 				Address:           args[1],
+				IncludeClaimed:    args[2] == "true",
 			})
 			if err != nil {
 				return err

x/claim/keeper/claim.go

@@ -343,7 +343,7 @@ func (k Keeper) GetAirdropClaimDenom(ctx sdk.Context, airdropIdentifier string)
 }
 
 // GetClaimable returns claimable amount for a specific action done by an address
-func (k Keeper) GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress, action types.Action, airdropIdentifier string) (sdk.Coins, error) {
+func (k Keeper) GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress, action types.Action, airdropIdentifier string, includeClaimed bool) (sdk.Coins, error) {
 	claimRecord, err := k.GetClaimRecord(ctx, addr, airdropIdentifier)
 	if err != nil {
 		return nil, err
@@ -353,8 +353,8 @@ func (k Keeper) GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress
 		return sdk.Coins{}, nil
 	}
 
-	// if action already completed, nothing is claimable
-	if claimRecord.ActionCompleted[action] {
+	// if action already completed (and we're not including claimed tokens), nothing is claimable
+	if !includeClaimed && claimRecord.ActionCompleted[action] {
 		return sdk.Coins{}, nil
 	}
 
@@ -408,7 +408,7 @@ func (k Keeper) GetUserVestings(ctx sdk.Context, addr sdk.AccAddress) (vestingty
 }
 
 // GetClaimable returns claimable amount for a specific action done by an address
-func (k Keeper) GetUserTotalClaimable(ctx sdk.Context, addr sdk.AccAddress, airdropIdentifier string) (sdk.Coins, error) {
+func (k Keeper) GetUserTotalClaimable(ctx sdk.Context, addr sdk.AccAddress, airdropIdentifier string, includeClaimed bool) (sdk.Coins, error) {
 	claimRecord, err := k.GetClaimRecord(ctx, addr, airdropIdentifier)
 	if err != nil {
 		return sdk.Coins{}, err
@@ -420,7 +420,7 @@ func (k Keeper) GetUserTotalClaimable(ctx sdk.Context, addr sdk.AccAddress, aird
 	totalClaimable := sdk.Coins{}
 
 	for action := range types.Action_name {
-		claimableForAction, err := k.GetClaimableAmountForAction(ctx, addr, types.Action(action), airdropIdentifier)
+		claimableForAction, err := k.GetClaimableAmountForAction(ctx, addr, types.Action(action), airdropIdentifier, includeClaimed)
 		if err != nil {
 			return sdk.Coins{}, err
 		}
@@ -486,7 +486,7 @@ func (k Keeper) ClaimCoinsForAction(ctx sdk.Context, addr sdk.AccAddress, action
 		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid airdrop identifier: ClaimCoinsForAction")
 	}
 
-	claimableAmount, err := k.GetClaimableAmountForAction(ctx, addr, action, airdropIdentifier)
+	claimableAmount, err := k.GetClaimableAmountForAction(ctx, addr, action, airdropIdentifier, false)
 	if err != nil {
 		return claimableAmount, err
 	}

x/claim/keeper/claim_test.go

@@ -99,12 +99,12 @@ func (suite *KeeperTestSuite) TestHookBeforeAirdropStart() {
 	err = suite.app.ClaimKeeper.SetClaimRecordsWithWeights(suite.ctx, claimRecords)
 	suite.Require().NoError(err)
 
-	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride")
+	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride", false)
 	suite.NoError(err)
 	// Now, it is before starting air drop, so this value should return the empty coins
 	suite.True(coins.Empty())
 
-	coins, err = suite.app.ClaimKeeper.GetClaimableAmountForAction(suite.ctx, addr1, types.ACTION_FREE, "stride")
+	coins, err = suite.app.ClaimKeeper.GetClaimableAmountForAction(suite.ctx, addr1, types.ACTION_FREE, "stride", false)
 	suite.NoError(err)
 	// Now, it is before starting air drop, so this value should return the empty coins
 	suite.True(coins.Empty())
@@ -188,15 +188,15 @@ func (suite *KeeperTestSuite) TestAirdropFlow() {
 	err := suite.app.ClaimKeeper.SetClaimRecordsWithWeights(suite.ctx, claimRecords)
 	suite.Require().NoError(err)
 
-	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride")
+	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride", false)
 	suite.Require().NoError(err)
 	suite.Require().Equal(coins.String(), sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 50_000_000)).String())
 
-	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr2, "stride")
+	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr2, "stride", false)
 	suite.Require().NoError(err)
 	suite.Require().Equal(coins.String(), sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 50_000_000)).String())
 
-	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr3, "stride")
+	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr3, "stride", false)
 	suite.Require().NoError(err)
 	suite.Require().Equal(coins, sdk.Coins{})
 
@@ -288,11 +288,11 @@ func (suite *KeeperTestSuite) TestMultiChainAirdropFlow() {
 	err := suite.app.ClaimKeeper.SetClaimRecordsWithWeights(suite.ctx, claimRecords)
 	suite.Require().NoError(err)
 
-	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride")
+	coins, err := suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr1, "stride", false)
 	suite.Require().NoError(err)
 	suite.Require().Equal(coins.String(), sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 100_000_000)).String())
 
-	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr2, "juno")
+	coins, err = suite.app.ClaimKeeper.GetUserTotalClaimable(suite.ctx, addr2, "juno", false)
 	suite.Require().NoError(err)
 	suite.Require().Equal(coins.String(), sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)).String())
 

x/claim/keeper/grpc_query.go

@@ -68,7 +68,7 @@ func (k Keeper) ClaimableForAction(
 		return nil, err
 	}
 
-	coins, err := k.GetClaimableAmountForAction(ctx, addr, req.Action, req.AirdropIdentifier)
+	coins, err := k.GetClaimableAmountForAction(ctx, addr, req.Action, req.AirdropIdentifier, false)
 
 	return &types.QueryClaimableForActionResponse{
 		Coins: coins,
@@ -90,7 +90,7 @@ func (k Keeper) TotalClaimable(
 		return nil, err
 	}
 
-	coins, err := k.GetUserTotalClaimable(ctx, addr, req.AirdropIdentifier)
+	coins, err := k.GetUserTotalClaimable(ctx, addr, req.AirdropIdentifier, req.IncludeClaimed)
 
 	return &types.QueryTotalClaimableResponse{
 		Coins: coins,

x/claim/spec/04_keeper.md

@@ -16,7 +16,7 @@ Claim keeper module provides utility functions to manage epochs.
   GetClaimRecords(ctx sdk.Context) []types.ClaimRecord
   SetClaimRecord(ctx sdk.Context, claimRecord types.ClaimRecord) error
   SetClaimRecords(ctx sdk.Context, claimRecords []types.ClaimRecord) error
-  GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress, action types.Action) (sdk.Coins, error)
+  GetClaimableAmountForAction(ctx sdk.Context, addr sdk.AccAddress, action types.Action, includeClaimed bool) (sdk.Coins, error)
   GetUserTotalClaimable(ctx sdk.Context, addr sdk.AccAddress) (sdk.Coins, error)
   ClaimCoinsForAction(ctx sdk.Context, addr sdk.AccAddress, action types.Action) (sdk.Coins, error)
   clearInitialClaimables(ctx sdk.Context)