Use any as validator pubkey

CHANGELOG.md

@@ -54,6 +54,15 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (kvstore) [\#7415](https://github.com/cosmos/cosmos-sdk/pull/7415) Allow new stores to be registered during on-chain upgrades.
 
+## [v0.40.0-rc0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.40.0-rc0) - 2020-10-13
+
+### API Breaking Changes
+
+* (x/staking/types) [\#7447](https://github.com/cosmos/cosmos-sdk/issues/7447)  Remove bech32 PubKey support
+  * `ValidatorI` inteface update. `GetConsPubKey`, `GetConsAddr` methods return error
+  * `Validator` update. Methods changed in `ValidatorI` (as described above) and `ToTmValidator` return error.
+  * `Validator.ConsensusPubkey` type changed from `string` to `codectypes.Any`
+  * `MsgCreateValidator.Pubkey` type changed from `string` to `codectypes.Any`
 
 ## [v0.40.0-rc0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.40.0-rc0) - 2020-10-13
 

codec/amino.go

@@ -139,6 +139,7 @@ func (cdc *LegacyAmino) MustUnmarshalBinaryLengthPrefixed(bz []byte, ptr interfa
 	}
 }
 
+// MarshalJSON implements codec.Marshaler interface
 func (cdc *LegacyAmino) MarshalJSON(o interface{}) ([]byte, error) {
 	err := cdc.jsonMarshalAnys(o)
 	if err != nil {
@@ -155,6 +156,7 @@ func (cdc *LegacyAmino) MustMarshalJSON(o interface{}) []byte {
 	return bz
 }
 
+// UnmarshalJSON implements codec.Marshaler interface
 func (cdc *LegacyAmino) UnmarshalJSON(bz []byte, ptr interface{}) error {
 	err := cdc.Amino.UnmarshalJSON(bz, ptr)
 	if err != nil {

proto/cosmos/staking/v1beta1/staking.proto

@@ -2,10 +2,13 @@ syntax = "proto3";
 package cosmos.staking.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "tendermint/types/types.proto";
-import "google/protobuf/timestamp.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
+
+import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "tendermint/types/types.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types";
 
@@ -73,10 +76,12 @@ message Validator {
   option (gogoproto.goproto_getters)  = false;
 
   string operator_address = 1 [(gogoproto.moretags) = "yaml:\"operator_address\""];
-  string consensus_pubkey = 2 [(gogoproto.moretags) = "yaml:\"consensus_pubkey\""];
-  bool   jailed           = 3;
-  BondStatus status       = 4;
-  string tokens = 5 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
+  google.protobuf.Any consensus_pubkey = 2 [
+    (cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey",
+    (gogoproto.moretags) = "yaml:\"consensus_pubkey\""];
+  bool   jailed       = 3;
+  BondStatus status   = 4;
+  string tokens       = 5 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
   string delegator_shares = 6 [
     (gogoproto.moretags)   = "yaml:\"delegator_shares\"",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",

proto/cosmos/staking/v1beta1/tx.proto

@@ -1,11 +1,13 @@
 syntax = "proto3";
 package cosmos.staking.v1beta1;
 
+import "google/protobuf/any.proto";
+import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
+
+import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
-import "google/protobuf/timestamp.proto";
 import "cosmos/staking/v1beta1/staking.proto";
-import "google/protobuf/any.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types";
 
@@ -44,7 +46,7 @@ message MsgCreateValidator {
   ];
   string                   delegator_address = 4 [(gogoproto.moretags) = "yaml:\"delegator_address\""];
   string                   validator_address = 5 [(gogoproto.moretags) = "yaml:\"validator_address\""];
-  google.protobuf.Any      pubkey            = 6;
+  google.protobuf.Any      pubkey            = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];
   cosmos.base.v1beta1.Coin value             = 7 [(gogoproto.nullable) = false];
 }
 
@@ -104,7 +106,7 @@ message MsgBeginRedelegate {
 }
 
 // MsgBeginRedelegateResponse defines the Msg/BeginRedelegate response type.
-message MsgBeginRedelegateResponse { 
+message MsgBeginRedelegateResponse {
   google.protobuf.Timestamp completion_time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 }
 
@@ -120,6 +122,6 @@ message MsgUndelegate {
 }
 
 // MsgUndelegateResponse defines the Msg/Undelegate response type.
-message MsgUndelegateResponse { 
+message MsgUndelegateResponse {
   google.protobuf.Timestamp completion_time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 }

simapp/test_helpers.go

@@ -19,6 +19,7 @@ import (
 
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -92,9 +93,11 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 	bondAmt := sdk.NewInt(1000000)
 
 	for _, val := range valSet.Validators {
+		pkAny, err := codectypes.PackAny(val.PubKey)
+		require.NoError(t, err)
 		validator := stakingtypes.Validator{
 			OperatorAddress:   sdk.ValAddress(val.Address).String(),
-			ConsensusPubkey:   sdk.MustBech32ifyPubKey(sdk.Bech32PubKeyTypeConsPub, val.PubKey),
+			ConsensusPubkey:   pkAny,
 			Jailed:            false,
 			Status:            stakingtypes.Bonded,
 			Tokens:            bondAmt,

x/distribution/simulation/operations_test.go

@@ -243,13 +243,15 @@ func (suite *SimTestSuite) getTestingValidator0(accounts []simtypes.Account) sta
 }
 
 func (suite *SimTestSuite) getTestingValidator(accounts []simtypes.Account, commission stakingtypes.Commission, n int) stakingtypes.Validator {
+	require := suite.Require()
 	account := accounts[n]
 	valPubKey := account.PubKey
 	valAddr := sdk.ValAddress(account.PubKey.Address().Bytes())
-	validator := stakingtypes.NewValidator(valAddr, valPubKey, stakingtypes.Description{})
-	validator, err := validator.SetInitialCommission(commission)
-	suite.Require().NoError(err)
-
+	validator, err := stakingtypes.NewValidator(valAddr, valPubKey, stakingtypes.
+		Description{})
+	require.NoError(err)
+	validator, err = validator.SetInitialCommission(commission)
+	require.NoError(err)
 	validator.DelegatorShares = sdk.NewDec(100)
 	validator.Tokens = sdk.NewInt(1000000)
 

x/gov/keeper/common_test.go

@@ -1,19 +1,22 @@
 package keeper_test
 
 import (
+	"testing"
+
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/stretchr/testify/require"
 )
 
 var (
 	TestProposal = types.NewTextProposal("Test", "description")
 )
 
-func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sdk.AccAddress, []sdk.ValAddress) {
+func createValidators(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sdk.AccAddress, []sdk.ValAddress) {
 	addrs := simapp.AddTestAddrsIncremental(app, ctx, 5, sdk.NewInt(30000000))
 	valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
 	pks := simapp.CreateTestPubKeys(5)
@@ -27,9 +30,12 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sd
 		app.GetSubspace(stakingtypes.ModuleName),
 	)
 
-	val1 := stakingtypes.NewValidator(valAddrs[0], pks[0], stakingtypes.Description{})
-	val2 := stakingtypes.NewValidator(valAddrs[1], pks[1], stakingtypes.Description{})
-	val3 := stakingtypes.NewValidator(valAddrs[2], pks[2], stakingtypes.Description{})
+	val1, err := stakingtypes.NewValidator(valAddrs[0], pks[0], stakingtypes.Description{})
+	require.NoError(t, err)
+	val2, err := stakingtypes.NewValidator(valAddrs[1], pks[1], stakingtypes.Description{})
+	require.NoError(t, err)
+	val3, err := stakingtypes.NewValidator(valAddrs[2], pks[2], stakingtypes.Description{})
+	require.NoError(t, err)
 
 	app.StakingKeeper.SetValidator(ctx, val1)
 	app.StakingKeeper.SetValidator(ctx, val2)

x/gov/keeper/grpc_query_test.go

@@ -713,7 +713,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposits() {
 func (suite *KeeperTestSuite) TestGRPCQueryTally() {
 	app, ctx, queryClient := suite.app, suite.ctx, suite.queryClient
 
-	addrs, _ := createValidators(ctx, app, []int64{5, 5, 5})
+	addrs, _ := createValidators(suite.T(), ctx, app, []int64{5, 5, 5})
 
 	var (
 		req      *types.QueryTallyResultRequest

x/gov/keeper/tally_test.go

@@ -17,7 +17,7 @@ func TestTallyNoOneVotes(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	createValidators(ctx, app, []int64{5, 5, 5})
+	createValidators(t, ctx, app, []int64{5, 5, 5})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -39,7 +39,7 @@ func TestTallyNoQuorum(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	createValidators(ctx, app, []int64{2, 5, 0})
+	createValidators(t, ctx, app, []int64{2, 5, 0})
 
 	addrs := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.NewInt(10000000))
 
@@ -64,7 +64,7 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, _ := createValidators(ctx, app, []int64{5, 5, 5})
+	addrs, _ := createValidators(t, ctx, app, []int64{5, 5, 5})
 	tp := TestProposal
 
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -90,7 +90,7 @@ func TestTallyOnlyValidators51No(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{5, 6, 0})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 0})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -114,7 +114,7 @@ func TestTallyOnlyValidators51Yes(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{5, 6, 0})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 0})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -139,7 +139,7 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{6, 6, 7})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -165,7 +165,7 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{6, 6, 7})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -191,7 +191,7 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{6, 6, 7})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7})
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -217,7 +217,7 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	valAccAddrs, _ := createValidators(ctx, app, []int64{5, 6, 7})
+	valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 7})
 	valAccAddr1, valAccAddr2 := valAccAddrs[0], valAccAddrs[1]
 
 	tp := TestProposal
@@ -243,7 +243,7 @@ func TestTallyDelgatorOverride(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, valAddrs := createValidators(ctx, app, []int64{5, 6, 7})
+	addrs, valAddrs := createValidators(t, ctx, app, []int64{5, 6, 7})
 
 	delTokens := sdk.TokensFromConsensusPower(30)
 	val1, found := app.StakingKeeper.GetValidator(ctx, valAddrs[0])
@@ -279,7 +279,7 @@ func TestTallyDelgatorInherit(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, vals := createValidators(ctx, app, []int64{5, 6, 7})
+	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
 
 	delTokens := sdk.TokensFromConsensusPower(30)
 	val3, found := app.StakingKeeper.GetValidator(ctx, vals[2])
@@ -314,7 +314,7 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, vals := createValidators(ctx, app, []int64{5, 6, 7})
+	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
 
 	delTokens := sdk.TokensFromConsensusPower(10)
 	val1, found := app.StakingKeeper.GetValidator(ctx, vals[0])
@@ -354,9 +354,9 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	createValidators(ctx, app, []int64{25, 6, 7})
+	createValidators(t, ctx, app, []int64{25, 6, 7})
 
-	addrs, vals := createValidators(ctx, app, []int64{5, 6, 7})
+	addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7})
 
 	delTokens := sdk.TokensFromConsensusPower(10)
 	val2, found := app.StakingKeeper.GetValidator(ctx, vals[1])
@@ -395,7 +395,7 @@ func TestTallyJailedValidator(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, valAddrs := createValidators(ctx, app, []int64{25, 6, 7})
+	addrs, valAddrs := createValidators(t, ctx, app, []int64{25, 6, 7})
 
 	delTokens := sdk.TokensFromConsensusPower(10)
 	val2, found := app.StakingKeeper.GetValidator(ctx, valAddrs[1])
@@ -410,7 +410,9 @@ func TestTallyJailedValidator(t *testing.T) {
 
 	_ = staking.EndBlocker(ctx, app.StakingKeeper)
 
-	app.StakingKeeper.Jail(ctx, sdk.ConsAddress(val2.GetConsPubKey().Address()))
+	consKey, err := val2.GetConsPubKey()
+	require.NoError(t, err)
+	app.StakingKeeper.Jail(ctx, sdk.ConsAddress(consKey.Address()))
 
 	tp := TestProposal
 	proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
@@ -436,7 +438,7 @@ func TestTallyValidatorMultipleDelegations(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{})
 
-	addrs, valAddrs := createValidators(ctx, app, []int64{10, 10, 10})
+	addrs, valAddrs := createValidators(t, ctx, app, []int64{10, 10, 10})
 
 	delTokens := sdk.TokensFromConsensusPower(10)
 	val2, found := app.StakingKeeper.GetValidator(ctx, valAddrs[1])

x/ibc/core/02-client/keeper/keeper_test.go

@@ -102,7 +102,9 @@ func (suite *KeeperTestSuite) SetupTest() {
 		privVal := ibctestingmock.NewPV()
 		pk, err := privVal.GetPubKey()
 		suite.Require().NoError(err)
-		val := stakingtypes.NewValidator(sdk.ValAddress(pk.Address()), pk, stakingtypes.Description{})
+		val, err := stakingtypes.NewValidator(sdk.ValAddress(pk.Address()), pk, stakingtypes.Description{})
+		suite.Require().NoError(err)
+
 		val.Status = stakingtypes.Bonded
 		val.Tokens = sdk.NewInt(rand.Int63())
 		validators = append(validators, val)

x/slashing/keeper/unjail.go

@@ -33,8 +33,10 @@ func (k Keeper) Unjail(ctx sdk.Context, validatorAddr sdk.ValAddress) error {
 		return types.ErrValidatorNotJailed
 	}
 
-	consAddr := sdk.ConsAddress(validator.GetConsPubKey().Address())
-
+	consAddr, err := validator.GetConsAddr()
+	if err != nil {
+		return err
+	}
 	// If the validator has a ValidatorSigningInfo object that signals that the
 	// validator was bonded and so we must check that the validator is not tombstoned
 	// and can be unjailed at the current block.