fixes based on PR review

zeta-chain · Nov 25, 2024 · 4794a72 · 4794a72
1 parent 507ce08
commit 4794a72
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/e2e/e2etests/test_precompiles_distribute.go → .../test_precompiles_distribute_and_claim.go b/e2e/e2etests/test_precompiles_distribute.go → .../test_precompiles_distribute_and_claim.go
@@ -42,13 +42,14 @@ func TestPrecompilesDistributeAndClaim(r *runner.E2ERunner, args []string) {
 		fiveHundred       = big.NewInt(500)
 		fiveHundredOne    = big.NewInt(501)
 		zero              = big.NewInt(0)
+		stake             = "1000000000000000000000"
 
 		previousGasLimit = r.ZEVMAuth.GasLimit
 	)
 
 	// stakeAmt has to be as big as the validator self delegation.
 	// This way the rewards will be distributed 50%.
-	_, ok := stakeAmt.SetString("1000000000000000000000", 10)
+	_, ok := stakeAmt.SetString(stake, 10)
 	require.True(r, ok)
 
 	// Set new gas limit to avoid out of gas errors.

diff --git a/...recompiles_distribute_through_contract.go → ..._distribute_and_claim_through_contract.go b/...recompiles_distribute_through_contract.go → ..._distribute_and_claim_through_contract.go
@@ -44,13 +44,14 @@ func TestPrecompilesDistributeAndClaimThroughContract(r *runner.E2ERunner, args
 		fiveHundred        = big.NewInt(500)
 		fiveHundredOne     = big.NewInt(501)
 		zero               = big.NewInt(0)
+		stake              = "1000000000000000000000"
 
 		previousGasLimit = r.ZEVMAuth.GasLimit
 	)
 
 	// stakeAmt has to be as big as the validator self delegation.
 	// This way the rewards will be distributed 50%.
-	_, ok := stakeAmt.SetString("1000000000000000000000", 10)
+	_, ok := stakeAmt.SetString(stake, 10)
 	require.True(r, ok)
 
 	// Set new gas limit to avoid out of gas errors.

diff --git a/precompiles/staking/method_claim_rewards.go b/precompiles/staking/method_claim_rewards.go
@@ -80,7 +80,7 @@ func (c *Contract) claimRewards(
 		// Check if bank address has enough ZRC20 balance.
 		// This check is also made inside UnlockZRC20, but repeat it here to avoid burning the coins.
 		if err := c.fungibleKeeper.CheckZRC20Balance(ctx, zrc20Addr, bank.ContractAddress, zrc20Amount); err != nil {
-			ctx.Logger().Info(
+			ctx.Logger().Error(
 				"Claimed invalid amount of ZRC20 Validator Rewards",
 				"Total", zrc20Amount,
 				"Denom", precompiletypes.ZRC20ToCosmosDenom(zrc20Addr),
@@ -96,14 +96,6 @@ func (c *Contract) claimRewards(
 			continue
 		}
 
-		ctx.Logger().Info(
-			"Sentf ZRC20 coins from delegator to Module",
-			"Delegator", delegatorCosmosAddr,
-			"Module", fungibletypes.ModuleName,
-			"Denom", precompiletypes.ZRC20ToCosmosDenom(zrc20Addr),
-			"Amount", coin.Amount,
-		)
-
 		if err := c.bankKeeper.BurnCoins(ctx, fungibletypes.ModuleName, coinSet); err != nil {
 			return nil, &precompiletypes.ErrUnexpected{
 				When: "BurnCoins",
@@ -127,6 +119,13 @@ func (c *Contract) claimRewards(
 				Got:  err.Error(),
 			}
 		}
+
+		ctx.Logger().Debug(
+			"Claimed ZRC20 rewards",
+			"Delegator", delegatorCosmosAddr,
+			"Denom", precompiletypes.ZRC20ToCosmosDenom(zrc20Addr),
+			"Amount", coin.Amount,
+		)
 	}
 
 	return method.Outputs.Pack(true)

diff --git a/...les/staking/methiod_claim_rewards_test.go → ...iles/staking/method_claim_rewards_test.go b/...les/staking/methiod_claim_rewards_test.go → ...iles/staking/method_claim_rewards_test.go
@@ -15,9 +15,6 @@ func Test_ClaimRewards(t *testing.T) {
 		s := newTestSuite(t)
 		validator := sample.Validator(t, rand.New(rand.NewSource(42)))
 
-		// Create staker.
-		//stakerEVMAddr := sample.EthAddress()
-
 		/* ACT */
 		// Call claimRewardsMethod.
 		claimRewardsMethod := s.stkContractABI.Methods[ClaimRewardsMethodName]
@@ -30,7 +27,11 @@ func Test_ClaimRewards(t *testing.T) {
 
 		_, err := s.stkContract.Run(s.mockEVM, s.mockVMContract, false)
 		require.Error(t, err)
-		require.Contains(t, err.Error(), "invalid address 0x0000000000000000000000000000000000000000, reason: empty address")
+		require.Contains(
+			t,
+			err.Error(),
+			"invalid address 0x0000000000000000000000000000000000000000, reason: empty address",
+		)
 	})
 
 	t.Run("should return an error when passing incorrect validator", func(t *testing.T) {
@@ -75,6 +76,10 @@ func Test_ClaimRewards(t *testing.T) {
 
 		_, err := s.stkContract.Run(s.mockEVM, s.mockVMContract, false)
 		require.Error(t, err)
-		require.Contains(t, err.Error(), "unexpected error in WithdrawDelegationRewards: no delegation distribution info")
+		require.Contains(
+			t,
+			err.Error(),
+			"unexpected error in WithdrawDelegationRewards: no delegation distribution info",
+		)
 	})
 }