PubKey proto types

codec/codec.go

@@ -54,4 +54,13 @@ type (
 		Size() int
 		Unmarshal(data []byte) error
 	}
+
+	// AminoMarshaler defines an interface where Amino marshalling can be
+	// overridden by custom marshalling.
+	AminoMarshaler interface {
+		MarshalAmino() ([]byte, error)
+		UnmarshalAmino([]byte) error
+		MarshalAminoJSON() ([]byte, error)
+		UnmarshalAminoJSON([]byte) error
+	}
 )

crypto/codec/amino.go

@@ -6,6 +6,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/sr25519"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
 )
@@ -25,17 +26,22 @@ func RegisterCrypto(cdc *codec.LegacyAmino) {
 		ed25519.PubKeyName, nil)
 	cdc.RegisterConcrete(sr25519.PubKey{},
 		sr25519.PubKeyName, nil)
-	cdc.RegisterConcrete(secp256k1.PubKey{},
+	cdc.RegisterConcrete(&secp256k1.PubKey{},
 		secp256k1.PubKeyName, nil)
+	// TODO Follow-up in https://github.com/cosmos/cosmos-sdk/pull/7284
+	// Remove `multisig.PubKeyMultisigThreshold{}`, and register instead
+	// kmultisig.LegacyAminoPubKey{} on `PubKeyAminoRoute`.
 	cdc.RegisterConcrete(multisig.PubKeyMultisigThreshold{},
 		multisig.PubKeyAminoRoute, nil)
+	cdc.RegisterConcrete(&kmultisig.LegacyAminoPubKey{},
+		"cosmos-sdk/LegacyAminoPubKey", nil)
 
 	cdc.RegisterInterface((*crypto.PrivKey)(nil), nil)
 	cdc.RegisterConcrete(ed25519.PrivKey{},
 		ed25519.PrivKeyName, nil)
 	cdc.RegisterConcrete(sr25519.PrivKey{},
 		sr25519.PrivKeyName, nil)
-	cdc.RegisterConcrete(secp256k1.PrivKey{},
+	cdc.RegisterConcrete(&secp256k1.PrivKey{},
 		secp256k1.PrivKeyName, nil)
 }
 

crypto/hd/algo.go

@@ -66,6 +66,6 @@ func (s secp256k1Algo) Generate() GenerateFn {
 		var bzArr = make([]byte, secp256k1.PrivKeySize)
 		copy(bzArr, bz)
 
-		return secp256k1.PrivKey(bzArr)
+		return &secp256k1.PrivKey{Key: bzArr}
 	}
 }

crypto/hd/fundraiser_test.go

@@ -65,7 +65,8 @@ func TestFundraiserCompatibility(t *testing.T) {
 		master, ch := hd.ComputeMastersFromSeed(seed)
 		priv, err := hd.DerivePrivateKeyForPath(master, ch, "44'/118'/0'/0/0")
 		require.NoError(t, err)
-		pub := secp256k1.PrivKey(priv).PubKey()
+		privKey := &secp256k1.PrivKey{Key: priv}
+		pub := privKey.PubKey()
 
 		t.Log("\tNODEJS GOLANG\n")
 		t.Logf("SEED \t%X %X\n", seedB, seed)
@@ -78,7 +79,7 @@ func TestFundraiserCompatibility(t *testing.T) {
 		require.Equal(t, priv[:], privB, "Expected priv keys to match")
 		pubBFixed := make([]byte, secp256k1.PubKeySize)
 		copy(pubBFixed, pubB)
-		require.Equal(t, pub, secp256k1.PubKey(pubBFixed), fmt.Sprintf("Expected pub keys to match for %d", i))
+		require.Equal(t, pub, &secp256k1.PubKey{Key: pubBFixed}, fmt.Sprintf("Expected pub keys to match for %d", i))
 
 		addr := pub.Address()
 		t.Logf("ADDR  \t%X %X\n", addrB, addr)

crypto/keyring/types_test.go

@@ -12,11 +12,11 @@ import (
 )
 
 func Test_writeReadLedgerInfo(t *testing.T) {
-	tmpKey := make(secp256k1.PubKey, secp256k1.PubKeySize)
+	tmpKey := make([]byte, secp256k1.PubKeySize)
 	bz, _ := hex.DecodeString("035AD6810A47F073553FF30D2FCC7E0D3B1C0B74B61A1AAA2582344037151E143A")
 	copy(tmpKey[:], bz)
 
-	lInfo := newLedgerInfo("some_name", tmpKey, *hd.NewFundraiserParams(5, sdk.CoinType, 1), hd.Secp256k1Type)
+	lInfo := newLedgerInfo("some_name", &secp256k1.PubKey{Key: tmpKey}, *hd.NewFundraiserParams(5, sdk.CoinType, 1), hd.Secp256k1Type)
 	assert.Equal(t, TypeLedger, lInfo.GetType())
 
 	path, err := lInfo.GetPath()