Create signing info struct on validator bond hook
This commit is contained in:
parent
b921ed224c
commit
f6e92df3fa
|
@ -1,11 +1,25 @@
|
||||||
package slashing
|
package slashing
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Create a new slashing period when a validator is bonded
|
|
||||||
func (k Keeper) onValidatorBonded(ctx sdk.Context, address sdk.ConsAddress) {
|
func (k Keeper) onValidatorBonded(ctx sdk.Context, address sdk.ConsAddress) {
|
||||||
|
// Create a new signing info if necessary
|
||||||
|
_, found := k.getValidatorSigningInfo(ctx, address)
|
||||||
|
if !found {
|
||||||
|
signingInfo := ValidatorSigningInfo{
|
||||||
|
StartHeight: ctx.BlockHeight(),
|
||||||
|
IndexOffset: 0,
|
||||||
|
JailedUntil: time.Unix(0, 0),
|
||||||
|
SignedBlocksCounter: 0,
|
||||||
|
}
|
||||||
|
k.setValidatorSigningInfo(ctx, address, signingInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a new slashing period when a validator is bonded
|
||||||
slashingPeriod := ValidatorSlashingPeriod{
|
slashingPeriod := ValidatorSlashingPeriod{
|
||||||
ValidatorAddr: address,
|
ValidatorAddr: address,
|
||||||
StartHeight: ctx.BlockHeight(),
|
StartHeight: ctx.BlockHeight(),
|
||||||
|
|
|
@ -101,8 +101,7 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, p
|
||||||
// Will use the 0-value default signing info if not present, except for start height
|
// Will use the 0-value default signing info if not present, except for start height
|
||||||
signInfo, found := k.getValidatorSigningInfo(ctx, consAddr)
|
signInfo, found := k.getValidatorSigningInfo(ctx, consAddr)
|
||||||
if !found {
|
if !found {
|
||||||
// If this validator has never been seen before, construct a new SigningInfo with the correct start height
|
panic(fmt.Sprintf("Expected signing info for validator %s but not found", consAddr))
|
||||||
signInfo = NewValidatorSigningInfo(height, 0, time.Unix(0, 0), 0)
|
|
||||||
}
|
}
|
||||||
index := signInfo.IndexOffset % k.SignedBlocksWindow(ctx)
|
index := signInfo.IndexOffset % k.SignedBlocksWindow(ctx)
|
||||||
signInfo.IndexOffset++
|
signInfo.IndexOffset++
|
||||||
|
|
|
@ -28,7 +28,6 @@ func TestHandleDoubleSign(t *testing.T) {
|
||||||
ctx, ck, sk, _, keeper := createTestInput(t)
|
ctx, ck, sk, _, keeper := createTestInput(t)
|
||||||
// validator added pre-genesis
|
// validator added pre-genesis
|
||||||
ctx = ctx.WithBlockHeight(-1)
|
ctx = ctx.WithBlockHeight(-1)
|
||||||
sk = sk.WithHooks(keeper.Hooks())
|
|
||||||
amtInt := int64(100)
|
amtInt := int64(100)
|
||||||
operatorAddr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt)
|
operatorAddr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt)
|
||||||
got := stake.NewHandler(sk)(ctx, newTestMsgCreateValidator(operatorAddr, val, amt))
|
got := stake.NewHandler(sk)(ctx, newTestMsgCreateValidator(operatorAddr, val, amt))
|
||||||
|
@ -69,7 +68,6 @@ func TestSlashingPeriodCap(t *testing.T) {
|
||||||
|
|
||||||
// initial setup
|
// initial setup
|
||||||
ctx, ck, sk, _, keeper := createTestInput(t)
|
ctx, ck, sk, _, keeper := createTestInput(t)
|
||||||
sk = sk.WithHooks(keeper.Hooks())
|
|
||||||
amtInt := int64(100)
|
amtInt := int64(100)
|
||||||
operatorAddr, amt := addrs[0], sdk.NewInt(amtInt)
|
operatorAddr, amt := addrs[0], sdk.NewInt(amtInt)
|
||||||
valConsPubKey, valConsAddr := pks[0], pks[0].Address()
|
valConsPubKey, valConsAddr := pks[0], pks[0].Address()
|
||||||
|
@ -135,7 +133,6 @@ func TestHandleAbsentValidator(t *testing.T) {
|
||||||
|
|
||||||
// initial setup
|
// initial setup
|
||||||
ctx, ck, sk, _, keeper := createTestInput(t)
|
ctx, ck, sk, _, keeper := createTestInput(t)
|
||||||
sk = sk.WithHooks(keeper.Hooks())
|
|
||||||
amtInt := int64(100)
|
amtInt := int64(100)
|
||||||
addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt)
|
addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt)
|
||||||
sh := stake.NewHandler(sk)
|
sh := stake.NewHandler(sk)
|
||||||
|
@ -146,14 +143,12 @@ func TestHandleAbsentValidator(t *testing.T) {
|
||||||
keeper.AddValidators(ctx, validatorUpdates)
|
keeper.AddValidators(ctx, validatorUpdates)
|
||||||
require.Equal(t, ck.GetCoins(ctx, sdk.AccAddress(addr)), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.Sub(amt)}})
|
require.Equal(t, ck.GetCoins(ctx, sdk.AccAddress(addr)), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.Sub(amt)}})
|
||||||
require.True(t, sdk.NewDecFromInt(amt).Equal(sk.Validator(ctx, addr).GetPower()))
|
require.True(t, sdk.NewDecFromInt(amt).Equal(sk.Validator(ctx, addr).GetPower()))
|
||||||
|
// will exist since the validator has been bonded
|
||||||
info, found := keeper.getValidatorSigningInfo(ctx, sdk.ConsAddress(val.Address()))
|
info, found := keeper.getValidatorSigningInfo(ctx, sdk.ConsAddress(val.Address()))
|
||||||
require.False(t, found)
|
require.True(t, found)
|
||||||
require.Equal(t, int64(0), info.StartHeight)
|
require.Equal(t, int64(0), info.StartHeight)
|
||||||
require.Equal(t, int64(0), info.IndexOffset)
|
require.Equal(t, int64(0), info.IndexOffset)
|
||||||
require.Equal(t, int64(0), info.SignedBlocksCounter)
|
require.Equal(t, int64(0), info.SignedBlocksCounter)
|
||||||
// default time.Time value
|
|
||||||
var blankTime time.Time
|
|
||||||
require.Equal(t, blankTime, info.JailedUntil)
|
|
||||||
height := int64(0)
|
height := int64(0)
|
||||||
|
|
||||||
// 1000 first blocks OK
|
// 1000 first blocks OK
|
||||||
|
@ -292,6 +287,11 @@ func TestHandleNewValidator(t *testing.T) {
|
||||||
ctx, ck, sk, _, keeper := createTestInput(t)
|
ctx, ck, sk, _, keeper := createTestInput(t)
|
||||||
addr, val, amt := addrs[0], pks[0], int64(100)
|
addr, val, amt := addrs[0], pks[0], int64(100)
|
||||||
sh := stake.NewHandler(sk)
|
sh := stake.NewHandler(sk)
|
||||||
|
|
||||||
|
// 1000 first blocks not a validator
|
||||||
|
ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 1)
|
||||||
|
|
||||||
|
// Validator created
|
||||||
got := sh(ctx, newTestMsgCreateValidator(addr, val, sdk.NewInt(amt)))
|
got := sh(ctx, newTestMsgCreateValidator(addr, val, sdk.NewInt(amt)))
|
||||||
require.True(t, got.IsOK())
|
require.True(t, got.IsOK())
|
||||||
validatorUpdates := stake.EndBlocker(ctx, sk)
|
validatorUpdates := stake.EndBlocker(ctx, sk)
|
||||||
|
@ -299,9 +299,6 @@ func TestHandleNewValidator(t *testing.T) {
|
||||||
require.Equal(t, ck.GetCoins(ctx, sdk.AccAddress(addr)), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.SubRaw(amt)}})
|
require.Equal(t, ck.GetCoins(ctx, sdk.AccAddress(addr)), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.SubRaw(amt)}})
|
||||||
require.Equal(t, sdk.NewDec(amt), sk.Validator(ctx, addr).GetPower())
|
require.Equal(t, sdk.NewDec(amt), sk.Validator(ctx, addr).GetPower())
|
||||||
|
|
||||||
// 1000 first blocks not a validator
|
|
||||||
ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 1)
|
|
||||||
|
|
||||||
// Now a validator, for two blocks
|
// Now a validator, for two blocks
|
||||||
keeper.handleValidatorSignature(ctx, val.Address(), 100, true)
|
keeper.handleValidatorSignature(ctx, val.Address(), 100, true)
|
||||||
ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 2)
|
ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 2)
|
||||||
|
|
|
@ -84,6 +84,7 @@ func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.Keeper, para
|
||||||
}
|
}
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
keeper := NewKeeper(cdc, keySlashing, sk, params.Getter(), DefaultCodespace)
|
keeper := NewKeeper(cdc, keySlashing, sk, params.Getter(), DefaultCodespace)
|
||||||
|
sk = sk.WithHooks(keeper.Hooks())
|
||||||
return ctx, ck, sk, params.Setter(), keeper
|
return ctx, ck, sk, params.Setter(), keeper
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue