Merge pull request #95 from irisnet/irisnet/hotfix-v0.23.0-iris2

merge Irisnet/hotfix v0.23.0 iris2 into master

x/stake/handler.go

@@ -6,6 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/stake/tags"
 	"github.com/cosmos/cosmos-sdk/x/stake/types"
 	abci "github.com/tendermint/tendermint/abci/types"
+	"math"
 )
 
 func NewHandler(k keeper.Keeper) sdk.Handler {
@@ -76,6 +77,16 @@ func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k k
 		return ErrBadDenom(k.Codespace()).Result()
 	}
 
+	precisionNumber := math.Pow10(int(k.GetParams(ctx).DenomPrecision))
+	if precisionNumber > math.MaxInt64 {
+		panic("precision is too high, int64 is overflow")
+	}
+	tokenPrecision := int64(precisionNumber)
+	equivalentPower := msg.Delegation.Amount.Div(sdk.NewInt(tokenPrecision))
+	if equivalentPower.Equal(sdk.NewInt(0)) {
+		return sdk.ErrInsufficientCoins("delegate token amount for new created validator is too small, voting power is zero, this validator creation doesn't make sense").Result()
+	}
+
 	validator := NewValidator(msg.ValidatorAddr, msg.PubKey, msg.Description)
 	validator.TokenPrecision = k.GetParams(ctx).DenomPrecision
 	k.SetValidator(ctx, validator)

x/stake/keeper/slash.go

@@ -6,6 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/x/stake/types"
 	"github.com/tendermint/tendermint/crypto"
+	"math"
 )
 
 // Slash a validator for an infraction committed at a known height
@@ -33,6 +34,16 @@ func (k Keeper) Slash(ctx sdk.Context, pubkey crypto.PubKey, infractionHeight in
 	// ref https://github.com/cosmos/cosmos-sdk/issues/1471
 
 	validator, found := k.GetValidatorByPubKey(ctx, pubkey)
+
+	////////////////////  iris/cosmos-sdk begin  ///////////////////////////
+	precisionNumber := math.Pow10(int(validator.TokenPrecision))
+	if precisionNumber > math.MaxInt64 {
+		panic(fmt.Errorf("precision is too high, int64 is overflow"))
+	}
+	tokenPrecision := sdk.NewInt(int64(precisionNumber))
+	slashAmount = slashAmount.Mul(sdk.NewRatFromInt(tokenPrecision))
+	////////////////////  iris/cosmos-sdk end  ///////////////////////////
+
 	if !found {
 		// If not found, the validator must have been overslashed and removed - so we don't need to do anything
 		// NOTE:  Correctness dependent on invariant that unbonding delegations / redelegations must also have been completely