Merge branch 'develop' into chore-remove-duplicate-function

changelog.md

@@ -30,6 +30,10 @@
 * [1787](https://github.com/zeta-chain/node/pull/1787) - add unit tests for cross-chain evm hooks and e2e test failed withdraw to BTC legacy address
 * [1840](https://github.com/zeta-chain/node/pull/1840) - fix code coverage test failures ignored in CI
 
+### Fixes
+
+* [1861](https://github.com/zeta-chain/node/pull/1861) - fix `ObserverSlashAmount` invalid read
+
 ### Chores
 
 * [1814](https://github.com/zeta-chain/node/pull/1814) - fix code coverage ignore for protobuf generated files

x/emissions/abci.go

@@ -22,6 +22,14 @@ func BeginBlocker(ctx sdk.Context, keeper keeper.Keeper) {
 	observerRewards := sdk.MustNewDecFromStr(keeper.GetParams(ctx).ObserverEmissionPercentage).Mul(blockRewards).TruncateInt()
 	tssSignerRewards := sdk.MustNewDecFromStr(keeper.GetParams(ctx).TssSignerEmissionPercentage).Mul(blockRewards).TruncateInt()
 
+	// TODO : Replace hardcoded slash amount with a parameter
+	// https://github.com/zeta-chain/node/pull/1861
+	slashAmount, ok := sdkmath.NewIntFromString(types.ObserverSlashAmount)
+	if !ok {
+		ctx.Logger().Error(fmt.Sprintf("Error while parsing observer slash amount %s", types.ObserverSlashAmount))
+		return
+	}
+
 	// Use a tmpCtx, which is a cache-wrapped context to avoid writing to the store
 	// We commit only if all three distributions are successful, if not the funds stay in the emission pool
 	tmpCtx, commit := ctx.CacheContext()
@@ -30,7 +38,7 @@ func BeginBlocker(ctx sdk.Context, keeper keeper.Keeper) {
 		ctx.Logger().Error(fmt.Sprintf("Error while distributing validator rewards %s", err))
 		return
 	}
-	err = DistributeObserverRewards(tmpCtx, observerRewards, keeper)
+	err = DistributeObserverRewards(tmpCtx, observerRewards, keeper, slashAmount)
 	if err != nil {
 		ctx.Logger().Error(fmt.Sprintf("Error while distributing observer rewards %s", err))
 		return
@@ -63,7 +71,12 @@ func DistributeValidatorRewards(ctx sdk.Context, amount sdkmath.Int, bankKeeper
 // NotVoted or Unsuccessful votes are slashed
 // rewards given or slashed amounts are in azeta
 
-func DistributeObserverRewards(ctx sdk.Context, amount sdkmath.Int, keeper keeper.Keeper) error {
+func DistributeObserverRewards(
+	ctx sdk.Context,
+	amount sdkmath.Int,
+	keeper keeper.Keeper,
+	slashAmount sdkmath.Int,
+) error {
 
 	rewardsDistributer := map[string]int64{}
 	totalRewardsUnits := int64(0)
@@ -113,7 +126,7 @@ func DistributeObserverRewards(ctx sdk.Context, amount sdkmath.Int, keeper keepe
 			continue
 		}
 		if observerRewardUnits < 0 {
-			slashAmount := keeper.GetParams(ctx).ObserverSlashAmount
+
 			keeper.SlashObserverEmission(ctx, observerAddress.String(), slashAmount)
 			finalDistributionList = append(finalDistributionList, &types.ObserverEmission{
 				EmissionType:    types.EmissionType_Slash,

x/emissions/abci_test.go

@@ -153,6 +153,7 @@ func TestBeginBlocker(t *testing.T) {
 }
 
 func TestDistributeObserverRewards(t *testing.T) {
+	keepertest.SetConfig(false)
 	observerSet := sample.ObserverSet(4)
 
 	tt := []struct {
@@ -286,8 +287,9 @@ func TestDistributeObserverRewards(t *testing.T) {
 			ctx = ctx.WithBlockHeight(100)
 
 			// Distribute the rewards and check if the rewards are distributed correctly
-			err = emissionsModule.DistributeObserverRewards(ctx, tc.totalRewardsForBlock, *k)
+			err = emissionsModule.DistributeObserverRewards(ctx, tc.totalRewardsForBlock, *k, tc.slashAmount)
 			require.NoError(t, err)
+
 			for i, observer := range observerSet.ObserverList {
 				observerEmission, found := k.GetWithdrawableEmission(ctx, observer)
 				require.True(t, found, "withdrawable emission not found for observer %d", i)

x/emissions/genesis_test.go

@@ -3,6 +3,8 @@ package emissions_test
 import (
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/stretchr/testify/require"
 	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
 	"github.com/zeta-chain/zetacore/testutil/nullify"
@@ -12,8 +14,11 @@ import (
 )
 
 func TestGenesis(t *testing.T) {
+	params := types.DefaultParams()
+	params.ObserverSlashAmount = sdk.Int{}
+
 	genesisState := types.GenesisState{
-		Params: types.DefaultParams(),
+		Params: params,
 		WithdrawableEmissions: []types.WithdrawableEmissions{
 			sample.WithdrawableEmissions(t),
 			sample.WithdrawableEmissions(t),

x/emissions/keeper/params_test.go

@@ -3,7 +3,6 @@ package keeper_test
 import (
 	"testing"
 
-	sdkmath "cosmossdk.io/math"
 	"github.com/stretchr/testify/require"
 	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
 	emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
@@ -26,7 +25,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "",
 		},
@@ -41,7 +39,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(-10),
 			},
 			isPanic: "slash amount cannot be less than 0",
 		},
@@ -56,7 +53,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "max bond factor cannot be higher that 0.25",
 		},
@@ -71,7 +67,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "min bond factor cannot be lower that 0.75",
 		},
@@ -86,7 +81,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "invalid block time",
 		},
@@ -101,7 +95,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "block time cannot be less than or equal to 0",
 		},
@@ -116,7 +109,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "target bond ratio cannot be more than 100 percent",
 		},
@@ -131,7 +123,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "target bond ratio cannot be less than 0 percent",
 		},
@@ -146,7 +137,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "validator emission percentage cannot be more than 100 percent",
 		},
@@ -161,7 +151,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "validator emission percentage cannot be less than 0 percent",
 		},
@@ -176,7 +165,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "-00.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "observer emission percentage cannot be less than 0 percent",
 		},
@@ -191,7 +179,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "150.25",
 				TssSignerEmissionPercentage: "00.25",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "observer emission percentage cannot be more than 100 percent",
 		},
@@ -206,12 +193,11 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "102.22",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "tss emission percentage cannot be more than 100 percent",
 		},
 		{
-			name: "tss signer percentage too loo",
+			name: "tss signer percentage too low",
 			params: emissionstypes.Params{
 				MaxBondFactor:               "1.25",
 				MinBondFactor:               "0.75",
@@ -221,7 +207,6 @@ func TestKeeper_GetParams(t *testing.T) {
 				ObserverEmissionPercentage:  "00.25",
 				TssSignerEmissionPercentage: "-102.22",
 				DurationFactorConstant:      "0.001877876953694702",
-				ObserverSlashAmount:         sdkmath.NewInt(100000000000000000),
 			},
 			isPanic: "tss emission percentage cannot be less than 0 percent",
 		},

x/emissions/types/keys.go

@@ -29,6 +29,12 @@ const (
 
 	EmissionScheduledYears = 4
 	AvgBlockTime           = "5.7"
+
+	// ObserverSlashAmount is the amount of tokens to be slashed from observer in case of incorrect vote
+	// it is set to 0.1 ZETA
+	// TODO: replace this with a parameter
+	// https://github.com/zeta-chain/node/pull/1861
+	ObserverSlashAmount = "100000000000000000"
 )
 
 func KeyPrefix(p string) []byte {

x/emissions/types/params.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strconv"
 
-	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"gopkg.in/yaml.v2"
@@ -20,11 +19,6 @@ func ParamKeyTable() paramtypes.KeyTable {
 // NewParams creates a new Params instance
 
 func NewParams() Params {
-	defaultSlashAmount := sdk.ZeroInt()
-	intSlashAmount, ok := sdkmath.NewIntFromString("100000000000000000")
-	if ok {
-		defaultSlashAmount = intSlashAmount
-	}
 	return Params{
 		MaxBondFactor:               "1.25",
 		MinBondFactor:               "0.75",
@@ -34,7 +28,11 @@ func NewParams() Params {
 		ObserverEmissionPercentage:  "00.25",
 		TssSignerEmissionPercentage: "00.25",
 		DurationFactorConstant:      "0.001877876953694702",
-		ObserverSlashAmount:         defaultSlashAmount,
+
+		// ObserverSlashAmount is currently disabled
+		// TODO: enable this param
+		// https://github.com/zeta-chain/node/issues/1862
+		ObserverSlashAmount: sdk.Int{},
 	}
 }
 
@@ -54,7 +52,10 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 		paramtypes.NewParamSetPair(KeyPrefix(ParamObserverEmissionPercentage), &p.ObserverEmissionPercentage, validateObserverEmissionPercentage),
 		paramtypes.NewParamSetPair(KeyPrefix(ParamTssSignerEmissionPercentage), &p.TssSignerEmissionPercentage, validateTssEmissonPercentage),
 		paramtypes.NewParamSetPair(KeyPrefix(ParamDurationFactorConstant), &p.DurationFactorConstant, validateDurationFactorConstant),
-		paramtypes.NewParamSetPair(KeyPrefix(ParamObserverSlashAmount), &p.ObserverSlashAmount, validateObserverSlashAmount),
+
+		// TODO: enable this param
+		// https://github.com/zeta-chain/node/pull/1861
+		//paramtypes.NewParamSetPair(KeyPrefix(ParamObserverSlashAmount), &p.ObserverSlashAmount, validateObserverSlashAmount),
 	}
 }
 
@@ -72,16 +73,6 @@ func (p Params) String() string {
 	return string(out)
 }
 
-func validateObserverSlashAmount(i interface{}) error {
-	v, ok := i.(sdkmath.Int)
-	if !ok {
-		return fmt.Errorf("invalid parameter type: %T", i)
-	}
-	if v.LT(sdk.ZeroInt()) {
-		return fmt.Errorf("slash amount cannot be less than 0")
-	}
-	return nil
-}
 func validateDurationFactorConstant(i interface{}) error {
 	_, ok := i.(string)
 	if !ok {