certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Back to greater than

This commit is contained in:
Christopher Goes 2018-10-12 21:15:39 +02:00
parent bdfb10f551
commit 1ff2e865a8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/spec/slashing/begin-block.md
View File

@ -109,7 +109,7 @@ for val in block.Validators:
// included in 50% of the recent LastCommits // included in 50% of the recent LastCommits
minHeight = signInfo.StartHeight + SIGNED_BLOCKS_WINDOW minHeight = signInfo.StartHeight + SIGNED_BLOCKS_WINDOW
maxMissed = SIGNED_BLOCKS_WINDOW / 2 maxMissed = SIGNED_BLOCKS_WINDOW / 2
if height >= minHeight AND signInfo.MissedBlocksCounter > maxMissed: if height > minHeight AND signInfo.MissedBlocksCounter > maxMissed:
signInfo.JailedUntil = block.Time + DOWNTIME_UNBOND_DURATION signInfo.JailedUntil = block.Time + DOWNTIME_UNBOND_DURATION
slash & unbond the validator slash & unbond the validator

2
x/slashing/keeper.go
View File

@ -128,7 +128,7 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, p
} }
minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx) minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx)
maxMissed := k.SignedBlocksWindow(ctx) - k.MinSignedPerWindow(ctx) maxMissed := k.SignedBlocksWindow(ctx) - k.MinSignedPerWindow(ctx)
if height >= minHeight && signInfo.MissedBlocksCounter > maxMissed { if height > minHeight && signInfo.MissedBlocksCounter > maxMissed {
validator := k.validatorSet.ValidatorByConsAddr(ctx, consAddr) validator := k.validatorSet.ValidatorByConsAddr(ctx, consAddr)
if validator != nil && !validator.GetJailed() { if validator != nil && !validator.GetJailed() {
// Downtime confirmed: slash and jail the validator // Downtime confirmed: slash and jail the validator

8
x/slashing/keeper_test.go
View File

@ -421,8 +421,8 @@ func TestValidatorDippingInAndOut(t *testing.T) {
validator, _ = sk.GetValidator(ctx, addr) validator, _ = sk.GetValidator(ctx, addr)
require.Equal(t, sdk.Bonded, validator.Status) require.Equal(t, sdk.Bonded, validator.Status)
// validator misses 500 blocks // validator misses 501 blocks
for ; height < int64(1202); height++ { for ; height < int64(1203); height++ {
ctx = ctx.WithBlockHeight(height) ctx = ctx.WithBlockHeight(height)
keeper.handleValidatorSignature(ctx, val.Address(), newAmt, false) keeper.handleValidatorSignature(ctx, val.Address(), newAmt, false)
} }
@ -433,7 +433,7 @@ func TestValidatorDippingInAndOut(t *testing.T) {
require.Equal(t, sdk.Bonded, validator.Status) require.Equal(t, sdk.Bonded, validator.Status)
// validator signs 500 blocks // validator signs 500 blocks
for ; height < int64(1701); height++ { for ; height < int64(1702); height++ {
ctx = ctx.WithBlockHeight(height) ctx = ctx.WithBlockHeight(height)
keeper.handleValidatorSignature(ctx, val.Address(), newAmt, true) keeper.handleValidatorSignature(ctx, val.Address(), newAmt, true)
} }
@ -442,7 +442,7 @@ func TestValidatorDippingInAndOut(t *testing.T) {
signingInfo, found := keeper.getValidatorSigningInfo(ctx, sdk.ConsAddress(val.Address())) signingInfo, found := keeper.getValidatorSigningInfo(ctx, sdk.ConsAddress(val.Address()))
require.True(t, found) require.True(t, found)
require.Equal(t, int64(700), signingInfo.StartHeight) require.Equal(t, int64(700), signingInfo.StartHeight)
require.Equal(t, int64(1101), signingInfo.IndexOffset) require.Equal(t, int64(1102), signingInfo.IndexOffset)
require.Equal(t, int64(501), signingInfo.MissedBlocksCounter) require.Equal(t, int64(501), signingInfo.MissedBlocksCounter)
// should be jailed & kicked // should be jailed & kicked