Regen Network/Slashing protobuf

CHANGELOG.md

@@ -78,7 +78,7 @@ for JSON encoding.
   * Every reference of `crypto.Pubkey` in context of a `Validator` is now of type string. `GetPubKeyFromBech32` must be used to get the `crypto.Pubkey`.
   * The `Keeper` constructor now takes a `codec.Marshaler` instead of a concrete Amino codec. This exact type
   provided is specified by `ModuleCdc`.
-* (slashing) [\#5627](https://github.com/cosmos/cosmos-sdk/pull/5627) Migrate the `x/slashing` module to use Protocol Buffer for state
+* (x/slashing) [\#5627](https://github.com/cosmos/cosmos-sdk/pull/5627) Migrate the `x/slashing` module to use Protocol Buffer for state
 serialization instead of Amino. The exact codec used is `codec.HybridCodec` which utilizes Protobuf for binary encoding and Amino
 for JSON encoding.
   * The `Keeper` constructor now takes a `codec.Marshaler` instead of a concrete Amino codec. This exact type

simapp/codec.go

@@ -16,8 +16,8 @@ type AppCodec struct {
 	amino *codec.Codec
 
 	Params       *params.Codec
-	Staking      *staking.Codec
 	Slashing     *slashing.Codec
+	Staking      *staking.Codec
 	Distribution *distr.Codec
 }
 

x/slashing/client/cli/query.go

@@ -69,7 +69,6 @@ $ <appcli> query slashing signing-info cosmosvalconspub1zcjduepqfhvwcmt7p06fvdge
 
 			var signingInfo types.ValidatorSigningInfo
 			signingInfo, err = types.UnmarshalValSigningInfo(types.ModuleCdc, res)
-
 			if err != nil {
 				return err
 			}

x/slashing/client/rest/query.go

@@ -45,8 +45,8 @@ func signingInfoHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 		}
 
 		params := types.NewQuerySigningInfoParams(sdk.ConsAddress(pk.Address()))
-		bz, err := params.Marshal()
 
+		bz, err := cliCtx.Codec.MarshalJSON(params)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return
@@ -78,11 +78,10 @@ func signingInfoHandlerListFn(cliCtx context.CLIContext) http.HandlerFunc {
 			return
 		}
 
-		params := types.NewQuerySigningInfosParams(int32(page), int32(limit))
-		bz, err := params.Marshal()
-
+		params := types.NewQuerySigningInfosParams(page, limit)
+		bz, err := cliCtx.Codec.MarshalJSON(params)
 		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return
 		}
 

x/slashing/internal/keeper/keeper.go

@@ -41,7 +41,6 @@ func (k Keeper) AddPubkey(ctx sdk.Context, pubkey crypto.PubKey) {
 	addr := pubkey.Address()
 
 	pkStr, err := sdk.Bech32ifyPubKey(sdk.Bech32PubKeyTypeConsPub, pubkey)
-
 	if err != nil {
 		panic(fmt.Errorf("error while setting address-pubkey relation: %s", addr))
 	}
@@ -55,13 +54,11 @@ func (k Keeper) GetPubkey(ctx sdk.Context, address crypto.Address) (crypto.PubKe
 
 	var pubkey gogotypes.StringValue
 	err := k.cdc.UnmarshalBinaryLengthPrefixed(store.Get(types.GetAddrPubkeyRelationKey(address)), &pubkey)
-
 	if err != nil {
 		return nil, fmt.Errorf("address %s not found", sdk.ConsAddress(address))
 	}
 
 	pkStr, err := sdk.GetPubKeyFromBech32(sdk.Bech32PubKeyTypeConsPub, pubkey.Value)
-
 	if err != nil {
 		return pkStr, err
 	}

x/slashing/internal/types/codec.go

@@ -13,6 +13,7 @@ type Codec struct {
 	codec.Marshaler
 	// Keep reference to the amino codec to allow backwards compatibility along
 	// with type, and interface registration.
+
 	amino *codec.Codec
 }
 
@@ -24,8 +25,6 @@ var ModuleCdc *Codec
 
 func init() {
 	ModuleCdc = NewCodec(codec.New())
-	//ModuleCdc = codec.New()
 	RegisterCodec(ModuleCdc.amino)
-	//codec.RegisterCrypto(ModuleCdc)
 	ModuleCdc.amino.Seal()
 }

x/slashing/internal/types/msg.go

@@ -29,7 +29,7 @@ func (msg MsgUnjail) GetSignBytes() []byte {
 
 // ValidateBasic validity check for the AnteHandler
 func (msg MsgUnjail) ValidateBasic() error {
-	if len(msg.ValidatorAddr) < 1 { //if empty
+	if msg.ValidatorAddr.Empty() {
 		return ErrBadValidatorAddr
 	}
 

x/slashing/internal/types/msg_test.go

@@ -14,7 +14,7 @@ func TestMsgUnjailGetSignBytes(t *testing.T) {
 	bytes := msg.GetSignBytes()
 	require.Equal(
 		t,
-		`{"type":"cosmos-sdk/MsgUnjail","value":{"validator_addr":"cosmosvaloper1v93xxeqhg9nn6"}}`,
+		`{"type":"cosmos-sdk/MsgUnjail","value":{"address":"cosmosvaloper1v93xxeqhg9nn6"}}`,
 		string(bytes),
 	)
 }

x/slashing/internal/types/types.proto

@@ -10,7 +10,8 @@ import "google/protobuf/timestamp.proto";
 message MsgUnjail {
   bytes validator_addr = 1 [
     (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress",
-    (gogoproto.moretags) = "yaml:\"validator_address\""
+    (gogoproto.moretags) = "yaml:\"address\"",
+    (gogoproto.jsontag) = "address"
   ];
 }
 
@@ -20,13 +21,15 @@ message ValidatorSigningInfo {
   option (gogoproto.goproto_stringer) = false;
 
   bytes address = 1 [
-    (gogoproto.casttype) =  "github.com/cosmos/cosmos-sdk/types.ConsAddress",
-    (gogoproto.moretags) =  "yaml:\"address\""                             // validator consensus address
+    (gogoproto.casttype) =  "github.com/cosmos/cosmos-sdk/types.ConsAddress" // validator consensus address
   ];
   int64 start_height = 2 [(gogoproto.moretags) =  "yaml:\"start_height\""]; // height at which validator was first a candidate OR was unjailed
   int64 index_offset = 3 [(gogoproto.moretags) =  "yaml:\"index_offset\""]; // index offset into signed block bit array
-  google.protobuf.Timestamp jailed_until = 4 [(gogoproto.stdtime)  = true,
-                                             (gogoproto.nullable) = false]; // timestamp validator cannot be unjailed until
-  bool tombstoned   = 5 [(gogoproto.moretags) =  "yaml:\"tombstoned\""]; // whether or not a validator has been tombstoned (killed out of validator set)
+  google.protobuf.Timestamp jailed_until = 4 [
+    (gogoproto.moretags) =  "yaml:\"jailed_until\"",
+    (gogoproto.stdtime)  = true,
+    (gogoproto.nullable) = false
+  ]; // timestamp validator cannot be unjailed until
+  bool tombstoned   = 5; // whether or not a validator has been tombstoned (killed out of validator set)
   int64 missed_blocks_counter = 6 [(gogoproto.moretags) =  "yaml:\"missed_blocks_counter\""]; // missed blocks counter (to avoid scanning the array every time)
 }

x/slashing/simulation/decoder.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/tendermint/tendermint/crypto"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
@@ -22,10 +23,10 @@ func DecodeStore(cdc *codec.Codec, kvA, kvB tmkv.Pair) string {
 		return fmt.Sprintf("%v\n%v", infoA, infoB)
 
 	case bytes.Equal(kvA.Key[:1], types.ValidatorMissedBlockBitArrayKey):
-		var missedA, missedB bool
+		var missedA, missedB gogotypes.BoolValue
 		cdc.MustUnmarshalBinaryLengthPrefixed(kvA.Value, &missedA)
 		cdc.MustUnmarshalBinaryLengthPrefixed(kvB.Value, &missedB)
-		return fmt.Sprintf("missedA: %v\nmissedB: %v", missedA, missedB)
+		return fmt.Sprintf("missedA: %v\nmissedB: %v", missedA.Value, missedB.Value)
 
 	case bytes.Equal(kvA.Key[:1], types.AddrPubkeyRelationKey):
 		var pubKeyA, pubKeyB crypto.PubKey

x/slashing/simulation/decoder_test.go

@@ -2,6 +2,7 @@ package simulation
 
 import (
 	"fmt"
+	gogotypes "github.com/gogo/protobuf/types"
 	"testing"
 	"time"
 
@@ -36,11 +37,11 @@ func TestDecodeStore(t *testing.T) {
 
 	info := types.NewValidatorSigningInfo(consAddr1, 0, 1, time.Now().UTC(), false, 0)
 	bechPK := sdk.MustBech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, delPk1)
-	missed := true
+	missed := gogotypes.BoolValue{Value: true}
 
 	kvPairs := tmkv.Pairs{
 		tmkv.Pair{Key: types.GetValidatorSigningInfoKey(consAddr1), Value: cdc.MustMarshalBinaryLengthPrefixed(info)},
-		tmkv.Pair{Key: types.GetValidatorMissedBlockBitArrayKey(consAddr1, 6), Value: cdc.MustMarshalBinaryLengthPrefixed(missed)},
+		tmkv.Pair{Key: types.GetValidatorMissedBlockBitArrayKey(consAddr1, 6), Value: cdc.MustMarshalBinaryLengthPrefixed(&missed)},
 		tmkv.Pair{Key: types.GetAddrPubkeyRelationKey(delAddr1), Value: cdc.MustMarshalBinaryLengthPrefixed(delPk1)},
 		tmkv.Pair{Key: []byte{0x99}, Value: []byte{0x99}},
 	}
@@ -50,7 +51,7 @@ func TestDecodeStore(t *testing.T) {
 		expectedLog string
 	}{
 		{"ValidatorSigningInfo", fmt.Sprintf("%v\n%v", info, info)},
-		{"ValidatorMissedBlockBitArray", fmt.Sprintf("missedA: %v\nmissedB: %v", missed, missed)},
+		{"ValidatorMissedBlockBitArray", fmt.Sprintf("missedA: %v\nmissedB: %v", missed.Value, missed.Value)},
 		{"AddrPubkeyRelation", fmt.Sprintf("PubKeyA: %s\nPubKeyB: %s", bechPK, bechPK)},
 		{"other", ""},
 	}