mirror/lnd
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

multi: use btcd's btcec/v2 and btcutil modules

Browse Source 
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:
Oliver Gugger committed 2022-03-09 19:02:37 +01:00
1 parent 8ee9fc837b
commit 7dfe4018ce
350 files changed
+2421 -1289
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lnrpc/autopilotrpc/autopilot_server.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
"encoding/hex"
"sync/atomic"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightningnetwork/lnd/autopilot"
"github.com/lightningnetwork/lnd/lnrpc"
@@ -226,7 +226,7 @@ func (s *Server) QueryScores(ctx context.Context, in *QueryScoresRequest) (
if err != nil {
return nil, err
}
pubKey, err := btcec.ParsePubKey(pubHex, btcec.S256())
pubKey, err := btcec.ParsePubKey(pubHex)
if err != nil {
return nil, err
}
@@ -283,7 +283,7 @@ func (s *Server) SetScores(ctx context.Context,
if err != nil {
return nil, err
}
pubKey, err := btcec.ParsePubKey(pubHex, btcec.S256())
pubKey, err := btcec.ParsePubKey(pubHex)
if err != nil {
return nil, err
}
lnrpc/devrpc/dev_server.go
+1 -1
View File
@@ -12,9 +12,9 @@ import (
"sync/atomic"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lncfg"
lnrpc/invoicesrpc/addinvoice.go
+2 -2
View File
@@ -9,10 +9,10 @@ import (
"math"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lntypes"
lnrpc/invoicesrpc/addinvoice_test.go
+7 -7
View File
@@ -3,10 +3,9 @@ package invoicesrpc
import (
"encoding/hex"
"errors"
"math/big"
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnwire"
@@ -57,11 +56,12 @@ func TestSelectHopHints(t *testing.T) {
"598ec453728e0ffe0ae2f5e174243cf58f2" +
"a3f2c83d2457b43036db568b11093",
)
pubkey = &btcec.PublicKey{
X: big.NewInt(4),
Y: new(big.Int).SetBytes(pubkeyBytes),
Curve: btcec.S256(),
}
pubKeyY = new(btcec.FieldVal)
_ = pubKeyY.SetByteSlice(pubkeyBytes)
pubkey = btcec.NewPublicKey(
new(btcec.FieldVal).SetInt(4),
pubKeyY,
)
compressed = pubkey.SerializeCompressed()
publicChannel = &HopHintInfo{
lnrpc/invoicesrpc/utils.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"encoding/hex"
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/chaincfg"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc"
@@ -275,7 +275,7 @@ func CreateZpay32HopHints(routeHints []*lnrpc.RouteHint) ([][]zpay32.HopHint, er
if err != nil {
return nil, err
}
p, err := btcec.ParsePubKey(pubKeyBytes, btcec.S256())
p, err := btcec.ParsePubKey(pubKeyBytes)
if err != nil {
return nil, err
}
lnrpc/marshall_utils.go
+1 -1
View File
@@ -5,9 +5,9 @@ import (
"errors"
fmt "fmt"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"
)
lnrpc/routerrpc/router_backend.go
+3 -3
View File
@@ -9,10 +9,10 @@ import (
math "math"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/feature"
"github.com/lightningnetwork/lnd/htlcswitch"
@@ -927,7 +927,7 @@ func unmarshallHopHint(rpcHint *lnrpc.HopHint) (zpay32.HopHint, error) {
return zpay32.HopHint{}, err
}
pubkey, err := btcec.ParsePubKey(pubBytes, btcec.S256())
pubkey, err := btcec.ParsePubKey(pubBytes)
if err != nil {
return zpay32.HopHint{}, err
}
lnrpc/routerrpc/router_backend_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"encoding/hex"
"testing"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwire"
lnrpc/routerrpc/router_server.go
+1 -1
View File
@@ -10,8 +10,8 @@ import (
"sync/atomic"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc"
lnrpc/routerrpc/routing_config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package routerrpc
import (
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// RoutingConfig contains the configurable parameters that control routing.
lnrpc/signrpc/signer_server.go
+4 -6
View File
@@ -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.
lnrpc/walletrpc/psbt.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"math"
"time"
"github.com/btcsuite/btcd/btcutil/psbt"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil/psbt"
"github.com/btcsuite/btcwallet/wtxmgr"
"github.com/lightningnetwork/lnd/lnwallet"
)
lnrpc/walletrpc/walletkit_server.go
+5 -5
View File
@@ -14,13 +14,13 @@ import (
"path/filepath"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
"github.com/btcsuite/btcd/btcutil/psbt"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/hdkeychain"
"github.com/btcsuite/btcutil/psbt"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wtxmgr"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
@@ -1526,7 +1526,7 @@ func (w *WalletKit) ImportAccount(ctx context.Context,
func (w *WalletKit) ImportPublicKey(ctx context.Context,
req *ImportPublicKeyRequest) (*ImportPublicKeyResponse, error) {
pubKey, err := btcec.ParsePubKey(req.PublicKey, btcec.S256())
pubKey, err := btcec.ParsePubKey(req.PublicKey)
if err != nil {
return nil, err
}
lnrpc/watchtowerrpc/interface.go
+1 -1
View File
@@ -3,7 +3,7 @@ package watchtowerrpc
import (
"net"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
)
// WatchtowerBackend abstracts access to the watchtower information that is
lnrpc/wtclientrpc/wtclient.go
+4 -4
View File
@@ -7,7 +7,7 @@ import (
"net"
"strconv"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc"
@@ -188,7 +188,7 @@ func (c *WatchtowerClient) AddTower(ctx context.Context,
return nil, err
}
pubKey, err := btcec.ParsePubKey(req.Pubkey, btcec.S256())
pubKey, err := btcec.ParsePubKey(req.Pubkey)
if err != nil {
return nil, err
}
@@ -227,7 +227,7 @@ func (c *WatchtowerClient) RemoveTower(ctx context.Context,
return nil, err
}
pubKey, err := btcec.ParsePubKey(req.Pubkey, btcec.S256())
pubKey, err := btcec.ParsePubKey(req.Pubkey)
if err != nil {
return nil, err
}
@@ -301,7 +301,7 @@ func (c *WatchtowerClient) GetTowerInfo(ctx context.Context,
return nil, err
}
pubKey, err := btcec.ParsePubKey(req.Pubkey, btcec.S256())
pubKey, err := btcec.ParsePubKey(req.Pubkey)
if err != nil {
return nil, err
}