highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-08-27 14:11:04 +02:00
Code Issues 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
2022-02-23 14:48:00 +01:00
parent 8ee9fc837b
commit 7dfe4018ce
350 changed files with 2421 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autopilot/agent.go
View File

@@ -8,8 +8,8 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/lnwire"
)
@@ -731,7 +731,7 @@ func (a *Agent) executeDirective(directive AttachmentDirective) {
// We'll start out by attempting to connect to the peer in order to
// begin the funding workflow.
nodeID := directive.NodeID
pub, err := btcec.ParsePubKey(nodeID[:], btcec.S256())
pub, err := btcec.ParsePubKey(nodeID[:])
if err != nil {
log.Errorf("Unable to parse pubkey %x: %v", nodeID, err)
return

2
autopilot/agent_constraints.go
View File

@@ -1,7 +1,7 @@
package autopilot
import (
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// AgentConstraints is an interface the agent will query to determine what

2
autopilot/agent_constraints_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/lnwire"
)

4
autopilot/agent_test.go
View File

@@ -8,9 +8,9 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
)
type moreChansResp struct {

4
autopilot/centrality_testdata_test.go
View File

@@ -3,8 +3,8 @@ package autopilot
import (
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/stretchr/testify/require"
)

2
autopilot/combinedattach.go
View File

@@ -3,7 +3,7 @@ package autopilot
import (
"fmt"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// WeightedHeuristic is a tuple that associates a weight to an

2
autopilot/externalscoreattach.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// ExternalScoreAttachment is an implementation of the AttachmentHeuristic

6
autopilot/externalscoreattach_test.go
View File

@@ -3,14 +3,14 @@ package autopilot_test
import (
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/autopilot"
)
// randKey returns a random public key.
func randKey() (*btcec.PublicKey, error) {
priv, err := btcec.NewPrivateKey(btcec.S256())
priv, err := btcec.NewPrivateKey()
if err != nil {
return nil, err
}

22
autopilot/graph.go
View File

@@ -2,14 +2,15 @@ package autopilot
import (
"bytes"
"math/big"
"encoding/hex"
"net"
"sort"
"sync/atomic"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lnwire"
@@ -17,12 +18,13 @@ import (
)
var (
testSig = &btcec.Signature{
R: new(big.Int),
S: new(big.Int),
}
_, _ = testSig.R.SetString("63724406601629180062774974542967536251589935445068131219452686511677818569431", 10)
_, _ = testSig.S.SetString("18801056069249825825291287104931333862866033135609736119018462340006816851118", 10)
testRBytes, _ = hex.DecodeString("8ce2bc69281ce27da07e6683571319d18e949ddfa2965fb6caa1bf0314f882d7")
testSBytes, _ = hex.DecodeString("299105481d63e0f4bc2a88121167221b6700d72a0ead154c03be696a292d24ae")
testRScalar = new(btcec.ModNScalar)
testSScalar = new(btcec.ModNScalar)
_ = testRScalar.SetByteSlice(testRBytes)
_ = testSScalar.SetByteSlice(testSBytes)
testSig = ecdsa.NewSignature(testRScalar, testSScalar)
chanIDCounter uint64 // To be used atomically.
)
@@ -344,7 +346,7 @@ func randChanID() lnwire.ShortChannelID {
// randKey returns a random public key.
func randKey() (*btcec.PublicKey, error) {
priv, err := btcec.NewPrivateKey(btcec.S256())
priv, err := btcec.NewPrivateKey()
if err != nil {
return nil, err
}

2
autopilot/graph_test.go
View File

@@ -3,7 +3,7 @@ package autopilot_test
import (
"testing"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/autopilot"
)

4
autopilot/interface.go
View File

@@ -3,9 +3,9 @@ package autopilot
import (
"net"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/lnwire"
)

2
autopilot/manager.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"

4
autopilot/prefattach.go
View File

@@ -4,8 +4,8 @@ import (
prand "math/rand"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
)
// minMedianChanSizeFraction determines the minimum size a channel must have to

8
autopilot/prefattach_test.go
View File

@@ -8,8 +8,8 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/channeldb"
)
@@ -252,9 +252,7 @@ func TestPrefAttachmentSelectGreedyAllocation(t *testing.T) {
t1.Fatalf("unable to create channel: %v", err)
}
peerPubBytes := edge1.Peer.PubKey()
peerPub, err := btcec.ParsePubKey(
peerPubBytes[:], btcec.S256(),
)
peerPub, err := btcec.ParsePubKey(peerPubBytes[:])
if err != nil {
t.Fatalf("unable to parse pubkey: %v", err)
}

2
autopilot/top_centrality.go
View File

@@ -3,7 +3,7 @@ package autopilot
import (
"runtime"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// TopCentrality is a simple greedy technique to create connections to nodes

4
autopilot/top_centrality_test.go
View File

@@ -3,8 +3,8 @@ package autopilot
import (
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/stretchr/testify/require"
)