Merge pull request #34 from 0xPolygon/bermuell/crypto-sync

fix(crypto): update secp256k1 key names to match with CometBFT changes
0xPolygon · Jan 15, 2025 · 67bf9d5 · 67bf9d5
2 parents aac63f4 + ea008ac
commit 67bf9d5
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 49 deletions.
diff --git a/api/cosmos/crypto/secp256k1/keys.pulsar.go b/api/cosmos/crypto/secp256k1/keys.pulsar.go
diff --git a/client/keys/output_test.go b/client/keys/output_test.go
@@ -41,7 +41,7 @@ func TestBech32KeysOutput(t *testing.T) {
 	out, err := MkAccKeyOutput(k)
 	require.NoError(t, err)
 	require.Equal(t, expectedOutput, out)
-	require.Equal(t, "{Name:multisig Type:multi Address:0x16a035adce9fe233cec9cd50699922c90618bc7a PubKey:{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":1,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"}]} Mnemonic:}", fmt.Sprintf("%+v", out))
+	require.Equal(t, "{Name:multisig Type:multi Address:0xe7e1add937d6cd091d6a0db2ea44eef5c1613c72 PubKey:{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":1,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"}]} Mnemonic:}", fmt.Sprintf("%+v", out))
 }
 
 // TestBech32KeysOutputNestedMsig tests that the output of a nested multisig key is correct
@@ -65,7 +65,7 @@ func TestBech32KeysOutputNestedMsig(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Equal(t, expectedOutput, out)
-	require.Equal(t, "{Name:multisig Type:multi Address:0xf03f3dfbd4f8973f5c48ef53297d746e141983c2 PubKey:{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":2,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"},{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":1,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"}]}]} Mnemonic:}", fmt.Sprintf("%+v", out))
+	require.Equal(t, "{Name:multisig Type:multi Address:0x7d1c3ef842dcc796df25d46a0716005d30de5a9a PubKey:{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":2,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"},{\"@type\":\"/cosmos.crypto.multisig.LegacyAminoPubKey\",\"threshold\":1,\"public_keys\":[{\"@type\":\"/cosmos.crypto.secp256k1.PubKey\",\"key\":\"BOrroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJRBvMr2v1o7/Tt5MFOm9RcJhxfM8axlq8SseN3Dl07xg=\"}]}]} Mnemonic:}", fmt.Sprintf("%+v", out))
 }
 
 func TestProtoMarshalJSON(t *testing.T) {

diff --git a/client/keys/show_test.go b/client/keys/show_test.go
@@ -33,11 +33,11 @@ func Test_multiSigKey_Properties(t *testing.T) {
 
 	pub, err := k.GetPubKey()
 	require.NoError(t, err)
-	require.Equal(t, "D2B8E5992CF6A3F5904E537F65F27B8FE85DDD38", pub.Address().String())
+	require.Equal(t, "8F86E3DB26D754696569401A2933FD740C1389EA", pub.Address().String())
 
 	addr, err := k.GetAddress()
 	require.NoError(t, err)
-	require.Equal(t, "0xd2b8e5992cf6a3f5904e537f65f27b8fe85ddd38", sdk.MustHexifyAddressBytes(addr))
+	require.Equal(t, "0x8f86e3db26d754696569401a2933fd740c1389ea", sdk.MustHexifyAddressBytes(addr))
 }
 
 func Test_showKeysCmd(t *testing.T) {

diff --git a/crypto/keys/secp256k1/keys.pb.go b/crypto/keys/secp256k1/keys.pb.go
diff --git a/crypto/keys/secp256k1/secp256k1.go b/crypto/keys/secp256k1/secp256k1.go
@@ -31,8 +31,8 @@ const (
 	keyType        = "secp256k1"
 	PrivKeyNameOld = "tendermint/PrivKeySecp256k1"
 	PubKeyNameOld  = "tendermint/PubKeySecp256k1"
-	PrivKeyName    = "comet/PrivKeySecp256k1Uncompressed"
-	PubKeyName     = "comet/PubKeySecp256k1Uncompressed"
+	PrivKeyName    = "cometbft/PrivKeySecp256k1eth"
+	PubKeyName     = "cometbft/PubKeySecp256k1eth"
 )
 
 func (privKey *PrivKeyOld) Bytes() []byte {

diff --git a/crypto/ledger/ledger_test.go b/crypto/ledger/ledger_test.go
@@ -34,7 +34,7 @@ func TestPublicKeyUnsafe(t *testing.T) {
 func checkDefaultPubKey(t *testing.T, priv types.LedgerPrivKey) {
 	require.NotNil(t, priv)
 	expectedPkStr := "PubKeySecp256k1{034FEF9CD7C4C63588D3B03FEB5281B9D232CBA34D6F3D71AEE59211FFBFE1FE870000000000000000000000000000000000000000000000000000000000000000}"
-	require.Equal(t, "7277b5e741034fef9cd7c4c63588d3b03feb5281b9d232cba34d6f3d71aee59211ffbfe1fe870000000000000000000000000000000000000000000000000000000000000000",
+	require.Equal(t, "6ca3b68f41034fef9cd7c4c63588d3b03feb5281b9d232cba34d6f3d71aee59211ffbfe1fe870000000000000000000000000000000000000000000000000000000000000000",
 		fmt.Sprintf("%x", cdc.Amino.MustMarshalBinaryBare(priv.PubKey())),
 		"Is your device using test mnemonic: %s ?", testdata.TestMnemonic)
 	require.Equal(t, expectedPkStr, priv.PubKey().String())

diff --git a/proto/cosmos/crypto/secp256k1/keys.proto b/proto/cosmos/crypto/secp256k1/keys.proto
@@ -29,7 +29,7 @@ message PubKeyOld {
 // PubKey defines a comet uncompressed secp256k1 public key
 // Key is the uncompressed form of the pubkey.
 message PubKey {
-  option (amino.name) = "comet/PubKeySecp256k1Uncompressed";
+  option (amino.name) = "cometbft/PubKeySecp256k1eth";
   // The Amino encoding is simply the inner bytes field, and not the Amino
   // encoding of the whole PubKey struct.
   //
@@ -56,7 +56,7 @@ message PrivKeyOld {
 
 // PrivKey defines a comet secp256k1 private key.
 message PrivKey {
-  option (amino.name)             = "comet/PrivKeySecp256k1Uncompressed";
+  option (amino.name)             = "cometbft/PrivKeySecp256k1eth";
   option (amino.message_encoding) = "key_field";
 
   bytes key = 1;