Feat/bech32plus2

crypto/composite/composite.go

@@ -1,21 +1,39 @@
 package composite
 
 import (
-	"bytes"
-
+	"github.com/tendermint/go-amino"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/bls"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 )
 
 // PubKeyComposite and PrivKeyComposite are intended to allow public key algorithms to be selected for each function.
-
+//todo
 const (
-	PubKeyCompositeAminoName  = "tendermint/PubKeyComposite"
-	PrivKeyCompositeAminoName = "tendermint/PrivKeyComposite"
+	PrivKeyAminoName = "tendermint/PrivKeyComposite"
+	PubKeyAminoName  = "tendermint/PubKeyComposite"
 )
 
+var cdc = amino.NewCodec()
+
+func init() {
+	cdc.RegisterInterface((*crypto.PubKey)(nil), nil)
+	cdc.RegisterConcrete(PubKeyComposite{},
+		PubKeyAminoName, nil)
+	cdc.RegisterConcrete(bls.PubKeyBLS12{},
+		bls.PubKeyAminoName, nil)
+	cdc.RegisterConcrete(ed25519.PubKeyEd25519{},
+		ed25519.PubKeyAminoName, nil)
+	cdc.RegisterInterface((*crypto.PrivKey)(nil), nil)
+	cdc.RegisterConcrete(PrivKeyComposite{},
+		PrivKeyAminoName, nil)
+	cdc.RegisterConcrete(bls.PrivKeyBLS12{},
+		bls.PrivKeyAminoName, nil)
+	cdc.RegisterConcrete(ed25519.PrivKeyEd25519{},
+		ed25519.PrivKeyAminoName, nil)
+}
+
 type PubKeyComposite struct {
 	SignKey crypto.PubKey `json:"sign"`
 	VrfKey  crypto.PubKey `json:"vrf"`
@@ -30,9 +48,11 @@ func (pk PubKeyComposite) Address() crypto.Address {
 }
 
 func (pk PubKeyComposite) Bytes() []byte {
-	msg := bytes.NewBuffer(pk.SignKey.Bytes())
-	msg.Write(pk.VrfKey.Bytes())
-	return msg.Bytes()
+	bz, err := cdc.MarshalBinaryBare(pk)
+	if err != nil {
+		panic(err)
+	}
+	return bz
 }
 
 func (pk PubKeyComposite) VerifyBytes(msg []byte, sig []byte) bool {
@@ -67,7 +87,7 @@ func (sk PrivKeyComposite) Identity() crypto.PrivKey {
 }
 
 func (sk PrivKeyComposite) Bytes() []byte {
-	return sk.Identity().Bytes()
+	return cdc.MustMarshalBinaryBare(sk)
 }
 
 func (sk PrivKeyComposite) Sign(msg []byte) ([]byte, error) {

crypto/composite/composite_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/tendermint/go-amino"
@@ -185,8 +186,8 @@ func TestEnvironmentalCompatibility(t *testing.T) {
 	cdc.RegisterConcrete(bls.PrivKeyBLS12{}, bls.PrivKeyAminoName, nil)
 	cdc.RegisterConcrete(ed25519.PubKeyEd25519{}, ed25519.PubKeyAminoName, nil)
 	cdc.RegisterConcrete(ed25519.PrivKeyEd25519{}, ed25519.PrivKeyAminoName, nil)
-	cdc.RegisterConcrete(composite.PubKeyComposite{}, composite.PubKeyCompositeAminoName, nil)
-	cdc.RegisterConcrete(composite.PrivKeyComposite{}, composite.PrivKeyCompositeAminoName, nil)
+	cdc.RegisterConcrete(composite.PubKeyComposite{}, composite.PubKeyAminoName, nil)
+	cdc.RegisterConcrete(composite.PrivKeyComposite{}, composite.PrivKeyAminoName, nil)
 
 	t.Run("MarshalCompositeKey", func(t *testing.T) {
 		privKey := composite.GenPrivKey()
@@ -253,7 +254,7 @@ func TestEnvironmentalCompatibility(t *testing.T) {
 		// compare addresses to assumed value
 		compositePrivKey := composite.NewPrivKeyComposite(blsPrivKey, ed25519PrivKey)
 		compositePubKey := compositePrivKey.PubKey()
-		address, err := hex.DecodeString("7A68265205CB115AE35A13515C423F1721E87BB4")
+		address, err := hex.DecodeString(strings.ToUpper("72dd758835404175940f698cf3ddc29dd0d04afa"))
 		if err != nil {
 			t.Fatal(err)
 		}

crypto/encoding/amino/amino.go

@@ -38,7 +38,7 @@ func init() {
 	nameTable[reflect.TypeOf(sr25519.PubKeySr25519{})] = sr25519.PubKeyAminoName
 	nameTable[reflect.TypeOf(secp256k1.PubKeySecp256k1{})] = secp256k1.PubKeyAminoName
 	nameTable[reflect.TypeOf(multisig.PubKeyMultisigThreshold{})] = multisig.PubKeyMultisigThresholdAminoRoute
-	nameTable[reflect.TypeOf(composite.PubKeyComposite{})] = composite.PubKeyCompositeAminoName
+	nameTable[reflect.TypeOf(composite.PubKeyComposite{})] = composite.PubKeyAminoName
 }
 
 // PubkeyAminoName returns the amino route of a pubkey
@@ -64,7 +64,7 @@ func RegisterAmino(cdc *amino.Codec) {
 	cdc.RegisterConcrete(multisig.PubKeyMultisigThreshold{},
 		multisig.PubKeyMultisigThresholdAminoRoute, nil)
 	cdc.RegisterConcrete(composite.PubKeyComposite{},
-		composite.PubKeyCompositeAminoName, nil)
+		composite.PubKeyAminoName, nil)
 
 	cdc.RegisterInterface((*crypto.PrivKey)(nil), nil)
 	cdc.RegisterConcrete(bls.PrivKeyBLS12{},
@@ -76,7 +76,7 @@ func RegisterAmino(cdc *amino.Codec) {
 	cdc.RegisterConcrete(secp256k1.PrivKeySecp256k1{},
 		secp256k1.PrivKeyAminoName, nil)
 	cdc.RegisterConcrete(composite.PrivKeyComposite{},
-		composite.PrivKeyCompositeAminoName, nil)
+		composite.PrivKeyAminoName, nil)
 }
 
 // RegisterKeyType registers an external key type to allow decoding it from bytes

crypto/encoding/amino/encode_test.go

@@ -1,10 +1,13 @@
 package cryptoamino
 
 import (
+	"github.com/tendermint/tendermint/crypto/bls"
 	"os"
 	"reflect"
 	"testing"
 
+	"github.com/tendermint/tendermint/crypto/composite"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -31,7 +34,6 @@ func checkAminoBinary(t *testing.T, src, dst interface{}, size int) {
 	}
 	// Make sure we have the expected length.
 	assert.Equal(t, size, len(bz), "Amino binary size mismatch")
-
 	// Unmarshal.
 	err = cdc.UnmarshalBinaryBare(bz, dst)
 	require.Nil(t, err, "%+v", err)
@@ -94,10 +96,21 @@ func TestKeyEncodings(t *testing.T) {
 			pubSize:  38,
 			sigSize:  65,
 		},
+		{
+			privKey:  bls.GenPrivKey(),
+			privSize: 37,
+			pubSize:  53,
+			sigSize:  97,
+		},
+		{
+			privKey:  *composite.GenPrivKey(),
+			privSize: 114,
+			pubSize:  98,
+			sigSize:  97,
+		},
 	}
 
 	for tcIndex, tc := range cases {
-
 		// Check (de/en)codings of PrivKeys.
 		var priv2, priv3 crypto.PrivKey
 		checkAminoBinary(t, tc.privKey, &priv2, tc.privSize)
@@ -155,6 +168,7 @@ func TestPubkeyAminoName(t *testing.T) {
 		{ed25519.PubKeyEd25519{}, ed25519.PubKeyAminoName, true},
 		{sr25519.PubKeySr25519{}, sr25519.PubKeyAminoName, true},
 		{secp256k1.PubKeySecp256k1{}, secp256k1.PubKeyAminoName, true},
+		{composite.PubKeyComposite{}, composite.PubKeyAminoName, true},
 		{multisig.PubKeyMultisigThreshold{}, multisig.PubKeyMultisigThresholdAminoRoute, true},
 	}
 	for i, tc := range tests {

libs/bech32/bech32.go

@@ -1,27 +1,26 @@
 package bech32
 
 import (
-	"github.com/btcsuite/btcutil/bech32"
 	"github.com/pkg/errors"
 )
 
 //ConvertAndEncode converts from a base64 encoded byte string to base32 encoded byte string and then to bech32
 func ConvertAndEncode(hrp string, data []byte) (string, error) {
-	converted, err := bech32.ConvertBits(data, 8, 5, true)
+	converted, err := ConvertBits(data, 8, 5, true)
 	if err != nil {
 		return "", errors.Wrap(err, "encoding bech32 failed")
 	}
-	return bech32.Encode(hrp, converted)
+	return Encode(hrp, converted)
 
 }
 
 //DecodeAndConvert decodes a bech32 encoded string and converts to base64 encoded bytes
 func DecodeAndConvert(bech string) (string, []byte, error) {
-	hrp, data, err := bech32.Decode(bech)
+	hrp, data, err := Decode(bech)
 	if err != nil {
 		return "", nil, errors.Wrap(err, "decoding bech32 failed")
 	}
-	converted, err := bech32.ConvertBits(data, 5, 8, false)
+	converted, err := ConvertBits(data, 5, 8, false)
 	if err != nil {
 		return "", nil, errors.Wrap(err, "decoding bech32 failed")
 	}