mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-09-21 06:06:20 +02:00
multi: use btcd's btcec/v2 and btcutil modules
This commit was previously split into the following parts to ease review: - 2d746f68: replace imports - 4008f0fd: use ecdsa.Signature - 849e33d1: remove btcec.S256() - b8f6ebbd: use v2 library correctly - fa80bca9: bump go modules
This commit is contained in:
@@ -11,7 +11,7 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/btcsuite/btcd/btcec"
|
||||
"github.com/btcsuite/btcd/btcec/v2"
|
||||
"github.com/btcsuite/btcd/chaincfg/chainhash"
|
||||
"github.com/btcsuite/btcd/txscript"
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
@@ -325,7 +325,7 @@ func (s *Server) SignOutputRaw(ctx context.Context, in *SignReq) (*SignResp,
|
||||
var tweakPrivKey *btcec.PrivateKey
|
||||
if len(signDesc.DoubleTweak) != 0 {
|
||||
tweakPrivKey, _ = btcec.PrivKeyFromBytes(
|
||||
btcec.S256(), signDesc.DoubleTweak,
|
||||
signDesc.DoubleTweak,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -515,7 +515,7 @@ func (s *Server) VerifyMessage(ctx context.Context,
|
||||
if in.Pubkey == nil {
|
||||
return nil, fmt.Errorf("a pubkey to verify MUST be passed in")
|
||||
}
|
||||
pubkey, err := btcec.ParsePubKey(in.Pubkey, btcec.S256())
|
||||
pubkey, err := btcec.ParsePubKey(in.Pubkey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to parse pubkey: %v", err)
|
||||
}
|
||||
@@ -635,9 +635,7 @@ func parseRawKeyBytes(rawKeyBytes []byte) (*btcec.PublicKey, error) {
|
||||
case len(rawKeyBytes) == 33:
|
||||
// If a proper raw key was provided, then we'll attempt
|
||||
// to decode and parse it.
|
||||
return btcec.ParsePubKey(
|
||||
rawKeyBytes, btcec.S256(),
|
||||
)
|
||||
return btcec.ParsePubKey(rawKeyBytes)
|
||||
|
||||
case len(rawKeyBytes) == 0:
|
||||
// No key is provided, return nil.
|
||||
|
Reference in New Issue
Block a user