chg: address comments

0xPolygon · Mar 13, 2024 · 722da0a · 722da0a
1 parent f98b3ae
commit 722da0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/crypto/keys/ed25519/ed25519.go b/crypto/keys/ed25519/ed25519.go
@@ -164,7 +164,7 @@ var (
 // in SDK except in a tendermint validator context.
 func (pubKey *PubKey) Address() crypto.Address {
 	if len(pubKey.Key) != PubKeySize {
-		panic("pubkey is incorrect size")
+		panic(fmt.Sprintf("length of pubkey is incorrect %d != %d", len(pubKey.Key), PubKeySize))
 	}
 	// For ADR-28 compatible address we would need to
 	// return address.Hash(proto.MessageName(pubKey), pubKey.Key)

diff --git a/crypto/keys/secp256k1/secp256k1.go b/crypto/keys/secp256k1/secp256k1.go
@@ -270,7 +270,11 @@ func (pubKey *PubKey) UnmarshalAminoJSON(bz []byte) error {
 
 // Address returns an ethereum style addresses
 func (pubKey *PubKeyOld) Address() crypto.Address {
-	return pubKey.Address()
+	if len(pubKey.Key) != PubKeySize {
+		panic(fmt.Sprintf("length of pubkey is incorrect %d != %d", len(pubKey.Key), PubKeySize))
+	}
+
+	return crypto.Address(ethCrypto.Keccak256(pubKey.Key[1:])[12:])
 }
 
 // Bytes returns the pubkey byte format.
@@ -291,7 +295,12 @@ func (pubKey *PubKeyOld) Equals(other cryptotypes.PubKey) bool {
 }
 
 func (pubKey *PubKeyOld) VerifySignature(msg []byte, sigStr []byte) bool {
-	return pubKey.VerifySignature(msg, sigStr)
+	if len(sigStr) != SigSize {
+		return false
+	}
+
+	hash := ethCrypto.Keccak256(msg)
+	return ethCrypto.VerifySignature(pubKey.Key, hash, sigStr[:64])
 }
 
 // MarshalAmino overrides Amino binary marshaling.