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

Merge PR #5157: Remove pubkey from slashing infraction log

This commit is contained in:
Xuefeng Zhu 2019-10-14 10:49:14 -07:00 committed by Alexander Bezobchuk
parent 9f3789157e
commit 21f2896f8d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x/slashing/internal/keeper/infractions.go
View File

@ -21,8 +21,7 @@ func (k Keeper) HandleDoubleSign(ctx sdk.Context, addr crypto.Address, infractio
// fetch the validator public key // fetch the validator public key
consAddr := sdk.ConsAddress(addr) consAddr := sdk.ConsAddress(addr)
pubkey, err := k.GetPubkey(ctx, addr) if _, err := k.GetPubkey(ctx, addr); err != nil {
if err != nil {
// Ignore evidence that cannot be handled. // Ignore evidence that cannot be handled.
// NOTE: // NOTE:
// We used to panic with: // We used to panic with:
@ -38,7 +37,7 @@ func (k Keeper) HandleDoubleSign(ctx sdk.Context, addr crypto.Address, infractio
// Reject evidence if the double-sign is too old // Reject evidence if the double-sign is too old
if age > k.MaxEvidenceAge(ctx) { if age > k.MaxEvidenceAge(ctx) {
logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, age of %d past max age of %d", logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, age of %d past max age of %d",
sdk.ConsAddress(pubkey.Address()), infractionHeight, age, k.MaxEvidenceAge(ctx))) consAddr, infractionHeight, age, k.MaxEvidenceAge(ctx)))
return return
} }
@ -59,12 +58,12 @@ func (k Keeper) HandleDoubleSign(ctx sdk.Context, addr crypto.Address, infractio
// validator is already tombstoned // validator is already tombstoned
if signInfo.Tombstoned { if signInfo.Tombstoned {
logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, validator already tombstoned", sdk.ConsAddress(pubkey.Address()), infractionHeight)) logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, validator already tombstoned", consAddr, infractionHeight))
return return
} }
// double sign confirmed // double sign confirmed
logger.Info(fmt.Sprintf("Confirmed double sign from %s at height %d, age of %d", sdk.ConsAddress(pubkey.Address()), infractionHeight, age)) logger.Info(fmt.Sprintf("Confirmed double sign from %s at height %d, age of %d", consAddr, infractionHeight, age))
// We need to retrieve the stake distribution which signed the block, so we subtract ValidatorUpdateDelay from the evidence height. // We need to retrieve the stake distribution which signed the block, so we subtract ValidatorUpdateDelay from the evidence height.
// Note that this *can* result in a negative "distributionHeight", up to -ValidatorUpdateDelay, // Note that this *can* result in a negative "distributionHeight", up to -ValidatorUpdateDelay,
@ -119,8 +118,7 @@ func (k Keeper) HandleValidatorSignature(ctx sdk.Context, addr crypto.Address, p
// fetch the validator public key // fetch the validator public key
consAddr := sdk.ConsAddress(addr) consAddr := sdk.ConsAddress(addr)
pubkey, err := k.GetPubkey(ctx, addr) if _, err := k.GetPubkey(ctx, addr); err != nil {
if err != nil {
panic(fmt.Sprintf("Validator consensus-address %s not found", consAddr)) panic(fmt.Sprintf("Validator consensus-address %s not found", consAddr))
} }
@ -164,7 +162,7 @@ func (k Keeper) HandleValidatorSignature(ctx sdk.Context, addr crypto.Address, p
) )
logger.Info( logger.Info(
fmt.Sprintf("Absent validator %s (%s) at height %d, %d missed, threshold %d", consAddr, pubkey, height, signInfo.MissedBlocksCounter, k.MinSignedPerWindow(ctx))) fmt.Sprintf("Absent validator %s at height %d, %d missed, threshold %d", consAddr, height, signInfo.MissedBlocksCounter, k.MinSignedPerWindow(ctx)))
} }
minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx) minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx)