mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-01-19 05:45:21 +01:00
Code Issues Projects Releases Wiki Activity

lnrpc: allow importing Taproot pubkeys

Browse Source
This commit is contained in:
Oliver Gugger 2022-07-29 18:20:03 +02:00
parent 394ee84120
commit 97dfc04117
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lnrpc/walletrpc/walletkit_server.go
View File

@ -17,6 +17,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
"github.com/btcsuite/btcd/btcutil/psbt"
@ -1639,7 +1640,7 @@ func parseAddrType(addrType AddressType,
// distinction between the standard BIP-0049 address schema (nested witness
// pubkeys everywhere) and our own BIP-0049Plus address schema (nested pubkeys
// externally, witness pubkeys internally).
func (w *WalletKit) ImportAccount(ctx context.Context,
func (w *WalletKit) ImportAccount(_ context.Context,
req *ImportAccountRequest) (*ImportAccountResponse, error) {
accountPubKey, err := hdkeychain.NewKeyFromString(req.ExtendedPublicKey)
@ -1699,13 +1700,24 @@ func (w *WalletKit) ImportAccount(ctx context.Context,
// of legacy versions (xpub, tpub), an address type must be specified as we
// intend to not support importing BIP-44 keys into the wallet using the legacy
// pay-to-pubkey-hash (P2PKH) scheme.
func (w *WalletKit) ImportPublicKey(ctx context.Context,
func (w *WalletKit) ImportPublicKey(_ context.Context,
req *ImportPublicKeyRequest) (*ImportPublicKeyResponse, error) {
pubKey, err := btcec.ParsePubKey(req.PublicKey)
var (
pubKey *btcec.PublicKey
err error
)
switch req.AddressType {
case AddressType_TAPROOT_PUBKEY:
pubKey, err = schnorr.ParsePubKey(req.PublicKey)
default:
pubKey, err = btcec.ParsePubKey(req.PublicKey)
}
if err != nil {
return nil, err
}
addrType, err := parseAddrType(req.AddressType, true)
if err != nil {
return nil, err