Better claim validation (#333)

Author: toshiSat

CHANGELOG.md

@@ -49,6 +49,7 @@ Contains all the PRs that improved the code without changing the behaviors.
 - Fixed fee stuck in arkeo module by moving fees to arkeo-reserve
 - Fixed signature replay on different network
 - Fixed informational issues
+- Fixed claim validation
 
 ---
 

x/claim/keeper/msg_server_claim_eth.go

@@ -24,7 +24,7 @@ func (k msgServer) ClaimEth(goCtx context.Context, msg *types.MsgClaimEth) (*typ
 		return nil, errors.Wrapf(err, "failed to get claim record for %s", msg.EthAddress)
 	}
 
-	if ethClaim.IsEmpty() || ethClaim.AmountClaim.IsZero() {
+	if ethClaim.IsEmpty() || (ethClaim.AmountClaim.IsZero() && ethClaim.AmountVote.IsZero() && ethClaim.AmountDelegate.IsZero()) {
 		return nil, errors.Wrapf(types.ErrNoClaimableAmount, "no claimable amount for %s", msg.EthAddress)
 	}
 	totalAmountClaimable := getInitialClaimableAmountTotal(ethClaim)

x/claim/keeper/msg_server_transfer_claim.go

@@ -18,7 +18,7 @@ func (k msgServer) TransferClaim(goCtx context.Context, msg *types.MsgTransferCl
 		return nil, errors.Wrapf(err, "failed to get claim record for %s", msg.Creator)
 	}
 
-	if originalClaim.IsEmpty() || originalClaim.AmountClaim.IsZero() {
+	if originalClaim.IsEmpty() || (originalClaim.AmountClaim.IsZero() && originalClaim.AmountVote.IsZero() && originalClaim.AmountDelegate.IsZero()) {
 		return nil, errors.Wrapf(types.ErrNoClaimableAmount, "no claimable amount for %s", msg.Creator)
 	}