Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

popm/wasm: fix ethereum address when generating and parsing keys #174

Merged
merged 1 commit into from
Jul 10, 2024
Merged

popm/wasm: fix ethereum address when generating and parsing keys #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions web/popminer/dispatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,11 @@ func generateKey(_ js.Value, args []js.Value) (any, error) {
return nil, fmt.Errorf("generate secp256k1 private key: %w", err)
}

compressedPubKey := privKey.PubKey().SerializeCompressed()
btcAddress, err := btcutil.NewAddressPubKey(compressedPubKey, btcChainParams)
result, err := createKeyResult(privKey, net, btcChainParams)
if err != nil {
log.Errorf("failed to create bitcoin address: %v", err)
return nil, fmt.Errorf("create bitcoin address from public key: %w", err)
return nil, err
}

return KeyResult{
EthereumAddress: ethereum.PublicKeyToAddress(compressedPubKey).String(),
Network: net,
PrivateKey: hex.EncodeToString(privKey.Serialize()),
PublicKey: hex.EncodeToString(compressedPubKey),
PublicKeyHash: btcAddress.AddressPubKeyHash().String(),
}, nil
return result, nil
}

func parseKey(_ js.Value, args []js.Value) (any, error) {
Expand All @@ -247,15 +238,25 @@ func parseKey(_ js.Value, args []js.Value) (any, error) {
}

privKey := dcrsecp256k1.PrivKeyFromBytes(b)
result, err := createKeyResult(privKey, net, btcChainParams)
if err != nil {
return nil, err
}
return result, nil
}

func createKeyResult(privKey *dcrsecp256k1.PrivateKey, net string, btcChainParams *btcchaincfg.Params) (KeyResult, error) {
compressedPubKey := privKey.PubKey().SerializeCompressed()
uncompressedPubKey := privKey.PubKey().SerializeUncompressed()

btcAddress, err := btcutil.NewAddressPubKey(compressedPubKey, btcChainParams)
if err != nil {
log.Errorf("failed to create bitcoin address: %v", err)
return nil, fmt.Errorf("create bitcoin address from public key: %w", err)
return KeyResult{}, fmt.Errorf("create bitcoin address from public key: %w", err)
}

return KeyResult{
EthereumAddress: ethereum.PublicKeyToAddress(compressedPubKey).String(),
EthereumAddress: ethereum.PublicKeyToAddress(uncompressedPubKey).String(),
Network: net,
PrivateKey: hex.EncodeToString(privKey.Serialize()),
PublicKey: hex.EncodeToString(compressedPubKey),
Expand Down
Loading