wip: refactor obsolete marshal

ethersphere · Jan 15, 2024 · 0939ba6 · 0939ba6
1 parent 15ad6cb
commit 0939ba6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/crypto/crypto.go b/pkg/crypto/crypto.go
@@ -116,7 +116,7 @@ func NewEthereumAddress(p ecdsa.PublicKey) ([]byte, error) {
 	if p.X == nil || p.Y == nil {
 		return nil, errors.New("invalid public key")
 	}
-	pubBytes, _ := p.ECDH() //  elliptic.Marshal(btcec.S256(), p.X, p.Y)
+	pubBytes, _ := p.ECDH()
 	pubHash, err := LegacyKeccak256(pubBytes.Bytes()[1:])
 	if err != nil {
 		return nil, err

diff --git a/pkg/keystore/file/key.go b/pkg/keystore/file/key.go
@@ -83,7 +83,8 @@ func encryptKey(k *ecdsa.PrivateKey, password string, edg keystore.EDG) ([]byte,
 		}
 		addr = a
 	case elliptic.P256():
-		addr = elliptic.Marshal(elliptic.P256(), k.PublicKey.X, k.PublicKey.Y)
+		pubBytes, _ := k.ECDH()
+		addr = pubBytes.Bytes()
 	default:
 		return nil, fmt.Errorf("unsupported curve: %v", k.PublicKey.Curve)
 	}