From 93f1cb45cc242f55b1c5b683eab026354b8e9305 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Mon, 28 May 2018 23:24:58 +0200 Subject: [PATCH] Split slashing params & signing info into separate files --- x/slashing/keeper.go | 85 -------------------------------------- x/slashing/params.go | 37 +++++++++++++++++ x/slashing/signing_info.go | 60 +++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 85 deletions(-) create mode 100644 x/slashing/params.go create mode 100644 x/slashing/signing_info.go diff --git a/x/slashing/keeper.go b/x/slashing/keeper.go index 4c9d92a2f..c8fcbe1b9 100644 --- a/x/slashing/keeper.go +++ b/x/slashing/keeper.go @@ -1,7 +1,6 @@ package slashing import ( - "encoding/binary" "fmt" sdk "github.com/cosmos/cosmos-sdk/types" @@ -10,37 +9,6 @@ import ( crypto "github.com/tendermint/go-crypto" ) -const ( - // MaxEvidenceAge - Max age for evidence - 21 days (3 weeks) - // TODO Should this be a governance parameter or just modifiable with SoftwareUpgradeProposals? - // MaxEvidenceAge = 60 * 60 * 24 * 7 * 3 - // TODO Temporarily set to 2 minutes for testnets. - MaxEvidenceAge int64 = 60 * 2 - - // SignedBlocksWindow - sliding window for downtime slashing - // TODO Governance parameter? - // TODO Temporarily set to 100 blocks for testnets - SignedBlocksWindow int64 = 100 - - // Downtime slashing threshold - 50% - // TODO Governance parameter? - MinSignedPerWindow int64 = SignedBlocksWindow / 2 - - // Downtime unbond duration - 1 day - // TODO Governance parameter? - DowntimeUnbondDuration int64 = 86400 -) - -var ( - // SlashFractionDoubleSign - currently 5% - // TODO Governance parameter? - SlashFractionDoubleSign = sdk.NewRat(1).Quo(sdk.NewRat(20)) - - // SlashFractionDowntime - currently 1% - // TODO Governance parameter? - SlashFractionDowntime = sdk.NewRat(1).Quo(sdk.NewRat(100)) -) - // Keeper of the slashing store type Keeper struct { storeKey sdk.StoreKey @@ -104,56 +72,3 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, pubkey crypto.PubKey, k.setValidatorSigningInfo(ctx, address, signInfo) } } - -func (k Keeper) getValidatorSigningInfo(ctx sdk.Context, address sdk.Address) (info validatorSigningInfo, found bool) { - store := ctx.KVStore(k.storeKey) - bz := store.Get(validatorSigningInfoKey(address)) - if bz == nil { - found = false - } else { - k.cdc.MustUnmarshalBinary(bz, &info) - found = true - } - return -} - -func (k Keeper) setValidatorSigningInfo(ctx sdk.Context, address sdk.Address, info validatorSigningInfo) { - store := ctx.KVStore(k.storeKey) - bz := k.cdc.MustMarshalBinary(info) - store.Set(validatorSigningInfoKey(address), bz) -} - -func (k Keeper) getValidatorSigningBitArray(ctx sdk.Context, address sdk.Address, index int64) (signed bool) { - store := ctx.KVStore(k.storeKey) - bz := store.Get(validatorSigningBitArrayKey(address, index)) - if bz == nil { - // lazy: treat empty key as unsigned - signed = false - } else { - k.cdc.MustUnmarshalBinary(bz, &signed) - } - return -} - -func (k Keeper) setValidatorSigningBitArray(ctx sdk.Context, address sdk.Address, index int64, signed bool) { - store := ctx.KVStore(k.storeKey) - bz := k.cdc.MustMarshalBinary(signed) - store.Set(validatorSigningBitArrayKey(address, index), bz) -} - -type validatorSigningInfo struct { - StartHeight int64 `json:"start_height"` - IndexOffset int64 `json:"index_offset"` - JailedUntil int64 `json:"jailed_until"` - SignedBlocksCounter int64 `json:"signed_blocks_counter"` -} - -func validatorSigningInfoKey(v sdk.Address) []byte { - return append([]byte{0x01}, v.Bytes()...) -} - -func validatorSigningBitArrayKey(v sdk.Address, i int64) []byte { - b := make([]byte, 8) - binary.LittleEndian.PutUint64(b, uint64(i)) - return append([]byte{0x02}, append(v.Bytes(), b...)...) -} diff --git a/x/slashing/params.go b/x/slashing/params.go new file mode 100644 index 000000000..5e611fa0b --- /dev/null +++ b/x/slashing/params.go @@ -0,0 +1,37 @@ +package slashing + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +const ( + // MaxEvidenceAge - Max age for evidence - 21 days (3 weeks) + // TODO Should this be a governance parameter or just modifiable with SoftwareUpgradeProposals? + // MaxEvidenceAge = 60 * 60 * 24 * 7 * 3 + // TODO Temporarily set to 2 minutes for testnets. + MaxEvidenceAge int64 = 60 * 2 + + // SignedBlocksWindow - sliding window for downtime slashing + // TODO Governance parameter? + // TODO Temporarily set to 100 blocks for testnets + SignedBlocksWindow int64 = 100 + + // Downtime slashing threshold - 50% + // TODO Governance parameter? + MinSignedPerWindow int64 = SignedBlocksWindow / 2 + + // Downtime unbond duration + // TODO Governance parameter? + // TODO Temporarily set to 6 hours for testnets + DowntimeUnbondDuration int64 = 60 * 60 * 6 +) + +var ( + // SlashFractionDoubleSign - currently 5% + // TODO Governance parameter? + SlashFractionDoubleSign = sdk.NewRat(1).Quo(sdk.NewRat(20)) + + // SlashFractionDowntime - currently 1% + // TODO Governance parameter? + SlashFractionDowntime = sdk.NewRat(1).Quo(sdk.NewRat(100)) +) diff --git a/x/slashing/signing_info.go b/x/slashing/signing_info.go new file mode 100644 index 000000000..8cb66318d --- /dev/null +++ b/x/slashing/signing_info.go @@ -0,0 +1,60 @@ +package slashing + +import ( + "encoding/binary" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func (k Keeper) getValidatorSigningInfo(ctx sdk.Context, address sdk.Address) (info validatorSigningInfo, found bool) { + store := ctx.KVStore(k.storeKey) + bz := store.Get(validatorSigningInfoKey(address)) + if bz == nil { + found = false + } else { + k.cdc.MustUnmarshalBinary(bz, &info) + found = true + } + return +} + +func (k Keeper) setValidatorSigningInfo(ctx sdk.Context, address sdk.Address, info validatorSigningInfo) { + store := ctx.KVStore(k.storeKey) + bz := k.cdc.MustMarshalBinary(info) + store.Set(validatorSigningInfoKey(address), bz) +} + +func (k Keeper) getValidatorSigningBitArray(ctx sdk.Context, address sdk.Address, index int64) (signed bool) { + store := ctx.KVStore(k.storeKey) + bz := store.Get(validatorSigningBitArrayKey(address, index)) + if bz == nil { + // lazy: treat empty key as unsigned + signed = false + } else { + k.cdc.MustUnmarshalBinary(bz, &signed) + } + return +} + +func (k Keeper) setValidatorSigningBitArray(ctx sdk.Context, address sdk.Address, index int64, signed bool) { + store := ctx.KVStore(k.storeKey) + bz := k.cdc.MustMarshalBinary(signed) + store.Set(validatorSigningBitArrayKey(address, index), bz) +} + +type validatorSigningInfo struct { + StartHeight int64 `json:"start_height"` + IndexOffset int64 `json:"index_offset"` + JailedUntil int64 `json:"jailed_until"` + SignedBlocksCounter int64 `json:"signed_blocks_counter"` +} + +func validatorSigningInfoKey(v sdk.Address) []byte { + return append([]byte{0x01}, v.Bytes()...) +} + +func validatorSigningBitArrayKey(v sdk.Address, i int64) []byte { + b := make([]byte, 8) + binary.LittleEndian.PutUint64(b, uint64(i)) + return append([]byte{0x02}, append(v.Bytes(), b...)...) +}