Skip to content

Commit 77ab72b

Browse files
guggeroellemouton
authored andcommitted
multi: upgrade to btcd v2 modules
Migrate all btcd dependencies to the new per-package v2 modules (wire/v2, txscript/v2, chaincfg/v2, chainhash/v2, btcutil/v2, psbt/v2, btcec/v2) introduced by btcd v0.26.0, and pin the tagged ecosystem versions: btcwallet v0.17.0, neutrino v0.18.0 and lightning-onion v1.4.0. The bulk of the import rewrite was produced by the scripted diff from btcsuite/btcd#2547 (followed by 'make rpc'). The address symbols that moved out of btcutil into the new address package are imported as btcaddr where a local "address" variable would otherwise shadow them. The go.mod/go.sum updates and the remaining manual compilation fixes are folded into this single commit so it builds on its own (the migration was previously split into a reproducible scripted-diff plus follow-ups, intended to be squashed on merge).
1 parent b927e03 commit 77ab72b

605 files changed

Lines changed: 1734 additions & 1790 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

actor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ require (
2222

2323
replace github.com/lightningnetwork/lnd/queue => ../queue
2424

25-
replace github.com/lightningnetwork/lnd/ticker v1.0.0 => ../ticker
25+
replace github.com/lightningnetwork/lnd/ticker => ../ticker
2626

2727
replace github.com/lightningnetwork/lnd/fn/v2 => ../fn

autopilot/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/btcsuite/btcd/btcec/v2"
13-
"github.com/btcsuite/btcd/btcutil"
13+
"github.com/btcsuite/btcd/btcutil/v2"
1414
"github.com/lightningnetwork/lnd/fn/v2"
1515
"github.com/lightningnetwork/lnd/lnutils"
1616
"github.com/lightningnetwork/lnd/lnwire"

autopilot/agent_constraints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package autopilot
22

33
import (
4-
"github.com/btcsuite/btcd/btcutil"
4+
"github.com/btcsuite/btcd/btcutil/v2"
55
)
66

77
// AgentConstraints is an interface the agent will query to determine what

autopilot/agent_constraints_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/btcsuite/btcd/btcutil"
8+
"github.com/btcsuite/btcd/btcutil/v2"
99
"github.com/lightningnetwork/lnd/lnwire"
1010
)
1111

autopilot/agent_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/btcsuite/btcd/btcec/v2"
13-
"github.com/btcsuite/btcd/btcutil"
14-
"github.com/btcsuite/btcd/wire"
13+
"github.com/btcsuite/btcd/btcutil/v2"
14+
"github.com/btcsuite/btcd/wire/v2"
1515
"github.com/stretchr/testify/require"
1616
)
1717

autopilot/centrality_testdata_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/btcsuite/btcd/btcec/v2"
7-
"github.com/btcsuite/btcd/btcutil"
7+
"github.com/btcsuite/btcd/btcutil/v2"
88
"github.com/stretchr/testify/require"
99
)
1010

autopilot/combinedattach.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/btcsuite/btcd/btcutil"
7+
"github.com/btcsuite/btcd/btcutil/v2"
88
)
99

1010
// WeightedHeuristic is a tuple that associates a weight to an

autopilot/externalscoreattach.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"sync"
77

8-
"github.com/btcsuite/btcd/btcutil"
8+
"github.com/btcsuite/btcd/btcutil/v2"
99
)
1010

1111
// ExternalScoreAttachment is an implementation of the AttachmentHeuristic

autopilot/externalscoreattach_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/btcsuite/btcd/btcec/v2"
7-
"github.com/btcsuite/btcd/btcutil"
7+
"github.com/btcsuite/btcd/btcutil/v2"
88
"github.com/lightningnetwork/lnd/autopilot"
99
)
1010

autopilot/graph.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/btcsuite/btcd/btcec/v2"
1010
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
11-
"github.com/btcsuite/btcd/btcutil"
11+
"github.com/btcsuite/btcd/btcutil/v2"
1212
graphdb "github.com/lightningnetwork/lnd/graph/db"
1313
"github.com/lightningnetwork/lnd/graph/db/models"
1414
"github.com/lightningnetwork/lnd/lnwire"

0 commit comments

Comments
 (0)