What changed, and why it matters
This is a large dependency upgrade for the LND Lightning node software. It moves LND from older btcd Bitcoin library packages to new 'v2' packages and updates related wallet and network libraries. The commit is almost entirely mechanical import-path changes and version bumps. It does not appear to fix a specific known security bug on its own, but it pulls in newer upstream versions that may contain security fixes. Because the change touches 605 files and many core Bitcoin-handling modules, any mistake in the migration could affect transaction parsing, address handling, or cryptographic operations, so it should be reviewed and tested carefully.
Treat this as a routine but high-touch dependency upgrade. Verify that the new btcd/btcwallet/neutrino versions do not introduce regressions in transaction/address/script handling. Run the full test suite and integration tests. Check upstream btcd/btcwallet release notes for any security advisories or breaking changes not covered by the import rewrites. No immediate emergency response is warranted based solely on this commit, but it should be included in the next release with normal validation.
Security signals we found
Large dependency upgrade touching core Bitcoin primitives (wire, txscript, chainhash, btcutil, psbt, address)
Migration to new v2 module layout with API changes in address handling
Pins new upstream releases (btcd 0.26.0, btcwallet 0.17.0, neutrino 0.18.0, lightning-onion 1.4.0) that may include undisclosed fixes
No explicit security fix or CVE mentioned in commit message
No direct vulnerability evidence in the diff; changes are import-path and type-name adaptations
Evidence from the diff
The commit upgrades LND to btcd v0.26.0’s per-package v2 modules: wire/v2, txscript/v2, chaincfg/v2, chainhash/v2, btcutil/v2, psbt/v2, btcec/v2 (already on v2), and the new address/v2 package. It also pins btcwallet v0.17.0, neutrino v0.18.0, and lightning-onion v1.4.0. The diff is dominated by import rewrites, go.mod/go.sum updates, and minor API adaptation (e.g., btcutil.Address -> address.Address, btcutil.Hash160 -> address.Hash160, btcutil.DecodeAddress -> address.DecodeAddress, btcutil/psbt -> psbt/v2, btcutil/bech32 -> address/v2/bech32). No explicit security bug is described in the commit message, and no CVE or advisory is referenced.
Changed components
go.mod / go.sum dependency graphchainntnfs (bitcoind/btcd/neutrino notifiers)lnwallet and btcwallet integrationcontractcourt (breach/HTLC/channel arbitrators)channeldb and migrationsrouting and graph dbfunding manager and PSBT handlingRPC servers (wallet, signer, router, chain)watchtower client/serverzpay32/BOLT11 invoice parsingautopilot and channel backup/restoreInspect captured patch +1733 / −1789
diff --git a/actor/go.mod b/actor/go.mod
index 8949ca0..f8ad71a 100644
--- a/actor/go.mod
+++ b/actor/go.mod
@@ -22,6 +22,6 @@ require (
replace github.com/lightningnetwork/lnd/queue => ../queue
-replace github.com/lightningnetwork/lnd/ticker v1.0.0 => ../ticker
+replace github.com/lightningnetwork/lnd/ticker => ../ticker
replace github.com/lightningnetwork/lnd/fn/v2 => ../fn
diff --git a/autopilot/agent.go b/autopilot/agent.go
index cbb29f3..793e38d 100644
--- a/autopilot/agent.go
+++ b/autopilot/agent.go
@@ -10,7 +10,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lnutils"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/autopilot/agent_constraints.go b/autopilot/agent_constraints.go
index 63c7ac5..1b006ba 100644
--- a/autopilot/agent_constraints.go
+++ b/autopilot/agent_constraints.go
@@ -1,7 +1,7 @@
package autopilot
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// AgentConstraints is an interface the agent will query to determine what
diff --git a/autopilot/agent_constraints_test.go b/autopilot/agent_constraints_test.go
index 64152ce..59d4932 100644
--- a/autopilot/agent_constraints_test.go
+++ b/autopilot/agent_constraints_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/autopilot/agent_test.go b/autopilot/agent_test.go
index 82c21a2..0dbe4f1 100644
--- a/autopilot/agent_test.go
+++ b/autopilot/agent_test.go
@@ -10,8 +10,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/stretchr/testify/require"
)
diff --git a/autopilot/centrality_testdata_test.go b/autopilot/centrality_testdata_test.go
index 38a9045..756feda 100644
--- a/autopilot/centrality_testdata_test.go
+++ b/autopilot/centrality_testdata_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/stretchr/testify/require"
)
diff --git a/autopilot/combinedattach.go b/autopilot/combinedattach.go
index 9064a82..d98fa5a 100644
--- a/autopilot/combinedattach.go
+++ b/autopilot/combinedattach.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// WeightedHeuristic is a tuple that associates a weight to an
diff --git a/autopilot/externalscoreattach.go b/autopilot/externalscoreattach.go
index a979e15..1db25fb 100644
--- a/autopilot/externalscoreattach.go
+++ b/autopilot/externalscoreattach.go
@@ -5,7 +5,7 @@ import (
"fmt"
"sync"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// ExternalScoreAttachment is an implementation of the AttachmentHeuristic
diff --git a/autopilot/externalscoreattach_test.go b/autopilot/externalscoreattach_test.go
index 7bf440a..5219a56 100644
--- a/autopilot/externalscoreattach_test.go
+++ b/autopilot/externalscoreattach_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/autopilot"
)
diff --git a/autopilot/graph.go b/autopilot/graph.go
index 19bd380..d2876ed 100644
--- a/autopilot/graph.go
+++ b/autopilot/graph.go
@@ -8,7 +8,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/autopilot/graph_test.go b/autopilot/graph_test.go
index 9a52e67..b199c46 100644
--- a/autopilot/graph_test.go
+++ b/autopilot/graph_test.go
@@ -3,7 +3,7 @@ package autopilot_test
import (
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/autopilot"
)
diff --git a/autopilot/interface.go b/autopilot/interface.go
index 7181323..8c24e03 100644
--- a/autopilot/interface.go
+++ b/autopilot/interface.go
@@ -5,8 +5,8 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/autopilot/manager.go b/autopilot/manager.go
index 600a105..aa56d15 100644
--- a/autopilot/manager.go
+++ b/autopilot/manager.go
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/autopilot/prefattach.go b/autopilot/prefattach.go
index 7d36674..b90a15e 100644
--- a/autopilot/prefattach.go
+++ b/autopilot/prefattach.go
@@ -6,7 +6,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// minMedianChanSizeFraction determines the minimum size a channel must have to
diff --git a/autopilot/prefattach_test.go b/autopilot/prefattach_test.go
index 9ff9d30..d836a7b 100644
--- a/autopilot/prefattach_test.go
+++ b/autopilot/prefattach_test.go
@@ -11,8 +11,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/autopilot/top_centrality.go b/autopilot/top_centrality.go
index e96b340..39e10a4 100644
--- a/autopilot/top_centrality.go
+++ b/autopilot/top_centrality.go
@@ -4,7 +4,7 @@ import (
"context"
"runtime"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// TopCentrality is a simple greedy technique to create connections to nodes
diff --git a/autopilot/top_centrality_test.go b/autopilot/top_centrality_test.go
index a6fe227..57e8d2f 100644
--- a/autopilot/top_centrality_test.go
+++ b/autopilot/top_centrality_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/stretchr/testify/require"
)
diff --git a/blockcache/blockcache.go b/blockcache/blockcache.go
index 532629f..54749e2 100644
--- a/blockcache/blockcache.go
+++ b/blockcache/blockcache.go
@@ -1,9 +1,9 @@
package blockcache
import (
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/cache"
"github.com/lightninglabs/neutrino/cache/lru"
diff --git a/blockcache/blockcache_test.go b/blockcache/blockcache_test.go
index f108ab6..89cfd44 100644
--- a/blockcache/blockcache_test.go
+++ b/blockcache/blockcache_test.go
@@ -6,9 +6,9 @@ import (
"sync"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/cache"
"github.com/stretchr/testify/require"
diff --git a/bolt12/validate.go b/bolt12/validate.go
index d6473b6..b8c359d 100644
--- a/bolt12/validate.go
+++ b/bolt12/validate.go
@@ -8,7 +8,7 @@ import (
"unicode/utf8"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/chainntnfs/best_block_view.go b/chainntnfs/best_block_view.go
index c043e68..4ad934e 100644
--- a/chainntnfs/best_block_view.go
+++ b/chainntnfs/best_block_view.go
@@ -6,7 +6,7 @@ import (
"sync"
"sync/atomic"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// BestBlockView is an interface that allows the querying of the most
diff --git a/chainntnfs/best_block_view_test.go b/chainntnfs/best_block_view_test.go
index 2a55bc8..9b49600 100644
--- a/chainntnfs/best_block_view_test.go
+++ b/chainntnfs/best_block_view_test.go
@@ -7,8 +7,8 @@ import (
"testing/quick"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/lntest/mock"
"github.com/lightningnetwork/lnd/lntest/wait"
diff --git a/chainntnfs/bitcoindnotify/bitcoind.go b/chainntnfs/bitcoindnotify/bitcoind.go
index a1beb78..5028c78 100644
--- a/chainntnfs/bitcoindnotify/bitcoind.go
+++ b/chainntnfs/bitcoindnotify/bitcoind.go
@@ -8,11 +8,11 @@ import (
"sync/atomic"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/bitcoindnotify/bitcoind_dev.go b/chainntnfs/bitcoindnotify/bitcoind_dev.go
index b7c2b5f..f16b1ba 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_dev.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_dev.go
@@ -8,7 +8,7 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/lightningnetwork/lnd/chainntnfs"
)
diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go
index 0a2d14f..141e183 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_test.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/integration/rpctest"
"github.com/btcsuite/btcd/rpcclient"
"github.com/btcsuite/btcwallet/chain"
diff --git a/chainntnfs/bitcoindnotify/driver.go b/chainntnfs/bitcoindnotify/driver.go
index 1968f74..b24fdf7 100644
--- a/chainntnfs/bitcoindnotify/driver.go
+++ b/chainntnfs/bitcoindnotify/driver.go
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/btcdnotify/btcd.go b/chainntnfs/btcdnotify/btcd.go
index 9117804..ebe2c62 100644
--- a/chainntnfs/btcdnotify/btcd.go
+++ b/chainntnfs/btcdnotify/btcd.go
@@ -8,12 +8,12 @@ import (
"time"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/rpcclient"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/btcdnotify/btcd_dev.go b/chainntnfs/btcdnotify/btcd_dev.go
index 11b20ff..bd2a157 100644
--- a/chainntnfs/btcdnotify/btcd_dev.go
+++ b/chainntnfs/btcdnotify/btcd_dev.go
@@ -7,7 +7,7 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
)
diff --git a/chainntnfs/btcdnotify/btcd_test.go b/chainntnfs/btcdnotify/btcd_test.go
index 6a1b978..df7a6ce 100644
--- a/chainntnfs/btcdnotify/btcd_test.go
+++ b/chainntnfs/btcdnotify/btcd_test.go
@@ -7,7 +7,7 @@ import (
"bytes"
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/integration/rpctest"
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/btcdnotify/driver.go b/chainntnfs/btcdnotify/driver.go
index 067b48c..08afbd6 100644
--- a/chainntnfs/btcdnotify/driver.go
+++ b/chainntnfs/btcdnotify/driver.go
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/rpcclient"
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/interface.go b/chainntnfs/interface.go
index 342d268..9dc9fd7 100644
--- a/chainntnfs/interface.go
+++ b/chainntnfs/interface.go
@@ -10,9 +10,9 @@ import (
"github.com/btcsuite/btcd/blockchain"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
)
diff --git a/chainntnfs/interface_dev.go b/chainntnfs/interface_dev.go
index eb30722..472d863 100644
--- a/chainntnfs/interface_dev.go
+++ b/chainntnfs/interface_dev.go
@@ -3,7 +3,7 @@
package chainntnfs
-import "github.com/btcsuite/btcd/chaincfg/chainhash"
+import "github.com/btcsuite/btcd/chainhash/v2"
// TestChainNotifier enables the use of methods that are only present during
// testing for ChainNotifiers.
diff --git a/chainntnfs/mempool.go b/chainntnfs/mempool.go
index 037bde9..82ca069 100644
--- a/chainntnfs/mempool.go
+++ b/chainntnfs/mempool.go
@@ -4,8 +4,8 @@ import (
"sync"
"sync/atomic"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnutils"
)
diff --git a/chainntnfs/mempool_test.go b/chainntnfs/mempool_test.go
index c0da43f..905b063 100644
--- a/chainntnfs/mempool_test.go
+++ b/chainntnfs/mempool_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/stretchr/testify/require"
)
diff --git a/chainntnfs/mocks.go b/chainntnfs/mocks.go
index 4a888b1..3579bbb 100644
--- a/chainntnfs/mocks.go
+++ b/chainntnfs/mocks.go
@@ -1,8 +1,8 @@
package chainntnfs
import (
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/stretchr/testify/mock"
)
diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go
index 51e82a1..06752f0 100644
--- a/chainntnfs/neutrinonotify/neutrino.go
+++ b/chainntnfs/neutrinonotify/neutrino.go
@@ -9,12 +9,12 @@ import (
"time"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/gcs/builder"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/btcutil/v2/gcs/builder"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/rpcclient"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightningnetwork/lnd/blockcache"
diff --git a/chainntnfs/neutrinonotify/neutrino_dev.go b/chainntnfs/neutrinonotify/neutrino_dev.go
index e70cdf4..44aa9c2 100644
--- a/chainntnfs/neutrinonotify/neutrino_dev.go
+++ b/chainntnfs/neutrinonotify/neutrino_dev.go
@@ -7,7 +7,7 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/rpcclient"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/chainntnfs/test/test_interface.go b/chainntnfs/test/test_interface.go
index 7536d24..7c89989 100644
--- a/chainntnfs/test/test_interface.go
+++ b/chainntnfs/test/test_interface.go
@@ -11,11 +11,11 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/integration/rpctest"
"github.com/btcsuite/btcd/rpcclient"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/chain"
_ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to auto-register the boltdb walletdb implementation.
"github.com/lightninglabs/neutrino"
diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go
index 17e379e..adca0a4 100644
--- a/chainntnfs/test_utils.go
+++ b/chainntnfs/test_utils.go
@@ -9,13 +9,13 @@ import (
"testing"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/integration/rpctest"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lntest/unittest"
"github.com/stretchr/testify/require"
@@ -36,8 +36,8 @@ func randPubKeyHashScript() ([]byte, *btcec.PrivateKey, error) {
return nil, nil, err
}
- pubKeyHash := btcutil.Hash160(privKey.PubKey().SerializeCompressed())
- addrScript, err := btcutil.NewAddressWitnessPubKeyHash(
+ pubKeyHash := address.Hash160(privKey.PubKey().SerializeCompressed())
+ addrScript, err := address.NewAddressWitnessPubKeyHash(
pubKeyHash, unittest.NetParams,
)
if err != nil {
diff --git a/chainntnfs/txnotifier.go b/chainntnfs/txnotifier.go
index af85c29..3530b8a 100644
--- a/chainntnfs/txnotifier.go
+++ b/chainntnfs/txnotifier.go
@@ -7,10 +7,10 @@ import (
"sync"
"sync/atomic"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
)
const (
diff --git a/chainntnfs/txnotifier_test.go b/chainntnfs/txnotifier_test.go
index 451062a..e5c9b22 100644
--- a/chainntnfs/txnotifier_test.go
+++ b/chainntnfs/txnotifier_test.go
@@ -6,9 +6,9 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/stretchr/testify/require"
)
diff --git a/chainparams/store.go b/chainparams/store.go
index 7459d51..a71f52d 100644
--- a/chainparams/store.go
+++ b/chainparams/store.go
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/sqldb"
"github.com/lightningnetwork/lnd/sqldb/sqlc"
diff --git a/chainparams/store_test.go b/chainparams/store_test.go
index bc0f45b..eb6d577 100644
--- a/chainparams/store_test.go
+++ b/chainparams/store_test.go
@@ -5,7 +5,7 @@ package chainparams
import (
"testing"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/stretchr/testify/require"
)
diff --git a/chainreg/chainparams.go b/chainreg/chainparams.go
index 166a1fe..ecaf6db 100644
--- a/chainreg/chainparams.go
+++ b/chainreg/chainparams.go
@@ -1,8 +1,8 @@
package chainreg
import (
- bitcoinCfg "github.com/btcsuite/btcd/chaincfg"
- bitcoinWire "github.com/btcsuite/btcd/wire"
+ bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2"
+ bitcoinWire "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
)
diff --git a/chainreg/chainregistry.go b/chainreg/chainregistry.go
index 30a9082..6740848 100644
--- a/chainreg/chainregistry.go
+++ b/chainreg/chainregistry.go
@@ -12,7 +12,7 @@ import (
"strings"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/rpcclient"
"github.com/btcsuite/btcwallet/chain"
"github.com/lightninglabs/neutrino"
diff --git a/chainreg/no_chain_backend.go b/chainreg/no_chain_backend.go
index 2a3f7bf..02dfed5 100644
--- a/chainreg/no_chain_backend.go
+++ b/chainreg/no_chain_backend.go
@@ -5,10 +5,10 @@ import (
"errors"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcjson"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightningnetwork/lnd/chainntnfs"
@@ -193,13 +193,13 @@ func (n *NoChainSource) SendRawTransaction(*wire.MsgTx, bool) (*chainhash.Hash,
return nil, errNotImplemented
}
-func (n *NoChainSource) Rescan(*chainhash.Hash, []btcutil.Address,
- map[wire.OutPoint]btcutil.Address) error {
+func (n *NoChainSource) Rescan(*chainhash.Hash, []address.Address,
+ map[wire.OutPoint]address.Address) error {
return nil
}
-func (n *NoChainSource) NotifyReceived([]btcutil.Address) error {
+func (n *NoChainSource) NotifyReceived([]address.Address) error {
return nil
}
diff --git a/chanacceptor/acceptor_test.go b/chanacceptor/acceptor_test.go
index 2746b31..b2b0bf3 100644
--- a/chanacceptor/acceptor_test.go
+++ b/chanacceptor/acceptor_test.go
@@ -6,8 +6,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet/chancloser"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/chanacceptor/interface.go b/chanacceptor/interface.go
index 3149cb0..0939d23 100644
--- a/chanacceptor/interface.go
+++ b/chanacceptor/interface.go
@@ -4,7 +4,7 @@ import (
"errors"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/chanacceptor/merge.go b/chanacceptor/merge.go
index 34f1917..1764059 100644
--- a/chanacceptor/merge.go
+++ b/chanacceptor/merge.go
@@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/chanacceptor/rpcacceptor.go b/chanacceptor/rpcacceptor.go
index 1a06b65..fec798e 100644
--- a/chanacceptor/rpcacceptor.go
+++ b/chanacceptor/rpcacceptor.go
@@ -7,8 +7,8 @@ import (
"sync"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet/chancloser"
diff --git a/chanacceptor/rpcacceptor_test.go b/chanacceptor/rpcacceptor_test.go
index eb65080..d1f3b2f 100644
--- a/chanacceptor/rpcacceptor_test.go
+++ b/chanacceptor/rpcacceptor_test.go
@@ -5,8 +5,8 @@ import (
"strings"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet/chancloser"
diff --git a/chanbackup/backup.go b/chanbackup/backup.go
index cf7217a..88b8a0c 100644
--- a/chanbackup/backup.go
+++ b/chanbackup/backup.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
)
diff --git a/chanbackup/backup_test.go b/chanbackup/backup_test.go
index 05a2409..f2a10c2 100644
--- a/chanbackup/backup_test.go
+++ b/chanbackup/backup_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/stretchr/testify/require"
)
diff --git a/chanbackup/pubsub.go b/chanbackup/pubsub.go
index 6304f0c..1915127 100644
--- a/chanbackup/pubsub.go
+++ b/chanbackup/pubsub.go
@@ -9,7 +9,7 @@ import (
"sync"
"sync/atomic"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lnutils"
diff --git a/chanbackup/pubsub_test.go b/chanbackup/pubsub_test.go
index 615f170..9d5ea4e 100644
--- a/chanbackup/pubsub_test.go
+++ b/chanbackup/pubsub_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lnencrypt"
"github.com/stretchr/testify/require"
diff --git a/chanbackup/single.go b/chanbackup/single.go
index 0a38d6b..4acd649 100644
--- a/chanbackup/single.go
+++ b/chanbackup/single.go
@@ -8,9 +8,9 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/keychain"
diff --git a/chanbackup/single_test.go b/chanbackup/single_test.go
index f1f805c..881aedf 100644
--- a/chanbackup/single_test.go
+++ b/chanbackup/single_test.go
@@ -9,8 +9,8 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/chanfitness/chanevent.go b/chanfitness/chanevent.go
index b829a6c..1edfec5 100644
--- a/chanfitness/chanevent.go
+++ b/chanfitness/chanevent.go
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/clock"
)
diff --git a/chanfitness/chanevent_test.go b/chanfitness/chanevent_test.go
index 8d1cc54..40a0e53 100644
--- a/chanfitness/chanevent_test.go
+++ b/chanfitness/chanevent_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/clock"
"github.com/stretchr/testify/require"
)
diff --git a/chanfitness/chaneventstore.go b/chanfitness/chaneventstore.go
index a8014a8..9fc4296 100644
--- a/chanfitness/chaneventstore.go
+++ b/chanfitness/chaneventstore.go
@@ -17,7 +17,7 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/channelnotifier"
"github.com/lightningnetwork/lnd/clock"
diff --git a/chanfitness/chaneventstore_test.go b/chanfitness/chaneventstore_test.go
index f2e5781..09dc1ce 100644
--- a/chanfitness/chaneventstore_test.go
+++ b/chanfitness/chaneventstore_test.go
@@ -6,7 +6,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/clock"
"github.com/lightningnetwork/lnd/routing/route"
diff --git a/chanfitness/chaneventstore_testctx_test.go b/chanfitness/chaneventstore_testctx_test.go
index 6906ebb..dca7580 100644
--- a/chanfitness/chaneventstore_testctx_test.go
+++ b/chanfitness/chaneventstore_testctx_test.go
@@ -5,8 +5,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/channelnotifier"
"github.com/lightningnetwork/lnd/clock"
diff --git a/chanfitness/interface.go b/chanfitness/interface.go
index 22678d6..23726ae 100644
--- a/chanfitness/interface.go
+++ b/chanfitness/interface.go
@@ -3,7 +3,7 @@ package chanfitness
import (
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// peerMonitor is an interface implemented by entities that monitor our peers
diff --git a/channel_notifier.go b/channel_notifier.go
index 8affd48..360fb6c 100644
--- a/channel_notifier.go
+++ b/channel_notifier.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chanbackup"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/channelnotifier"
diff --git a/channeldb/channel.go b/channeldb/channel.go
index 676c109..4c299f8 100644
--- a/channeldb/channel.go
+++ b/channeldb/channel.go
@@ -15,9 +15,9 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/lightningnetwork/lnd/fn/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go
index 5b8758e..f900964 100644
--- a/channeldb/channel_test.go
+++ b/channeldb/channel_test.go
@@ -12,9 +12,9 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/clock"
diff --git a/channeldb/close_channel_test.go b/channeldb/close_channel_test.go
index 3a940b7..cd9c796 100644
--- a/channeldb/close_channel_test.go
+++ b/channeldb/close_channel_test.go
@@ -4,7 +4,7 @@ import (
"bytes"
"testing"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/channeldb/codec.go b/channeldb/codec.go
index e5bab3d..a23bdd5 100644
--- a/channeldb/codec.go
+++ b/channeldb/codec.go
@@ -9,9 +9,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/channeldb/db.go b/channeldb/db.go
index 3f0036b..894f9fa 100644
--- a/channeldb/db.go
+++ b/channeldb/db.go
@@ -11,7 +11,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/walletdb"
mig "github.com/lightningnetwork/lnd/channeldb/migration"
"github.com/lightningnetwork/lnd/channeldb/migration12"
diff --git a/channeldb/db_test.go b/channeldb/db_test.go
index c41b8e1..9bc3efc 100644
--- a/channeldb/db_test.go
+++ b/channeldb/db_test.go
@@ -11,9 +11,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/channeldb/forwarding_package_test.go b/channeldb/forwarding_package_test.go
index b11764b..5f47336 100644
--- a/channeldb/forwarding_package_test.go
+++ b/channeldb/forwarding_package_test.go
@@ -6,7 +6,7 @@ import (
"runtime"
"testing"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/channeldb/height_hint_test.go b/channeldb/height_hint_test.go
index 1549ee5..bf2dd89 100644
--- a/channeldb/height_hint_test.go
+++ b/channeldb/height_hint_test.go
@@ -4,8 +4,8 @@ import (
"bytes"
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/stretchr/testify/require"
)
diff --git a/channeldb/migration/lnwire21/accept_channel.go b/channeldb/migration/lnwire21/accept_channel.go
index 6069d3d..2a50e2d 100644
--- a/channeldb/migration/lnwire21/accept_channel.go
+++ b/channeldb/migration/lnwire21/accept_channel.go
@@ -4,7 +4,7 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// AcceptChannel is the message Bob sends to Alice after she initiates the
diff --git a/channeldb/migration/lnwire21/channel_announcement.go b/channeldb/migration/lnwire21/channel_announcement.go
index 897844f..3c1f55d 100644
--- a/channeldb/migration/lnwire21/channel_announcement.go
+++ b/channeldb/migration/lnwire21/channel_announcement.go
@@ -4,7 +4,7 @@ import (
"bytes"
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// ChannelAnnouncement message is used to announce the existence of a channel
diff --git a/channeldb/migration/lnwire21/channel_id.go b/channeldb/migration/lnwire21/channel_id.go
index 0a9e082..7814cfc 100644
--- a/channeldb/migration/lnwire21/channel_id.go
+++ b/channeldb/migration/lnwire21/channel_id.go
@@ -5,8 +5,8 @@ import (
"encoding/hex"
"math"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
)
const (
diff --git a/channeldb/migration/lnwire21/channel_update.go b/channeldb/migration/lnwire21/channel_update.go
index 77e65e7..79d6edf 100644
--- a/channeldb/migration/lnwire21/channel_update.go
+++ b/channeldb/migration/lnwire21/channel_update.go
@@ -5,7 +5,7 @@ import (
"fmt"
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// ChanUpdateMsgFlags is a bitfield that signals whether optional fields are
diff --git a/channeldb/migration/lnwire21/closing_signed.go b/channeldb/migration/lnwire21/closing_signed.go
index b483885..af8dc2a 100644
--- a/channeldb/migration/lnwire21/closing_signed.go
+++ b/channeldb/migration/lnwire21/closing_signed.go
@@ -3,7 +3,7 @@ package lnwire
import (
"io"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
// ClosingSigned is sent by both parties to a channel once the channel is clear
diff --git a/channeldb/migration/lnwire21/funding_created.go b/channeldb/migration/lnwire21/funding_created.go
index c14321e..16edbfa 100644
--- a/channeldb/migration/lnwire21/funding_created.go
+++ b/channeldb/migration/lnwire21/funding_created.go
@@ -3,7 +3,7 @@ package lnwire
import (
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// FundingCreated is sent from Alice (the initiator) to Bob (the responder),
diff --git a/channeldb/migration/lnwire21/gossip_timestamp_range.go b/channeldb/migration/lnwire21/gossip_timestamp_range.go
index 039257c..b4716be 100644
--- a/channeldb/migration/lnwire21/gossip_timestamp_range.go
+++ b/channeldb/migration/lnwire21/gossip_timestamp_range.go
@@ -3,7 +3,7 @@ package lnwire
import (
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// GossipTimestampRange is a message that allows the sender to restrict the set
diff --git a/channeldb/migration/lnwire21/lnwire.go b/channeldb/migration/lnwire21/lnwire.go
index e3f96e2..95e1924 100644
--- a/channeldb/migration/lnwire21/lnwire.go
+++ b/channeldb/migration/lnwire21/lnwire.go
@@ -11,9 +11,9 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/tor"
)
diff --git a/channeldb/migration/lnwire21/msat.go b/channeldb/migration/lnwire21/msat.go
index 3c3d85c..6a80e72 100644
--- a/channeldb/migration/lnwire21/msat.go
+++ b/channeldb/migration/lnwire21/msat.go
@@ -4,7 +4,7 @@ import (
"fmt"
"io"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/tlv"
)
diff --git a/channeldb/migration/lnwire21/netaddress.go b/channeldb/migration/lnwire21/netaddress.go
index dd5a7c5..0b9311b 100644
--- a/channeldb/migration/lnwire21/netaddress.go
+++ b/channeldb/migration/lnwire21/netaddress.go
@@ -5,7 +5,7 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// NetAddress represents information pertaining to the identity and network
diff --git a/channeldb/migration/lnwire21/open_channel.go b/channeldb/migration/lnwire21/open_channel.go
index 3674789..7955109 100644
--- a/channeldb/migration/lnwire21/open_channel.go
+++ b/channeldb/migration/lnwire21/open_channel.go
@@ -4,8 +4,8 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// FundingFlag represents the possible bit mask values for the ChannelFlags
diff --git a/channeldb/migration/lnwire21/query_channel_range.go b/channeldb/migration/lnwire21/query_channel_range.go
index 9546fcd..8677a3b 100644
--- a/channeldb/migration/lnwire21/query_channel_range.go
+++ b/channeldb/migration/lnwire21/query_channel_range.go
@@ -4,7 +4,7 @@ import (
"io"
"math"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// QueryChannelRange is a message sent by a node in order to query the
diff --git a/channeldb/migration/lnwire21/query_short_chan_ids.go b/channeldb/migration/lnwire21/query_short_chan_ids.go
index 7e8d1e6..96ccdd9 100644
--- a/channeldb/migration/lnwire21/query_short_chan_ids.go
+++ b/channeldb/migration/lnwire21/query_short_chan_ids.go
@@ -8,7 +8,7 @@ import (
"sort"
"sync"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// ShortChanIDEncoding is an enum-like type that represents exactly how a set
diff --git a/channeldb/migration/lnwire21/reply_short_chan_ids_end.go b/channeldb/migration/lnwire21/reply_short_chan_ids_end.go
index d77aa0b..335692a 100644
--- a/channeldb/migration/lnwire21/reply_short_chan_ids_end.go
+++ b/channeldb/migration/lnwire21/reply_short_chan_ids_end.go
@@ -3,7 +3,7 @@ package lnwire
import (
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
// ReplyShortChanIDsEnd is a message that marks the end of a streaming message
diff --git a/channeldb/migration12/invoices.go b/channeldb/migration12/invoices.go
index 6b83518..69d79e5 100644
--- a/channeldb/migration12/invoices.go
+++ b/channeldb/migration12/invoices.go
@@ -6,7 +6,7 @@ import (
"io"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/channeldb/migration16/migration.go b/channeldb/migration16/migration.go
index 64a5e49..cab2d20 100644
--- a/channeldb/migration16/migration.go
+++ b/channeldb/migration16/migration.go
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/kvdb"
)
diff --git a/channeldb/migration20/codec.go b/channeldb/migration20/codec.go
index 37481c9..829476b 100644
--- a/channeldb/migration20/codec.go
+++ b/channeldb/migration20/codec.go
@@ -4,7 +4,7 @@ import (
"encoding/binary"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
var (
diff --git a/channeldb/migration20/migration.go b/channeldb/migration20/migration.go
index c341d6a..2829d74 100644
--- a/channeldb/migration20/migration.go
+++ b/channeldb/migration20/migration.go
@@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/tlv"
)
diff --git a/channeldb/migration21/common/enclosed_types.go b/channeldb/migration21/common/enclosed_types.go
index d129a6d..44b81c4 100644
--- a/channeldb/migration21/common/enclosed_types.go
+++ b/channeldb/migration21/common/enclosed_types.go
@@ -6,9 +6,9 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/keychain"
)
diff --git a/channeldb/migration21/current/current_codec.go b/channeldb/migration21/current/current_codec.go
index d4a28e6..90d0f49 100644
--- a/channeldb/migration21/current/current_codec.go
+++ b/channeldb/migration21/current/current_codec.go
@@ -7,9 +7,9 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/channeldb/migration21/common"
"github.com/lightningnetwork/lnd/keychain"
diff --git a/channeldb/migration21/legacy/legacy_codec.go b/channeldb/migration21/legacy/legacy_codec.go
index e14a42a..a251352 100644
--- a/channeldb/migration21/legacy/legacy_codec.go
+++ b/channeldb/migration21/legacy/legacy_codec.go
@@ -6,9 +6,9 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/channeldb/migration21/common"
"github.com/lightningnetwork/lnd/keychain"
diff --git a/channeldb/migration21/migration_test.go b/channeldb/migration21/migration_test.go
index 735e45d..fd3d1f1 100644
--- a/channeldb/migration21/migration_test.go
+++ b/channeldb/migration21/migration_test.go
@@ -9,8 +9,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/channeldb/migration21/common"
diff --git a/channeldb/migration24/migration_test.go b/channeldb/migration24/migration_test.go
index 417c3d0..77d54ac 100644
--- a/channeldb/migration24/migration_test.go
+++ b/channeldb/migration24/migration_test.go
@@ -10,9 +10,9 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
"github.com/lightningnetwork/lnd/channeldb/migtest"
diff --git a/channeldb/migration25/migration_test.go b/channeldb/migration25/migration_test.go
index 4c67c07..9da539c 100644
--- a/channeldb/migration25/migration_test.go
+++ b/channeldb/migration25/migration_test.go
@@ -6,9 +6,9 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig24 "github.com/lightningnetwork/lnd/channeldb/migration24"
mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
diff --git a/channeldb/migration26/migration_test.go b/channeldb/migration26/migration_test.go
index dd1247d..32430ed 100644
--- a/channeldb/migration26/migration_test.go
+++ b/channeldb/migration26/migration_test.go
@@ -5,8 +5,8 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
diff --git a/channeldb/migration27/migration_test.go b/channeldb/migration27/migration_test.go
index d8d769d..a53ba54 100644
--- a/channeldb/migration27/migration_test.go
+++ b/channeldb/migration27/migration_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
mig26 "github.com/lightningnetwork/lnd/channeldb/migration26"
mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
diff --git a/channeldb/migration29/codec.go b/channeldb/migration29/codec.go
index fe11348..f94a7fe 100644
--- a/channeldb/migration29/codec.go
+++ b/channeldb/migration29/codec.go
@@ -5,7 +5,7 @@ import (
"encoding/hex"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
var (
diff --git a/channeldb/migration29/migration.go b/channeldb/migration29/migration.go
index 7ca3a8f..9cd9303 100644
--- a/channeldb/migration29/migration.go
+++ b/channeldb/migration29/migration.go
@@ -3,7 +3,7 @@ package migration29
import (
"bytes"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/kvdb"
)
diff --git a/channeldb/migration30/iterator_test.go b/channeldb/migration30/iterator_test.go
index de654a0..6184a57 100644
--- a/channeldb/migration30/iterator_test.go
+++ b/channeldb/migration30/iterator_test.go
@@ -4,9 +4,9 @@ import (
"bytes"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
mig26 "github.com/lightningnetwork/lnd/channeldb/migration26"
diff --git a/channeldb/migration30/lnwallet.go b/channeldb/migration30/lnwallet.go
index 02e84a3..db5bc42 100644
--- a/channeldb/migration30/lnwallet.go
+++ b/channeldb/migration30/lnwallet.go
@@ -4,7 +4,7 @@ import (
"bytes"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
mig26 "github.com/lightningnetwork/lnd/channeldb/migration26"
mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
diff --git a/channeldb/migration30/revocation_log.go b/channeldb/migration30/revocation_log.go
index c4f3f16..6d83604 100644
--- a/channeldb/migration30/revocation_log.go
+++ b/channeldb/migration30/revocation_log.go
@@ -6,7 +6,7 @@ import (
"io"
"math"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig24 "github.com/lightningnetwork/lnd/channeldb/migration24"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
diff --git a/channeldb/migration30/test_mock.go b/channeldb/migration30/test_mock.go
index 0246ca9..01cf659 100644
--- a/channeldb/migration30/test_mock.go
+++ b/channeldb/migration30/test_mock.go
@@ -4,7 +4,7 @@ import (
"encoding/binary"
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/shachain"
"github.com/stretchr/testify/mock"
)
diff --git a/channeldb/migration30/test_utils.go b/channeldb/migration30/test_utils.go
index e272cf4..adfa0c5 100644
--- a/channeldb/migration30/test_utils.go
+++ b/channeldb/migration30/test_utils.go
@@ -7,9 +7,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
mig25 "github.com/lightningnetwork/lnd/channeldb/migration25"
mig26 "github.com/lightningnetwork/lnd/channeldb/migration26"
diff --git a/channeldb/migration32/codec.go b/channeldb/migration32/codec.go
index 9f626c5..f03e637 100644
--- a/channeldb/migration32/codec.go
+++ b/channeldb/migration32/codec.go
@@ -5,7 +5,7 @@ import (
"fmt"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
)
diff --git a/channeldb/migration32/mission_control_store.go b/channeldb/migration32/mission_control_store.go
index 701c4b3..c7dcaeb 100644
--- a/channeldb/migration32/mission_control_store.go
+++ b/channeldb/migration32/mission_control_store.go
@@ -6,7 +6,7 @@ import (
"math"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/channeldb/migration32/route.go b/channeldb/migration32/route.go
index a35338e..31a3bc5 100644
--- a/channeldb/migration32/route.go
+++ b/channeldb/migration32/route.go
@@ -7,7 +7,7 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/tlv"
)
diff --git a/channeldb/migration_01_to_11/channel.go b/channeldb/migration_01_to_11/channel.go
index ec02526..083bbb4 100644
--- a/channeldb/migration_01_to_11/channel.go
+++ b/channeldb/migration_01_to_11/channel.go
@@ -9,9 +9,9 @@ import (
"sync"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/shachain"
diff --git a/channeldb/migration_01_to_11/channel_test.go b/channeldb/migration_01_to_11/channel_test.go
index 76a16c7..4e5cd7a 100644
--- a/channeldb/migration_01_to_11/channel_test.go
+++ b/channeldb/migration_01_to_11/channel_test.go
@@ -6,9 +6,9 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/keychain"
diff --git a/channeldb/migration_01_to_11/codec.go b/channeldb/migration_01_to_11/codec.go
index ca2f5cf..28c295c 100644
--- a/channeldb/migration_01_to_11/codec.go
+++ b/channeldb/migration_01_to_11/codec.go
@@ -7,9 +7,9 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/shachain"
diff --git a/channeldb/migration_01_to_11/graph.go b/channeldb/migration_01_to_11/graph.go
index 9035e3e..c7d77d2 100644
--- a/channeldb/migration_01_to_11/graph.go
+++ b/channeldb/migration_01_to_11/graph.go
@@ -10,9 +10,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/kvdb"
)
diff --git a/channeldb/migration_01_to_11/invoices.go b/channeldb/migration_01_to_11/invoices.go
index 3adbbf5..15a1a9b 100644
--- a/channeldb/migration_01_to_11/invoices.go
+++ b/channeldb/migration_01_to_11/invoices.go
@@ -7,7 +7,7 @@ import (
"io"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/channeldb/migration_01_to_11/migration_11_invoices.go b/channeldb/migration_01_to_11/migration_11_invoices.go
index 91d0e00..b87fdf9 100644
--- a/channeldb/migration_01_to_11/migration_11_invoices.go
+++ b/channeldb/migration_01_to_11/migration_11_invoices.go
@@ -6,8 +6,8 @@ import (
"fmt"
"io"
- bitcoinCfg "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/wire"
+ bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/channeldb/migration_01_to_11/zpay32"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/channeldb/migration_01_to_11/migration_11_invoices_test.go b/channeldb/migration_01_to_11/migration_11_invoices_test.go
index 4098fe5..00ff0fd 100644
--- a/channeldb/migration_01_to_11/migration_11_invoices_test.go
+++ b/channeldb/migration_01_to_11/migration_11_invoices_test.go
@@ -7,7 +7,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- bitcoinCfg "github.com/btcsuite/btcd/chaincfg"
+ bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/zpay32"
litecoinCfg "github.com/ltcsuite/ltcd/chaincfg"
diff --git a/channeldb/migration_01_to_11/migrations_test.go b/channeldb/migration_01_to_11/migrations_test.go
index 7c28d20..dcec0a8 100644
--- a/channeldb/migration_01_to_11/migrations_test.go
+++ b/channeldb/migration_01_to_11/migrations_test.go
@@ -11,7 +11,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/davecgh/go-spew/spew"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/channeldb/migration_01_to_11/payments.go b/channeldb/migration_01_to_11/payments.go
index 7e9eebd..1ead757 100644
--- a/channeldb/migration_01_to_11/payments.go
+++ b/channeldb/migration_01_to_11/payments.go
@@ -10,7 +10,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/channeldb/migration_01_to_11/zpay32/decode.go b/channeldb/migration_01_to_11/zpay32/decode.go
index 9f27543..4b32651 100644
--- a/channeldb/migration_01_to_11/zpay32/decode.go
+++ b/channeldb/migration_01_to_11/zpay32/decode.go
@@ -8,12 +8,12 @@ import (
"strings"
"time"
+ "github.com/btcsuite/btcd/address/v2"
+ "github.com/btcsuite/btcd/address/v2/bech32"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/bech32"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
)
@@ -378,13 +378,13 @@ func parseMinFinalCLTVExpiry(data []byte) (*uint64, error) {
// parseFallbackAddr converts the data (encoded in base32) into a fallback
// on-chain address.
-func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, error) {
+func parseFallbackAddr(data []byte, net *chaincfg.Params) (address.Address, error) {
// Checks if the data is empty or contains a version without an address.
if len(data) < 2 {
return nil, fmt.Errorf("empty fallback address field")
}
- var addr btcutil.Address
+ var addr address.Address
version := data[0]
switch version {
@@ -396,9 +396,9 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro
switch len(witness) {
case 20:
- addr, err = btcutil.NewAddressWitnessPubKeyHash(witness, net)
+ addr, err = address.NewAddressWitnessPubKeyHash(witness, net)
case 32:
- addr, err = btcutil.NewAddressWitnessScriptHash(witness, net)
+ addr, err = address.NewAddressWitnessScriptHash(witness, net)
default:
return nil, fmt.Errorf("unknown witness program length %d",
len(witness))
@@ -413,7 +413,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro
return nil, err
}
- addr, err = btcutil.NewAddressPubKeyHash(pubKeyHash, net)
+ addr, err = address.NewAddressPubKeyHash(pubKeyHash, net)
if err != nil {
return nil, err
}
@@ -423,7 +423,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro
return nil, err
}
- addr, err = btcutil.NewAddressScriptHashFromHash(scriptHash, net)
+ addr, err = address.NewAddressScriptHashFromHash(scriptHash, net)
if err != nil {
return nil, err
}
diff --git a/channeldb/migration_01_to_11/zpay32/invoice.go b/channeldb/migration_01_to_11/zpay32/invoice.go
index cf24e4e..9a857e9 100644
--- a/channeldb/migration_01_to_11/zpay32/invoice.go
+++ b/channeldb/migration_01_to_11/zpay32/invoice.go
@@ -5,9 +5,9 @@ import (
"fmt"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
)
@@ -171,7 +171,7 @@ type Invoice struct {
// FallbackAddr is an on-chain address that can be used for payment in
// case the Lightning payment fails.
// Optional.
- FallbackAddr btcutil.Address
+ FallbackAddr address.Address
// RouteHints represents one or more different route hints. Each route
// hint can be individually used to reach the destination. These usually
@@ -242,7 +242,7 @@ func Expiry(expiry time.Duration) func(*Invoice) {
// FallbackAddr is a functional option that allows callers of NewInvoice to set
// the Invoice's fallback on-chain address that can be used for payment in case
// the Lightning payment fails
-func FallbackAddr(fallbackAddr btcutil.Address) func(*Invoice) {
+func FallbackAddr(fallbackAddr address.Address) func(*Invoice) {
return func(i *Invoice) {
i.FallbackAddr = fallbackAddr
}
diff --git a/channeldb/nodes.go b/channeldb/nodes.go
index 70f6fad..688735c 100644
--- a/channeldb/nodes.go
+++ b/channeldb/nodes.go
@@ -9,7 +9,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/kvdb"
)
diff --git a/channeldb/nodes_test.go b/channeldb/nodes_test.go
index a88e452..413e0bc 100644
--- a/channeldb/nodes_test.go
+++ b/channeldb/nodes_test.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/stretchr/testify/require"
)
diff --git a/channeldb/reports.go b/channeldb/reports.go
index 4f46bd9..98e54be 100644
--- a/channeldb/reports.go
+++ b/channeldb/reports.go
@@ -5,9 +5,9 @@ import (
"errors"
"io"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/channeldb/reports_test.go b/channeldb/reports_test.go
index 6f0c21c..ce03ef7 100644
--- a/channeldb/reports_test.go
+++ b/channeldb/reports_test.go
@@ -4,8 +4,8 @@ import (
"bytes"
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/stretchr/testify/require"
diff --git a/channeldb/revocation_log.go b/channeldb/revocation_log.go
index 5a7f7a7..d30a219 100644
--- a/channeldb/revocation_log.go
+++ b/channeldb/revocation_log.go
@@ -7,7 +7,7 @@ import (
"io"
"math"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/channeldb/revocation_log_test.go b/channeldb/revocation_log_test.go
index 347e86e..d59de81 100644
--- a/channeldb/revocation_log_test.go
+++ b/channeldb/revocation_log_test.go
@@ -8,7 +8,7 @@ import (
"math/rand"
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntest/channels"
diff --git a/channelnotifier/channelnotifier.go b/channelnotifier/channelnotifier.go
index 96285aa..7332421 100644
--- a/channelnotifier/channelnotifier.go
+++ b/channelnotifier/channelnotifier.go
@@ -3,7 +3,7 @@ package channelnotifier
import (
"sync"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/chanstate"
"github.com/lightningnetwork/lnd/subscribe"
diff --git a/channelnotifier/channelnotifier_test.go b/channelnotifier/channelnotifier_test.go
index 0f815f7..afeea30 100644
--- a/channelnotifier/channelnotifier_test.go
+++ b/channelnotifier/channelnotifier_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/stretchr/testify/require"
)
diff --git a/chanrestore.go b/chanrestore.go
index 39d5555..d97e50f 100644
--- a/chanrestore.go
+++ b/chanrestore.go
@@ -6,9 +6,9 @@ import (
"net"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chanbackup"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/chanstate"
diff --git a/chanstate/interface.go b/chanstate/interface.go
index 4934485..038cdc9 100644
--- a/chanstate/interface.go
+++ b/chanstate/interface.go
@@ -2,7 +2,7 @@ package chanstate
import (
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/cmd/commands/chainrpc_active.go b/cmd/commands/chainrpc_active.go
index 0f1f8b6..3975be8 100644
--- a/cmd/commands/chainrpc_active.go
+++ b/cmd/commands/chainrpc_active.go
@@ -8,8 +8,8 @@ import (
"fmt"
"strconv"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
"github.com/urfave/cli"
)
diff --git a/cmd/commands/cmd_mission_control.go b/cmd/commands/cmd_mission_control.go
index fe4acb2..33f9888 100644
--- a/cmd/commands/cmd_mission_control.go
+++ b/cmd/commands/cmd_mission_control.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strconv"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing"
diff --git a/cmd/commands/cmd_open_channel.go b/cmd/commands/cmd_open_channel.go
index 921f847..48fba50 100644
--- a/cmd/commands/cmd_open_channel.go
+++ b/cmd/commands/cmd_open_channel.go
@@ -13,9 +13,9 @@ import (
"strconv"
"strings"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet/chanfunding"
diff --git a/cmd/commands/cmd_payments.go b/cmd/commands/cmd_payments.go
index 961709a..57290bd 100644
--- a/cmd/commands/cmd_payments.go
+++ b/cmd/commands/cmd_payments.go
@@ -15,7 +15,7 @@ import (
"strings"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/jedib0t/go-pretty/v6/text"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/cmd/commands/cmd_profile.go b/cmd/commands/cmd_profile.go
index 6767964..e8b22ad 100644
--- a/cmd/commands/cmd_profile.go
+++ b/cmd/commands/cmd_profile.go
@@ -6,7 +6,7 @@ import (
"path"
"strings"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/urfave/cli"
"gopkg.in/macaroon.v2"
diff --git a/cmd/commands/commands.go b/cmd/commands/commands.go
index 8bf75a2..e2726bb 100644
--- a/cmd/commands/commands.go
+++ b/cmd/commands/commands.go
@@ -16,8 +16,8 @@ import (
"strings"
"sync"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/jessevdk/go-flags"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/cmd/commands/main.go b/cmd/commands/main.go
index dc9b993..0c0997a 100644
--- a/cmd/commands/main.go
+++ b/cmd/commands/main.go
@@ -14,8 +14,8 @@ import (
"strings"
"syscall"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/build"
"github.com/lightningnetwork/lnd/lncfg"
diff --git a/cmd/commands/walletrpc_active.go b/cmd/commands/walletrpc_active.go
index 99f8982..4d6c281 100644
--- a/cmd/commands/walletrpc_active.go
+++ b/cmd/commands/walletrpc_active.go
@@ -15,11 +15,11 @@ import (
"strconv"
"strings"
- "github.com/btcsuite/btcd/btcutil"
- "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/btcd/address/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/psbt/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
@@ -1025,7 +1025,7 @@ func fundTemplatePsbt(ctx *cli.Context) error {
err)
}
- addr, err := btcutil.DecodeAddress(
+ addr, err := address.DecodeAddress(
addrStr, chainParams,
)
if err != nil {
diff --git a/config.go b/config.go
index bffebc3..3b73dbc 100644
--- a/config.go
+++ b/config.go
@@ -20,8 +20,8 @@ import (
"strings"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
flags "github.com/jessevdk/go-flags"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/autopilot"
diff --git a/config_builder.go b/config_builder.go
index bcfd8ec..25ec840 100644
--- a/config_builder.go
+++ b/config_builder.go
@@ -16,9 +16,9 @@ import (
"time"
"github.com/btcsuite/btcd/blockchain"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btclog/v2"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/waddrmgr"
diff --git a/contractcourt/anchor_resolver.go b/contractcourt/anchor_resolver.go
index 7e26767..35b1760 100644
--- a/contractcourt/anchor_resolver.go
+++ b/contractcourt/anchor_resolver.go
@@ -6,9 +6,9 @@ import (
"io"
"sync"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/input"
diff --git a/contractcourt/breach_arbitrator.go b/contractcourt/breach_arbitrator.go
index 130efcb..7b839e6 100644
--- a/contractcourt/breach_arbitrator.go
+++ b/contractcourt/breach_arbitrator.go
@@ -9,10 +9,10 @@ import (
"sync"
"github.com/btcsuite/btcd/blockchain"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chanstate"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/breach_arbitrator_test.go b/contractcourt/breach_arbitrator_test.go
index 869a009..37cf079 100644
--- a/contractcourt/breach_arbitrator_test.go
+++ b/contractcourt/breach_arbitrator_test.go
@@ -16,10 +16,10 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/briefcase.go b/contractcourt/briefcase.go
index 2e7efe0..03337de 100644
--- a/contractcourt/briefcase.go
+++ b/contractcourt/briefcase.go
@@ -6,9 +6,9 @@ import (
"fmt"
"io"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/input"
diff --git a/contractcourt/briefcase_test.go b/contractcourt/briefcase_test.go
index c86bffb..866c3cb 100644
--- a/contractcourt/briefcase_test.go
+++ b/contractcourt/briefcase_test.go
@@ -9,9 +9,9 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go
index 1b448cb..712537f 100644
--- a/contractcourt/chain_arbitrator.go
+++ b/contractcourt/chain_arbitrator.go
@@ -7,9 +7,9 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/address/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/lightningnetwork/lnd/chainio"
"github.com/lightningnetwork/lnd/chainntnfs"
@@ -113,7 +113,7 @@ type ChainArbitratorConfig struct {
// IsOurAddress is a function that returns true if the passed address
// is known to the underlying wallet. Otherwise, false should be
// returned.
- IsOurAddress func(btcutil.Address) bool
+ IsOurAddress func(address.Address) bool
// IncubateOutputs sends either an incoming HTLC, an outgoing HTLC, or
// both to the utxo nursery. Once this function returns, the nursery
diff --git a/contractcourt/chain_arbitrator_test.go b/contractcourt/chain_arbitrator_test.go
index d859d2d..90d0e4b 100644
--- a/contractcourt/chain_arbitrator_test.go
+++ b/contractcourt/chain_arbitrator_test.go
@@ -4,8 +4,8 @@ import (
"net"
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/clock"
diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
index 577dcc3..d40bdc5 100644
--- a/contractcourt/chain_watcher.go
+++ b/contractcourt/chain_watcher.go
@@ -8,13 +8,14 @@ import (
"sync/atomic"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcd/mempool"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/chainio"
"github.com/lightningnetwork/lnd/chainntnfs"
@@ -258,7 +259,7 @@ type chainWatcherConfig struct {
// isOurAddr is a function that returns true if the passed address is
// known to us.
- isOurAddr func(btcutil.Address) bool
+ isOurAddr func(address.Address) bool
// extractStateNumHint extracts the encoded state hint using the passed
// obfuscater. This is used by the chain watcher to identify which
diff --git a/contractcourt/chain_watcher_coop_reorg_test.go b/contractcourt/chain_watcher_coop_reorg_test.go
index a97c00e..8753a56 100644
--- a/contractcourt/chain_watcher_coop_reorg_test.go
+++ b/contractcourt/chain_watcher_coop_reorg_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// TestChainWatcherCoopCloseReorg tests that the chain watcher properly handles
diff --git a/contractcourt/chain_watcher_reorg_test.go b/contractcourt/chain_watcher_reorg_test.go
index 141eda5..bf2edd1 100644
--- a/contractcourt/chain_watcher_reorg_test.go
+++ b/contractcourt/chain_watcher_reorg_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"pgregory.net/rapid"
)
diff --git a/contractcourt/chain_watcher_test.go b/contractcourt/chain_watcher_test.go
index c7287d3..d3289b7 100644
--- a/contractcourt/chain_watcher_test.go
+++ b/contractcourt/chain_watcher_test.go
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainio"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
diff --git a/contractcourt/chain_watcher_test_harness.go b/contractcourt/chain_watcher_test_harness.go
index e67b84a..06e7e49 100644
--- a/contractcourt/chain_watcher_test_harness.go
+++ b/contractcourt/chain_watcher_test_harness.go
@@ -5,8 +5,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go
index ac7e259..f17d873 100644
--- a/contractcourt/channel_arbitrator.go
+++ b/contractcourt/channel_arbitrator.go
@@ -10,10 +10,10 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainio"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go
index 0e08d2c..4503b2e 100644
--- a/contractcourt/channel_arbitrator_test.go
+++ b/contractcourt/channel_arbitrator_test.go
@@ -10,9 +10,9 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/chainio"
"github.com/lightningnetwork/lnd/chainntnfs"
diff --git a/contractcourt/commit_sweep_resolver.go b/contractcourt/commit_sweep_resolver.go
index dd02e84..f47afa5 100644
--- a/contractcourt/commit_sweep_resolver.go
+++ b/contractcourt/commit_sweep_resolver.go
@@ -6,10 +6,10 @@ import (
"io"
"sync"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/commit_sweep_resolver_test.go b/contractcourt/commit_sweep_resolver_test.go
index eb00b3d..ef82c39 100644
--- a/contractcourt/commit_sweep_resolver_test.go
+++ b/contractcourt/commit_sweep_resolver_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/contractcourt/config.go b/contractcourt/config.go
index 7331ceb..67c4267 100644
--- a/contractcourt/config.go
+++ b/contractcourt/config.go
@@ -3,7 +3,7 @@ package contractcourt
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
)
const (
diff --git a/contractcourt/config_test.go b/contractcourt/config_test.go
index e7bc22a..86e0957 100644
--- a/contractcourt/config_test.go
+++ b/contractcourt/config_test.go
@@ -3,7 +3,7 @@ package contractcourt
import (
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/stretchr/testify/require"
)
diff --git a/contractcourt/contract_resolver.go b/contractcourt/contract_resolver.go
index d11bd2f..62b8f1a 100644
--- a/contractcourt/contract_resolver.go
+++ b/contractcourt/contract_resolver.go
@@ -7,7 +7,7 @@ import (
"io"
"sync/atomic"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btclog/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/htlc_incoming_contest_resolver.go b/contractcourt/htlc_incoming_contest_resolver.go
index 7034980..c3e511c 100644
--- a/contractcourt/htlc_incoming_contest_resolver.go
+++ b/contractcourt/htlc_incoming_contest_resolver.go
@@ -7,8 +7,8 @@ import (
"fmt"
"io"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/contractcourt/htlc_incoming_contest_resolver_test.go b/contractcourt/htlc_incoming_contest_resolver_test.go
index f17190e..457f8a8 100644
--- a/contractcourt/htlc_incoming_contest_resolver_test.go
+++ b/contractcourt/htlc_incoming_contest_resolver_test.go
@@ -5,7 +5,7 @@ import (
"io"
"testing"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
diff --git a/contractcourt/htlc_lease_resolver.go b/contractcourt/htlc_lease_resolver.go
index 3002cec..438a093 100644
--- a/contractcourt/htlc_lease_resolver.go
+++ b/contractcourt/htlc_lease_resolver.go
@@ -1,7 +1,7 @@
package contractcourt
import (
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/htlc_outgoing_contest_resolver.go b/contractcourt/htlc_outgoing_contest_resolver.go
index 64db6bc..08ded07 100644
--- a/contractcourt/htlc_outgoing_contest_resolver.go
+++ b/contractcourt/htlc_outgoing_contest_resolver.go
@@ -3,7 +3,7 @@ package contractcourt
import (
"io"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lnwallet"
diff --git a/contractcourt/htlc_outgoing_contest_resolver_test.go b/contractcourt/htlc_outgoing_contest_resolver_test.go
index 625df60..452527c 100644
--- a/contractcourt/htlc_outgoing_contest_resolver_test.go
+++ b/contractcourt/htlc_outgoing_contest_resolver_test.go
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/contractcourt/htlc_success_resolver.go b/contractcourt/htlc_success_resolver.go
index 1770c21..2286ce2 100644
--- a/contractcourt/htlc_success_resolver.go
+++ b/contractcourt/htlc_success_resolver.go
@@ -6,10 +6,10 @@ import (
"io"
"sync"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/contractcourt/htlc_success_resolver_test.go b/contractcourt/htlc_success_resolver_test.go
index f0f5dd8..61777bf 100644
--- a/contractcourt/htlc_success_resolver_test.go
+++ b/contractcourt/htlc_success_resolver_test.go
@@ -7,9 +7,9 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
diff --git a/contractcourt/htlc_timeout_resolver.go b/contractcourt/htlc_timeout_resolver.go
index c2cbb13..5b89a34 100644
--- a/contractcourt/htlc_timeout_resolver.go
+++ b/contractcourt/htlc_timeout_resolver.go
@@ -6,10 +6,10 @@ import (
"io"
"sync"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/htlc_timeout_resolver_test.go b/contractcourt/htlc_timeout_resolver_test.go
index 86ebede..cf27cec 100644
--- a/contractcourt/htlc_timeout_resolver_test.go
+++ b/contractcourt/htlc_timeout_resolver_test.go
@@ -8,10 +8,10 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/interfaces.go b/contractcourt/interfaces.go
index 75b81e9..7253cfa 100644
--- a/contractcourt/interfaces.go
+++ b/contractcourt/interfaces.go
@@ -4,7 +4,7 @@ import (
"context"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/htlcswitch/hop"
diff --git a/contractcourt/nursery_store.go b/contractcourt/nursery_store.go
index 428b37f..3b9218e 100644
--- a/contractcourt/nursery_store.go
+++ b/contractcourt/nursery_store.go
@@ -5,8 +5,8 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/contractcourt/nursery_store_test.go b/contractcourt/nursery_store_test.go
index ca53769..11f793c 100644
--- a/contractcourt/nursery_store_test.go
+++ b/contractcourt/nursery_store_test.go
@@ -4,8 +4,8 @@ import (
"reflect"
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/stretchr/testify/require"
)
diff --git a/contractcourt/utxonursery.go b/contractcourt/utxonursery.go
index 02e8323..924437e 100644
--- a/contractcourt/utxonursery.go
+++ b/contractcourt/utxonursery.go
@@ -9,9 +9,9 @@ import (
"sync"
"sync/atomic"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/contractcourt/utxonursery_test.go b/contractcourt/utxonursery_test.go
index a99eb7e..a4b8b00 100644
--- a/contractcourt/utxonursery_test.go
+++ b/contractcourt/utxonursery_test.go
@@ -14,10 +14,10 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/discovery/bootstrapper.go b/discovery/bootstrapper.go
index 28ef0d9..cfb3a5b 100644
--- a/discovery/bootstrapper.go
+++ b/discovery/bootstrapper.go
@@ -13,8 +13,8 @@ import (
"strings"
"time"
+ "github.com/btcsuite/btcd/address/v2/bech32"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil/bech32"
"github.com/lightningnetwork/lnd/autopilot"
"github.com/lightningnetwork/lnd/lnutils"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/discovery/chan_series.go b/discovery/chan_series.go
index 72f2076..9617528 100644
--- a/discovery/chan_series.go
+++ b/discovery/chan_series.go
@@ -5,7 +5,7 @@ import (
"iter"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/fn/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/discovery/gossiper.go b/discovery/gossiper.go
index 6a778bb..615dd7c 100644
--- a/discovery/gossiper.go
+++ b/discovery/gossiper.go
@@ -12,13 +12,14 @@ import (
"sync/atomic"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightninglabs/neutrino/cache"
"github.com/lightninglabs/neutrino/cache/lru"
"github.com/lightningnetwork/lnd/actor"
@@ -2161,7 +2162,7 @@ func (d *AuthenticatedGossiper) processRejectedEdge(_ context.Context,
// fetchPKScript fetches the output script for the given SCID.
func (d *AuthenticatedGossiper) fetchPKScript(chanID lnwire.ShortChannelID) (
- txscript.ScriptClass, btcutil.Address, error) {
+ txscript.ScriptClass, address.Address, error) {
pkScript, err := lnwallet.FetchPKScriptWithQuit(
d.cfg.ChainIO, chanID, d.quit,
diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go
index d6fe209..f9151ed 100644
--- a/discovery/gossiper_test.go
+++ b/discovery/gossiper_test.go
@@ -17,10 +17,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightninglabs/neutrino/cache"
"github.com/lightningnetwork/lnd/actor"
diff --git a/discovery/mock_test.go b/discovery/mock_test.go
index 050c570..ad0ff8c 100644
--- a/discovery/mock_test.go
+++ b/discovery/mock_test.go
@@ -8,7 +8,7 @@ import (
"sync/atomic"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnpeer"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/discovery/sync_manager.go b/discovery/sync_manager.go
index 4ea3eac..de071e8 100644
--- a/discovery/sync_manager.go
+++ b/discovery/sync_manager.go
@@ -7,7 +7,7 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/lnpeer"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/discovery/syncer.go b/discovery/syncer.go
index 7ffe7f6..bcd0cd6 100644
--- a/discovery/syncer.go
+++ b/discovery/syncer.go
@@ -12,7 +12,7 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/actor"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph"
diff --git a/discovery/syncer_queue_test.go b/discovery/syncer_queue_test.go
index 704328c..5dee661 100644
--- a/discovery/syncer_queue_test.go
+++ b/discovery/syncer_queue_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/lntest/wait"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/stretchr/testify/require"
diff --git a/discovery/syncer_test.go b/discovery/syncer_test.go
index f27ba7b..cd05c78 100644
--- a/discovery/syncer_test.go
+++ b/discovery/syncer_test.go
@@ -12,8 +12,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/davecgh/go-spew/spew"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/lnpeer"
diff --git a/funding/aux_funding.go b/funding/aux_funding.go
index c7ef653..9a300ba 100644
--- a/funding/aux_funding.go
+++ b/funding/aux_funding.go
@@ -1,7 +1,7 @@
package funding
import (
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwallet"
diff --git a/funding/batch.go b/funding/batch.go
index 23733d3..796c06a 100644
--- a/funding/batch.go
+++ b/funding/batch.go
@@ -8,11 +8,11 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/psbt"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/psbt/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/labels"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
diff --git a/funding/batch_test.go b/funding/batch_test.go
index ee74082..0f89158 100644
--- a/funding/batch_test.go
+++ b/funding/batch_test.go
@@ -9,10 +9,10 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/psbt"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/psbt/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
diff --git a/funding/manager.go b/funding/manager.go
index 66f6885..4efbb10 100644
--- a/funding/manager.go
+++ b/funding/manager.go
@@ -15,10 +15,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/actor"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chanacceptor"
diff --git a/funding/manager_test.go b/funding/manager_test.go
index b4581ce..6e4b888 100644
--- a/funding/manager_test.go
+++ b/funding/manager_test.go
@@ -19,10 +19,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/wallet"
"github.com/lightningnetwork/lnd/actor"
"github.com/lightningnetwork/lnd/aliasmgr"
diff --git a/go.mod b/go.mod
index fbc3ba0..d17815d 100644
--- a/go.mod
+++ b/go.mod
@@ -4,22 +4,26 @@ require (
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
github.com/andybalholm/brotli v1.0.4
- github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179
- github.com/btcsuite/btcd/btcec/v2 v2.3.6
- github.com/btcsuite/btcd/btcutil v1.1.6
- github.com/btcsuite/btcd/btcutil/psbt v1.1.10
- github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
+ github.com/btcsuite/btcd v0.26.0
+ github.com/btcsuite/btcd/address/v2 v2.0.0
+ github.com/btcsuite/btcd/btcec/v2 v2.5.0
+ github.com/btcsuite/btcd/btcutil/v2 v2.0.0
+ github.com/btcsuite/btcd/chaincfg/v2 v2.0.0
+ github.com/btcsuite/btcd/chainhash/v2 v2.0.0
+ github.com/btcsuite/btcd/psbt/v2 v2.0.0
+ github.com/btcsuite/btcd/txscript/v2 v2.0.0
+ github.com/btcsuite/btcd/wire/v2 v2.0.0
github.com/btcsuite/btclog v1.0.0
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
- github.com/btcsuite/btcwallet v0.16.18
- github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5
- github.com/btcsuite/btcwallet/wallet/txrules v1.2.2
- github.com/btcsuite/btcwallet/walletdb v1.5.1
- github.com/btcsuite/btcwallet/wtxmgr v1.5.6
+ github.com/btcsuite/btcwallet v0.17.0
+ github.com/btcsuite/btcwallet/wallet/txauthor v1.4.0
+ github.com/btcsuite/btcwallet/wallet/txrules v1.3.0
+ github.com/btcsuite/btcwallet/walletdb v1.6.0
+ github.com/btcsuite/btcwallet/wtxmgr v1.6.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/davecgh/go-spew v1.1.1
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
- github.com/gorilla/websocket v1.5.0
+ github.com/gorilla/websocket v1.5.3
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
@@ -30,9 +34,9 @@ require (
github.com/jessevdk/go-flags v1.6.1
github.com/jrick/logrotate v1.1.2
github.com/kkdai/bstream v1.0.0
- github.com/lightninglabs/neutrino v0.17.1
- github.com/lightninglabs/neutrino/cache v1.1.3
- github.com/lightningnetwork/lightning-onion v1.3.0
+ github.com/lightninglabs/neutrino v0.18.0
+ github.com/lightninglabs/neutrino/cache v1.1.4
+ github.com/lightningnetwork/lightning-onion v1.4.0
github.com/lightningnetwork/lnd/actor v0.0.6
github.com/lightningnetwork/lnd/cert v1.2.2
github.com/lightningnetwork/lnd/clock v1.1.1
@@ -42,8 +46,8 @@ require (
github.com/lightningnetwork/lnd/queue v1.2.0
github.com/lightningnetwork/lnd/sqldb v1.0.13
github.com/lightningnetwork/lnd/ticker v1.1.1
- github.com/lightningnetwork/lnd/tlv v1.3.2
- github.com/lightningnetwork/lnd/tor v1.1.7
+ github.com/lightningnetwork/lnd/tlv v1.3.3-0.20260615022959-a067468f0f45
+ github.com/lightningnetwork/lnd/tor v1.1.8-0.20260615022959-a067468f0f45
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796
github.com/miekg/dns v1.1.43
github.com/prometheus/client_golang v1.23.2
@@ -65,6 +69,11 @@ require (
pgregory.net/rapid v1.2.0
)
+require (
+ github.com/felixge/httpsnoop v1.1.0 // indirect
+ github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee // indirect
+)
+
require (
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -75,7 +84,7 @@ require (
github.com/aead/siphash v1.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/v2transport v1.0.1 // indirect
- github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
+ github.com/btcsuite/btcwallet/wallet/txsizes v1.3.0 // indirect
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -86,13 +95,12 @@ require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
- github.com/decred/dcrd/lru v1.1.2 // indirect
+ github.com/decred/dcrd/lru v1.1.3 // indirect
github.com/docker/cli v28.1.1+incompatible // indirect
github.com/docker/docker v28.1.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
- github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
@@ -102,7 +110,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
- github.com/golang/snappy v0.0.4 // indirect
+ github.com/golang/snappy v1.0.0 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
@@ -165,12 +173,12 @@ require (
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
- go.opentelemetry.io/otel v1.40.0 // indirect
+ go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
- go.opentelemetry.io/otel/metric v1.40.0 // indirect
- go.opentelemetry.io/otel/sdk v1.40.0 // indirect
- go.opentelemetry.io/otel/trace v1.40.0 // indirect
+ go.opentelemetry.io/otel/metric v1.44.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.44.0 // indirect
+ go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
@@ -178,7 +186,7 @@ require (
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.48.0 // indirect
- golang.org/x/sys v0.40.0 // indirect
+ golang.org/x/sys v0.45.0 // indirect
golang.org/x/text v0.32.0
golang.org/x/tools v0.39.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -211,3 +219,23 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
go 1.25.11
retract v0.0.2
+
+replace github.com/lightningnetwork/lnd/actor => ./actor
+
+replace github.com/lightningnetwork/lnd/cert => ./cert
+
+replace github.com/lightningnetwork/lnd/clock => ./clock
+
+replace github.com/lightningnetwork/lnd/fn/v2 => ./fn
+
+replace github.com/lightningnetwork/lnd/healthcheck => ./healthcheck
+
+replace github.com/lightningnetwork/lnd/kvdb => ./kvdb
+
+replace github.com/lightningnetwork/lnd/queue => ./queue
+
+replace github.com/lightningnetwork/lnd/ticker => ./ticker
+
+replace github.com/lightningnetwork/lnd/tlv => ./tlv
+
+replace github.com/lightningnetwork/lnd/tor => ./tor
diff --git a/go.sum b/go.sum
index 4538593..835874d 100644
--- a/go.sum
+++ b/go.sum
@@ -30,54 +30,48 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
-github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
-github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
-github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179 h1:yJOTxkbxxtuSFrErMqYRvqZLfWggHssioBiWebkV9yo=
-github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179/go.mod h1:qbPE+pEiR9643E1s1xu57awsRhlCIm1ZIi6FfeRA4KE=
-github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
-github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
-github.com/btcsuite/btcd/btcec/v2 v2.3.6 h1:IzlsEr9olcSRKB/n7c4351F3xHKxS2lma+1UFGCYd4E=
-github.com/btcsuite/btcd/btcec/v2 v2.3.6/go.mod h1:m22FrOAiuxl/tht9wIqAoGHcbnCCaPWyauO8y2LGGtQ=
-github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
-github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
-github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
-github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/AYFd6c=
-github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE=
-github.com/btcsuite/btcd/btcutil/psbt v1.1.10 h1:TC1zhxhFfhnGqoPjsrlEpoqzh+9TPOHrCgnPR47Mj9I=
-github.com/btcsuite/btcd/btcutil/psbt v1.1.10/go.mod h1:ehBEvU91lxSlXtA+zZz3iFYx7Yq9eqnKx4/kSrnsvMY=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btcd v0.26.0 h1:yntnSshlG3+H7dTwIOR4LTFXDPojVBsFORBNN5y5c/c=
+github.com/btcsuite/btcd v0.26.0/go.mod h1:7ft7+a/MoJHFouFopCb1zyiR9IWPlrcPVn6K/lJ1dcA=
+github.com/btcsuite/btcd/address/v2 v2.0.0 h1:UVu8Hal6Siu4XastFe+JX5JkeBYONbDUIY5E+SVTs6I=
+github.com/btcsuite/btcd/address/v2 v2.0.0/go.mod h1:htJK1AtaeK3bKNfZY63ep2oN8LbrI6qvmPGe1vekb3I=
+github.com/btcsuite/btcd/btcec/v2 v2.5.0 h1:KioMXOWa76b86sTZZOmbzv/ldaQCmB8KFAyn5PbB8E8=
+github.com/btcsuite/btcd/btcec/v2 v2.5.0/go.mod h1:+K/MYXcLBtHEQjRbjHuJChuybk4LCgjdjgRwil+e+Kk=
+github.com/btcsuite/btcd/btcutil/v2 v2.0.0 h1:77pgf/4tjWaSBLdos8yiWVWL3rSphxWNqkLwcyONExA=
+github.com/btcsuite/btcd/btcutil/v2 v2.0.0/go.mod h1:ZF8MMdsx1JGgvHJUanxbigekSO+8bN/ai34LBk/lg3c=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
+github.com/btcsuite/btcd/psbt/v2 v2.0.0 h1:vKBfHGkxsplVExwCozfK9VuioZ6D6cRpAhcMia2kgrQ=
+github.com/btcsuite/btcd/psbt/v2 v2.0.0/go.mod h1:WdHfpXJDXklnMU8u22YXz8o12q8hPYr4b8CxpKdjGYs=
+github.com/btcsuite/btcd/txscript/v2 v2.0.0 h1:pEmmHaC8eRx6KSB63zSVJD7qrit9/c9cLSrw++XrYP8=
+github.com/btcsuite/btcd/txscript/v2 v2.0.0/go.mod h1:pZXabc11Xr9nz/18kXY3yErdAajYc3gi28Zqb3KqlFo=
github.com/btcsuite/btcd/v2transport v1.0.1 h1:pIyyyBCPwd087K3Wdb/9tIvUubAQdzTJghjPgzTQVsE=
github.com/btcsuite/btcd/v2transport v1.0.1/go.mod h1:N6H0HGSElVVJKntzaYHYVbW71DtWDLMw2yhwVRO3ZOE=
+github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
+github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
github.com/btcsuite/btclog v1.0.0 h1:sEkpKJMmfGiyZjADwEIgB1NSwMyfdD1FB8v6+w1T0Ns=
github.com/btcsuite/btclog v1.0.0/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b h1:MQ+Q6sDy37V1wP1Yu79A5KqJutolqUGwA99UZWQDWZM=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
-github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcwallet v0.16.18 h1:6h0kMxij4igPu35jOPAWZbn22ceOC4me4L3jj8Za6Zk=
-github.com/btcsuite/btcwallet v0.16.18/go.mod h1:4TTru0cgIPbCZpY4aRfAVwX87zrQw4GXM8MH6+A5xZw=
-github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
-github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
-github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
-github.com/btcsuite/btcwallet/wallet/txrules v1.2.2/go.mod h1:4v+grppsDpVn91SJv+mZT7B8hEV4nSmpREM4I8Uohws=
-github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 h1:93o5Xz9dYepBP4RMFUc9RGIFXwqP2volSWRkYJFrNtI=
-github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5/go.mod h1:lQ+e9HxZ85QP7r3kdxItkiMSloSLg1PEGis5o5CXUQw=
-github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI=
-github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
-github.com/btcsuite/btcwallet/wtxmgr v1.5.6 h1:Zwvr/rrJYdOLqdBCSr4eICEstnEA+NBUvjIWLkrXaYI=
-github.com/btcsuite/btcwallet/wtxmgr v1.5.6/go.mod h1:lzVbDkk/jRao2ib5kge46aLZW1yFc8RFNycdYpnsmZA=
+github.com/btcsuite/btcwallet v0.17.0 h1:uDHH/4BLWMz3nEGmfVEPepcidKWq4CQ+ZfWY/w71PKk=
+github.com/btcsuite/btcwallet v0.17.0/go.mod h1:1ZMc1EEskov+AKKv4kCMZqN8BwVh9rpXwEyxbeWy2A4=
+github.com/btcsuite/btcwallet/wallet/txauthor v1.4.0 h1:oIkGj32YK1CvWaJGlVwZA1f+y/KVHkfrd2PoST0ZpQs=
+github.com/btcsuite/btcwallet/wallet/txauthor v1.4.0/go.mod h1:sGrBjcqQ8UPexuRajFs72+o544CJn3Pavv/5H0VAWVk=
+github.com/btcsuite/btcwallet/wallet/txrules v1.3.0 h1:D5aGMwWIxdqek3xEJs4eOdMoh6iga2EI2xSlaXCdnNo=
+github.com/btcsuite/btcwallet/wallet/txrules v1.3.0/go.mod h1:ZzSdn2XrsUDPa193Q/su1sJY+716rlFK2H1mYwbY/18=
+github.com/btcsuite/btcwallet/wallet/txsizes v1.3.0 h1:2W9qt0edMoX8crx0Wm4Cv+eAj4B3jlbn0N/5fckLHSU=
+github.com/btcsuite/btcwallet/wallet/txsizes v1.3.0/go.mod h1:42aE6+LMZSSEisQAa15Xml25ncuJFfhCrkcpB5OmkZk=
+github.com/btcsuite/btcwallet/walletdb v1.6.0 h1:Yund5XbdqFxNW7+R2Sxs02bMC5fMrmORj4GN8MV55no=
+github.com/btcsuite/btcwallet/walletdb v1.6.0/go.mod h1:q9xif0Csp52GVb3l252BbHCuyiCnuEbrPWu/HAsvaYc=
+github.com/btcsuite/btcwallet/wtxmgr v1.6.0 h1:ivSSnYCD4Kb5yAMZVyBA1VMYABIFcopPEcmHCrRZXcE=
+github.com/btcsuite/btcwallet/wtxmgr v1.6.0/go.mod h1:Raor7IBIwHSIKE9Lr5o+R9rwX7sRMHU1zjxgEQgn9h8=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8/go.mod h1:tYvUd8KLhm/oXvUeSEs2VlLghFjQt9+ZaF9ghH0JNjc=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
-github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk=
@@ -110,15 +104,12 @@ github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8=
github.com/decred/dcrd/crypto/blake256 v1.1.0/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
-github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
-github.com/decred/dcrd/lru v1.1.2 h1:KdCzlkxppuoIDGEvCGah1fZRicrDH36IipvlB1ROkFY=
-github.com/decred/dcrd/lru v1.1.2/go.mod h1:gEdCVgXs1/YoBvFWt7Scgknbhwik3FgVSzlnCcXL2N8=
+github.com/decred/dcrd/lru v1.1.3 h1:w9EAbvGLyzm6jTjF83UKuqZEiUtJmvRhQDOCEIvSuE0=
+github.com/decred/dcrd/lru v1.1.3/go.mod h1:Tw0i0pJyiLEx/oZdHLe1Wdv/Y7EGzAX+sYftnmxBR4o=
github.com/dhui/dktest v0.4.0 h1:z05UmuXZHO/bgj/ds2bGMBu8FI4WA+Ag/m3ghL+om7M=
github.com/dhui/dktest v0.4.0/go.mod h1:v/Dbz1LgCBOi2Uki2nUqLBGa83hWBGFMu5MrgMDCc78=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -139,8 +130,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc=
+github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE=
github.com/fergusstrange/embedded-postgres v1.25.0 h1:sa+k2Ycrtz40eCRPOzI7Ry7TtkWXXJ+YRsxpKMDhxK0=
github.com/fergusstrange/embedded-postgres v1.25.0/go.mod h1:t/MLs0h9ukYM6FSt99R7InCHs1nW0ordoVCcnzmpTYw=
github.com/frankban/quicktest v1.2.2 h1:xfmOhhoH5fGPgbEAlhLpJH9p0z/0Qizio9osmvn9IUY=
@@ -180,8 +171,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -198,8 +190,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
@@ -233,7 +225,6 @@ github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad/go.mod h1:QPH04
github.com/jedib0t/go-pretty/v6 v6.2.7 h1:4823Lult/tJ0VI1PgW3aSKw59pMWQ6Kzv9b3Bj6MwY0=
github.com/jedib0t/go-pretty/v6 v6.2.7/go.mod h1:FMkOpgGD3EZ91cW8g/96RfxoV7bdeJyzXPYgz1L1ln0=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
@@ -262,6 +253,8 @@ github.com/juju/utils/v3 v3.0.0-20220130232349-cd7ecef0e94a h1:5ZWDCeCF0RaITrZGe
github.com/juju/utils/v3 v3.0.0-20220130232349-cd7ecef0e94a/go.mod h1:LzwbbEN7buYjySp4nqnti6c6olSqRXUk6RkbSUUP1n8=
github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23 h1:wtEPbidt1VyHlb8RSztU6ySQj29FLsOQiI9XiJhXDM4=
github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23/go.mod h1:Ljlbryh9sYaUSGXucslAEDf0A2XUSGvDbHJgW8ps6nc=
+github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee h1:FPP9HDkBbPyniu+u7FHZg+kKFX1WW0gxOGteJ0h3AJk=
+github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee/go.mod h1:N6sz6HwJAenJ6d+/xmSl0ikfV05ZrVGmjt1ryy/WOtE=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
@@ -284,34 +277,14 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
-github.com/lightninglabs/neutrino v0.17.1 h1:lNhgq7ix/N81R6oATroP/kHMzH1qzVVF2dEGcTlN2t4=
-github.com/lightninglabs/neutrino v0.17.1/go.mod h1:tcwCgRTGWcaua0L/xzdwllW8eslHDbux4XkiYsivvHE=
-github.com/lightninglabs/neutrino/cache v1.1.3 h1:rgnabC41W+XaPuBTQrdeFjFCCAVKh1yctAgmb3Se9zA=
-github.com/lightninglabs/neutrino/cache v1.1.3/go.mod h1:qxkJb+pUxR5p84jl5uIGFCR4dGdFkhNUwMSxw3EUWls=
+github.com/lightninglabs/neutrino v0.18.0 h1:UsyeU3twkCSAXxUssVg8vGXcHkWKzHZ3xQCej57t5t0=
+github.com/lightninglabs/neutrino v0.18.0/go.mod h1:TL52mV5nxeAN//WFHrU8XV9GZKwnrrNFL9/nKMX8sl4=
+github.com/lightninglabs/neutrino/cache v1.1.4 h1:KVtvUmBwYr7eKtjfjHG/q6/cQlcrjHl23Gag+VdxF2g=
+github.com/lightninglabs/neutrino/cache v1.1.4/go.mod h1:ZqLzxghPggIRfNXeAZN1VtTKofMyK/ALI6niYsPH6OE=
github.com/lightninglabs/protobuf-go-hex-display v1.36.11-hex-display h1:fjePiMfYbg3KodAiSXwkpGZpYdPeNd9VnggJWiY6AaY=
github.com/lightninglabs/protobuf-go-hex-display v1.36.11-hex-display/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-github.com/lightningnetwork/lightning-onion v1.3.0 h1:FqILgHjD6euc/Muo1VOzZ4+XDPuFnw6EYROBq0rR/5c=
-github.com/lightningnetwork/lightning-onion v1.3.0/go.mod h1:nP85zMHG7c0si/eHBbSQpuDCtnIXfSvFrK3tW6YWzmU=
-github.com/lightningnetwork/lnd/actor v0.0.6 h1:Ge8N2wivARG+27qJBwTlB0vwsypStZYZy8vk4Zl38sU=
-github.com/lightningnetwork/lnd/actor v0.0.6/go.mod h1:YAsoniSbY/cAM9HTVNfZLvt7RI6swDxy6wzPspTcMZg=
-github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
-github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
-github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
-github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
-github.com/lightningnetwork/lnd/fn/v2 v2.0.9 h1:ZytG4ltPac/sCyg1EJDn10RGzPIDJeyennUMRdOw7Y8=
-github.com/lightningnetwork/lnd/fn/v2 v2.0.9/go.mod h1:aPUJHJ31S+Lgoo8I5SxDIjnmeCifqujaiTXKZqpav3w=
-github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
-github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
-github.com/lightningnetwork/lnd/kvdb v1.5.1 h1:OG5cDbqggxiCFKAJbSPw0PfQovi+0odCZAAU5r5b+ho=
-github.com/lightningnetwork/lnd/kvdb v1.5.1/go.mod h1:5lubXYoXHDBWBYKmC+2we7qgkjjz0cEZ/5QSQkxQSec=
-github.com/lightningnetwork/lnd/queue v1.2.0 h1:sSrn+u84OLuOT/F+xGxgg8VfknXeIZEAFQoMH6BL60s=
-github.com/lightningnetwork/lnd/queue v1.2.0/go.mod h1:qLNP0L3B7piRGvDyhAyJKic4xTt+Mw4D7mWrQeuAwxY=
-github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
-github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
-github.com/lightningnetwork/lnd/tlv v1.3.2 h1:MO4FCk7F4k5xPMqVZF6Nb/kOpxlwPrUQpYjmyKny5s0=
-github.com/lightningnetwork/lnd/tlv v1.3.2/go.mod h1:pJuiBj1ecr1WWLOtcZ+2+hu9Ey25aJWFIsjmAoPPnmc=
-github.com/lightningnetwork/lnd/tor v1.1.7 h1:BfY1KQGz3LVaeaAGI4XYGYCwDQR1ADFD1P/uXsS2dQc=
-github.com/lightningnetwork/lnd/tor v1.1.7/go.mod h1:DANQ6QCQBiR+CqrM+mKudgkMy6CR/RS4ALDbjb2W4FU=
+github.com/lightningnetwork/lightning-onion v1.4.0 h1:qWE1icOH4AKXRcq1KCzt6P/TesqptgBTP++V7wowTc0=
+github.com/lightningnetwork/lightning-onion v1.4.0/go.mod h1:YDPkvVTVQ6FBBE6Yj93tDd7zA3iTSrryi9xq46i7bKE=
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796/go.mod h1:3p7ZTf9V1sNPI5H8P3NkTFF4LuwMdPl2DodF60qAKqY=
github.com/ltcsuite/ltcutil v0.0.0-20181217130922-17f3b04680b6/go.mod h1:8Vg/LTOO0KYa/vlHWJ6XZAevPQThGH5sufO0Hrou/lA=
@@ -345,13 +318,10 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
@@ -454,22 +424,22 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
-go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=
+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0=
-go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
-go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
-go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
-go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
-go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
-go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
-go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
-go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -505,7 +475,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
-golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -557,8 +526,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
@@ -620,7 +589,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXL
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/graph/builder.go b/graph/builder.go
index 14f5b7a..c8e8d09 100644
--- a/graph/builder.go
+++ b/graph/builder.go
@@ -9,7 +9,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/graph/builder_test.go b/graph/builder_test.go
index d9e1c2c..2102f96 100644
--- a/graph/builder_test.go
+++ b/graph/builder_test.go
@@ -16,10 +16,10 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/graph/db/benchmark_test.go b/graph/db/benchmark_test.go
index ff245d0..4b6bf20 100644
--- a/graph/db/benchmark_test.go
+++ b/graph/db/benchmark_test.go
@@ -10,7 +10,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/graph/db/channel_cache_test.go b/graph/db/channel_cache_test.go
index 28d6127..4f61def 100644
--- a/graph/db/channel_cache_test.go
+++ b/graph/db/channel_cache_test.go
@@ -3,7 +3,7 @@ package graphdb
import (
"testing"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
diff --git a/graph/db/codec.go b/graph/db/codec.go
index 029f9b9..a3981a6 100644
--- a/graph/db/codec.go
+++ b/graph/db/codec.go
@@ -4,7 +4,7 @@ import (
"encoding/binary"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
var (
diff --git a/graph/db/graph.go b/graph/db/graph.go
index a63b9d0..c84ed36 100644
--- a/graph/db/graph.go
+++ b/graph/db/graph.go
@@ -12,8 +12,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/graph/db/graph_cache.go b/graph/db/graph_cache.go
index 7cf101f..4343be8 100644
--- a/graph/db/graph_cache.go
+++ b/graph/db/graph_cache.go
@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
diff --git a/graph/db/graph_test.go b/graph/db/graph_test.go
index e524f0b..46d6186 100644
--- a/graph/db/graph_test.go
+++ b/graph/db/graph_test.go
@@ -18,10 +18,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/input"
diff --git a/graph/db/interfaces.go b/graph/db/interfaces.go
index c126be0..df11206 100644
--- a/graph/db/interfaces.go
+++ b/graph/db/interfaces.go
@@ -7,8 +7,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/graph/db/kv_store.go b/graph/db/kv_store.go
index 47c478c..7ca125d 100644
--- a/graph/db/kv_store.go
+++ b/graph/db/kv_store.go
@@ -16,8 +16,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/lightningnetwork/lnd/aliasmgr"
"github.com/lightningnetwork/lnd/batch"
diff --git a/graph/db/migration1/codec.go b/graph/db/migration1/codec.go
index 243308f..3f839e7 100644
--- a/graph/db/migration1/codec.go
+++ b/graph/db/migration1/codec.go
@@ -7,7 +7,7 @@ import (
"io"
"strconv"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
var (
diff --git a/graph/db/migration1/kv_store.go b/graph/db/migration1/kv_store.go
index 1146ec7..c955240 100644
--- a/graph/db/migration1/kv_store.go
+++ b/graph/db/migration1/kv_store.go
@@ -11,8 +11,8 @@ import (
"net"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/models"
diff --git a/graph/db/migration1/models/channel_edge_info.go b/graph/db/migration1/models/channel_edge_info.go
index c99dfa2..443d089 100644
--- a/graph/db/migration1/models/channel_edge_info.go
+++ b/graph/db/migration1/models/channel_edge_info.go
@@ -1,9 +1,9 @@
package models
import (
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/graph/db/migration1/sql_migration.go b/graph/db/migration1/sql_migration.go
index 8a31618..7a68a21 100644
--- a/graph/db/migration1/sql_migration.go
+++ b/graph/db/migration1/sql_migration.go
@@ -12,7 +12,7 @@ import (
"slices"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/models"
"github.com/lightningnetwork/lnd/graph/db/migration1/sqlc"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/graph/db/migration1/sql_migration_test.go b/graph/db/migration1/sql_migration_test.go
index d1c3868..4e86b03 100644
--- a/graph/db/migration1/sql_migration_test.go
+++ b/graph/db/migration1/sql_migration_test.go
@@ -23,10 +23,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btclog/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/models"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/graph/db/migration1/sql_store.go b/graph/db/migration1/sql_store.go
index c012ec3..d095e04 100644
--- a/graph/db/migration1/sql_store.go
+++ b/graph/db/migration1/sql_store.go
@@ -12,9 +12,9 @@ import (
"strconv"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/models"
"github.com/lightningnetwork/lnd/graph/db/migration1/sqlc"
diff --git a/graph/db/migration1/test_postgres.go b/graph/db/migration1/test_postgres.go
index c5724fc..a428af0 100644
--- a/graph/db/migration1/test_postgres.go
+++ b/graph/db/migration1/test_postgres.go
@@ -5,7 +5,7 @@ package migration1
import (
"testing"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/sqlc"
"github.com/lightningnetwork/lnd/sqldb"
"github.com/stretchr/testify/require"
diff --git a/graph/db/migration1/test_sqlite.go b/graph/db/migration1/test_sqlite.go
index 69096fa..ed6402f 100644
--- a/graph/db/migration1/test_sqlite.go
+++ b/graph/db/migration1/test_sqlite.go
@@ -5,7 +5,7 @@ package migration1
import (
"testing"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/graph/db/migration1/sqlc"
"github.com/lightningnetwork/lnd/sqldb"
"github.com/stretchr/testify/require"
diff --git a/graph/db/models/cached_edge_info.go b/graph/db/models/cached_edge_info.go
index eab12fb..3e9cfea 100644
--- a/graph/db/models/cached_edge_info.go
+++ b/graph/db/models/cached_edge_info.go
@@ -1,6 +1,6 @@
package models
-import "github.com/btcsuite/btcd/btcutil"
+import "github.com/btcsuite/btcd/btcutil/v2"
// CachedEdgeInfo is a struct that only caches the information of a
// ChannelEdgeInfo that we actually use for pathfinding and therefore need to
diff --git a/graph/db/models/channel_edge_info.go b/graph/db/models/channel_edge_info.go
index a7e1107..d266584 100644
--- a/graph/db/models/channel_edge_info.go
+++ b/graph/db/models/channel_edge_info.go
@@ -6,9 +6,9 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/graph/db/models/channel_edge_info_test.go b/graph/db/models/channel_edge_info_test.go
index 7102895..1ed1915 100644
--- a/graph/db/models/channel_edge_info_test.go
+++ b/graph/db/models/channel_edge_info_test.go
@@ -5,7 +5,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/graph/db/notifications.go b/graph/db/notifications.go
index 1c8a889..405c265 100644
--- a/graph/db/notifications.go
+++ b/graph/db/notifications.go
@@ -11,8 +11,8 @@ import (
"sync/atomic"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lnutils"
diff --git a/graph/db/sql_store.go b/graph/db/sql_store.go
index 871ad1a..1476515 100644
--- a/graph/db/sql_store.go
+++ b/graph/db/sql_store.go
@@ -18,9 +18,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/aliasmgr"
"github.com/lightningnetwork/lnd/batch"
"github.com/lightningnetwork/lnd/fn/v2"
diff --git a/graph/db/test_postgres.go b/graph/db/test_postgres.go
index a1bd61a..3754806 100644
--- a/graph/db/test_postgres.go
+++ b/graph/db/test_postgres.go
@@ -6,7 +6,7 @@ import (
"database/sql"
"testing"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/sqldb"
"github.com/stretchr/testify/require"
)
diff --git a/graph/db/test_sqlite.go b/graph/db/test_sqlite.go
index 137ab7a..50db504 100644
--- a/graph/db/test_sqlite.go
+++ b/graph/db/test_sqlite.go
@@ -6,7 +6,7 @@ import (
"database/sql"
"testing"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/sqldb"
"github.com/stretchr/testify/require"
)
diff --git a/graph/notifications_test.go b/graph/notifications_test.go
index f8bc0f2..898d951 100644
--- a/graph/notifications_test.go
+++ b/graph/notifications_test.go
@@ -13,10 +13,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/fn/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db"
diff --git a/healthcheck/go.mod b/healthcheck/go.mod
index 5005618..b2db2d8 100644
--- a/healthcheck/go.mod
+++ b/healthcheck/go.mod
@@ -3,24 +3,23 @@ module github.com/lightningnetwork/lnd/healthcheck
require (
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084
github.com/lightningnetwork/lnd/ticker v1.1.0
- github.com/lightningnetwork/lnd/tor v1.0.0
- github.com/stretchr/testify v1.8.4
- golang.org/x/sys v0.32.0
+ github.com/lightningnetwork/lnd/tor v1.1.8-0.20260615022959-a067468f0f45
+ github.com/stretchr/testify v1.10.0
+ golang.org/x/sys v0.35.0
)
require (
- github.com/btcsuite/btcd v0.24.2 // indirect
- github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
- github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
+ github.com/btcsuite/btcd v0.26.0 // indirect
+ github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 // indirect
+ github.com/btcsuite/btcd/chainhash/v2 v2.0.0 // indirect
+ github.com/btcsuite/btcd/wire/v2 v2.0.0 // indirect
+ github.com/btcsuite/btclog v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/kr/pretty v0.3.0 // indirect
+ github.com/kr/text v0.2.0 // indirect
github.com/miekg/dns v1.1.43 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/rogpeppe/go-internal v1.9.0 // indirect
- golang.org/x/crypto v0.37.0 // indirect
- golang.org/x/net v0.39.0 // indirect
- golang.org/x/sync v0.2.0 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+ golang.org/x/crypto v0.40.0 // indirect
+ golang.org/x/net v0.41.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/healthcheck/go.sum b/healthcheck/go.sum
index 9db4c65..a0f9647 100644
--- a/healthcheck/go.sum
+++ b/healthcheck/go.sum
@@ -1,143 +1,53 @@
-github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
-github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
-github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7alexyj/lHlOtr2PJK7L/+HDJZpcGDn/pAU98r7DY08=
-github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
-github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
-github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
-github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
-github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c h1:4HxD1lBUGUddhzgaNgrCPsFWd7cGYNpeFUgd9ZIgyM0=
-github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
+github.com/btcsuite/btcd v0.26.0 h1:yntnSshlG3+H7dTwIOR4LTFXDPojVBsFORBNN5y5c/c=
+github.com/btcsuite/btcd v0.26.0/go.mod h1:7ft7+a/MoJHFouFopCb1zyiR9IWPlrcPVn6K/lJ1dcA=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
+github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
+github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
+github.com/btcsuite/btclog v1.0.0 h1:sEkpKJMmfGiyZjADwEIgB1NSwMyfdD1FB8v6+w1T0Ns=
+github.com/btcsuite/btclog v1.0.0/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084 h1:y3bvkt8ki0KX35eUEU8XShRHusz1S+55QwXUTmxn888=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
-github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
-github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
-github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
-github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
-github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
-github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lightningnetwork/lnd/ticker v1.1.0 h1:ShoBiRP3pIxZHaETndfQ5kEe+S4NdAY1hiX7YbZ4QE4=
github.com/lightningnetwork/lnd/ticker v1.1.0/go.mod h1:ubqbSVCn6RlE0LazXuBr7/Zi6QT0uQo++OgIRBxQUrk=
-github.com/lightningnetwork/lnd/tor v1.0.0 h1:wvEc7I+Y7IOtPglVP3cVBbYhiVhc7uTd7cMF9gQRzwA=
-github.com/lightningnetwork/lnd/tor v1.0.0/go.mod h1:RDtaAdwfAm+ONuPYwUhNIH1RAvKPv+75lHPOegUcz64=
+github.com/lightningnetwork/lnd/tor v1.1.8-0.20260615022959-a067468f0f45 h1:pHNN29jqVEfBcqHpeDJkFWnuT+1/uT91Vy6WLTqz1EA=
+github.com/lightningnetwork/lnd/tor v1.1.8-0.20260615022959-a067468f0f45/go.mod h1:4h0LRuVGY8W9/HP32McLcaHwk6N/T5LJxSUSVYd4TKs=
github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
-golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/htlcswitch/circuit_map_test.go b/htlcswitch/circuit_map_test.go
index 9bbb2c0..c4b6e44 100644
--- a/htlcswitch/circuit_map_test.go
+++ b/htlcswitch/circuit_map_test.go
@@ -6,8 +6,8 @@ import (
"io"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/htlcswitch"
"github.com/lightningnetwork/lnd/kvdb"
diff --git a/htlcswitch/circuit_test.go b/htlcswitch/circuit_test.go
index ddad11a..f21e973 100644
--- a/htlcswitch/circuit_test.go
+++ b/htlcswitch/circuit_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/htlcswitch"
diff --git a/htlcswitch/hop/forwarding_info.go b/htlcswitch/hop/forwarding_info.go
index 92ea541..7f728f0 100644
--- a/htlcswitch/hop/forwarding_info.go
+++ b/htlcswitch/hop/forwarding_info.go
@@ -1,7 +1,7 @@
package hop
import (
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/lnwire"
)
diff --git a/htlcswitch/hop/iterator.go b/htlcswitch/hop/iterator.go
index 553c492..cc539fe 100644
--- a/htlcswitch/hop/iterator.go
+++ b/htlcswitch/hop/iterator.go
@@ -8,7 +8,7 @@ import (
"sync"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/record"
diff --git a/htlcswitch/hop/payload.go b/htlcswitch/hop/payload.go
index fc45682..052cf18 100644
--- a/htlcswitch/hop/payload.go
+++ b/htlcswitch/hop/payload.go
@@ -6,7 +6,7 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/record"
diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go
index 4739aff..75974a7 100644
--- a/htlcswitch/interfaces.go
+++ b/htlcswitch/interfaces.go
@@ -3,8 +3,8 @@ package htlcswitch
import (
"context"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index dd0f5d3..77b2b39 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btclog/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/contractcourt"
diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index 6a518cb..148254d 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -18,9 +18,9 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/davecgh/go-spew/spew"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/build"
diff --git a/htlcswitch/mailbox_test.go b/htlcswitch/mailbox_test.go
index 57a581c..af4b192 100644
--- a/htlcswitch/mailbox_test.go
+++ b/htlcswitch/mailbox_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/clock"
diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go
index 70bd73c..637f3e2 100644
--- a/htlcswitch/mock.go
+++ b/htlcswitch/mock.go
@@ -17,8 +17,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index a3aae80..b86d7be 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -11,8 +11,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/clock"
diff --git a/htlcswitch/switch_test.go b/htlcswitch/switch_test.go
index 9dfe22e..2f66fed 100644
--- a/htlcswitch/switch_test.go
+++ b/htlcswitch/switch_test.go
@@ -11,7 +11,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index 2e08425..10f7bdb 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -19,9 +19,9 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/contractcourt"
diff --git a/input/fuzz_script_is_op_return_test.go b/input/fuzz_script_is_op_return_test.go
index 148d7b0..ca6b730 100644
--- a/input/fuzz_script_is_op_return_test.go
+++ b/input/fuzz_script_is_op_return_test.go
@@ -3,8 +3,8 @@ package input
import (
"testing"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
"github.com/stretchr/testify/require"
)
diff --git a/input/input.go b/input/input.go
index 5ca4271..13e6dc3 100644
--- a/input/input.go
+++ b/input/input.go
@@ -3,9 +3,9 @@ package input
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/tlv"
diff --git a/input/mocks.go b/input/mocks.go
index a7d7583..f8ec38a 100644
--- a/input/mocks.go
+++ b/input/mocks.go
@@ -6,8 +6,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/input/script_desc.go b/input/script_desc.go
index 17b58b7..3b566e2 100644
--- a/input/script_desc.go
+++ b/input/script_desc.go
@@ -4,7 +4,7 @@ import (
"errors"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/txscript/v2"
"github.com/lightningnetwork/lnd/lnutils"
)
diff --git a/input/script_utils.go b/input/script_utils.go
index 3b907fc..f42d2be 100644
--- a/input/script_utils.go
+++ b/input/script_utils.go
@@ -6,14 +6,14 @@ import (
"encoding/hex"
"fmt"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnutils"
@@ -100,7 +100,7 @@ func WitnessScriptHash(witnessScript []byte) ([]byte, error) {
// paying to a version 0 witness program containing the passed serialized
// public key.
func WitnessPubKeyHash(pubkey []byte) ([]byte, error) {
- pkhash := btcutil.Hash160(pubkey)
+ pkhash := address.Hash160(pubkey)
return txscript.ScriptTemplate(
`OP_0 {{ hex .PKHash }}`,
txscript.WithScriptTemplateParams(TemplateParams{
@@ -112,7 +112,7 @@ func WitnessPubKeyHash(pubkey []byte) ([]byte, error) {
// GenerateP2SH generates a pay-to-script-hash public key script paying to the
// passed redeem script.
func GenerateP2SH(script []byte) ([]byte, error) {
- scriptHash := btcutil.Hash160(script)
+ scriptHash := address.Hash160(script)
return txscript.ScriptTemplate(
`OP_HASH160 {{ hex .ScriptHash }} OP_EQUAL`,
txscript.WithScriptTemplateParams(TemplateParams{
@@ -124,7 +124,7 @@ func GenerateP2SH(script []byte) ([]byte, error) {
// GenerateP2PKH generates a pay-to-public-key-hash public key script paying to
// the passed serialized public key.
func GenerateP2PKH(pubkey []byte) ([]byte, error) {
- pkHash := btcutil.Hash160(pubkey)
+ pkHash := address.Hash160(pubkey)
return txscript.ScriptTemplate(
`OP_DUP OP_HASH160 {{ hex .pkh }} OP_EQUALVERIFY OP_CHECKSIG`,
txscript.WithScriptTemplateParams(TemplateParams{
@@ -375,7 +375,7 @@ func SenderHTLCScript(senderHtlcKey, receiverHtlcKey,
return txscript.ScriptTemplate(
scriptTemplate,
txscript.WithScriptTemplateParams(TemplateParams{
- "RevKeyHash": btcutil.Hash160(revocationKey.SerializeCompressed()), //nolint:ll
+ "RevKeyHash": address.Hash160(revocationKey.SerializeCompressed()), //nolint:ll
"ReceiverKey": receiverHtlcKey.SerializeCompressed(), //nolint:ll
"SenderKey": senderHtlcKey.SerializeCompressed(), //nolint:ll
"PaymentHashRipemd": Ripemd160H(paymentHash),
@@ -1000,7 +1000,7 @@ func ReceiverHTLCScript(cltvExpiry uint32, senderHtlcKey,
return txscript.ScriptTemplate(
scriptTemplate,
txscript.WithScriptTemplateParams(TemplateParams{
- "RevKeyHash": btcutil.Hash160(
+ "RevKeyHash": address.Hash160(
revocationKey.SerializeCompressed(),
),
"SenderKey": senderHtlcKey.SerializeCompressed(), //nolint:ll
@@ -2513,7 +2513,7 @@ func CommitScriptUnencumbered(key *btcec.PublicKey) ([]byte, error) {
return txscript.ScriptTemplate(
`OP_0 {{ hex .PKHash }}`,
txscript.WithScriptTemplateParams(TemplateParams{
- "PKHash": btcutil.Hash160(key.SerializeCompressed()),
+ "PKHash": address.Hash160(key.SerializeCompressed()),
}),
)
}
diff --git a/input/script_utils_legacy_test.go b/input/script_utils_legacy_test.go
index b3b4f88..32d6a0b 100644
--- a/input/script_utils_legacy_test.go
+++ b/input/script_utils_legacy_test.go
@@ -5,10 +5,10 @@ import (
"crypto/sha256"
"fmt"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/txscript/v2"
)
// legacyWitnessScriptHash generates a pay-to-witness-script-hash public key
@@ -35,7 +35,7 @@ func legacyWitnessPubKeyHash(pubkey []byte) ([]byte, error) {
)
bldr.AddOp(txscript.OP_0)
- pkhash := btcutil.Hash160(pubkey)
+ pkhash := address.Hash160(pubkey)
bldr.AddData(pkhash)
return bldr.Script()
@@ -49,7 +49,7 @@ func legacyGenerateP2SH(script []byte) ([]byte, error) {
)
bldr.AddOp(txscript.OP_HASH160)
- scripthash := btcutil.Hash160(script)
+ scripthash := address.Hash160(script)
bldr.AddData(scripthash)
bldr.AddOp(txscript.OP_EQUAL)
@@ -65,7 +65,7 @@ func legacyGenerateP2PKH(pubkey []byte) ([]byte, error) {
bldr.AddOp(txscript.OP_DUP)
bldr.AddOp(txscript.OP_HASH160)
- pkhash := btcutil.Hash160(pubkey)
+ pkhash := address.Hash160(pubkey)
bldr.AddData(pkhash)
bldr.AddOp(txscript.OP_EQUALVERIFY)
bldr.AddOp(txscript.OP_CHECKSIG)
@@ -117,7 +117,7 @@ func legacySenderHTLCScript(senderHtlcKey, receiverHtlcKey,
// the stack.
builder.AddOp(txscript.OP_DUP)
builder.AddOp(txscript.OP_HASH160)
- builder.AddData(btcutil.Hash160(revocationKey.SerializeCompressed()))
+ builder.AddData(address.Hash160(revocationKey.SerializeCompressed()))
builder.AddOp(txscript.OP_EQUAL)
// If the hash matches, then this is the revocation clause. The output
@@ -212,7 +212,7 @@ func legacyReceiverHTLCScript(cltvExpiry uint32, senderHtlcKey,
// the stack.
builder.AddOp(txscript.OP_DUP)
builder.AddOp(txscript.OP_HASH160)
- builder.AddData(btcutil.Hash160(revocationKey.SerializeCompressed()))
+ builder.AddData(address.Hash160(revocationKey.SerializeCompressed()))
builder.AddOp(txscript.OP_EQUAL)
// If the hash matches, then this is the revocation clause. The output
@@ -440,7 +440,7 @@ func legacyCommitScriptUnencumbered(key *btcec.PublicKey) ([]byte, error) {
P2WPKHSize,
))
builder.AddOp(txscript.OP_0)
- builder.AddData(btcutil.Hash160(key.SerializeCompressed()))
+ builder.AddData(address.Hash160(key.SerializeCompressed()))
return builder.Script()
}
diff --git a/input/script_utils_test.go b/input/script_utils_test.go
index 4e1a92d..9616948 100644
--- a/input/script_utils_test.go
+++ b/input/script_utils_test.go
@@ -9,10 +9,10 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/stretchr/testify/require"
diff --git a/input/signdescriptor.go b/input/signdescriptor.go
index a01c939..7e77326 100644
--- a/input/signdescriptor.go
+++ b/input/signdescriptor.go
@@ -7,8 +7,8 @@ import (
"io"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
)
diff --git a/input/signdescriptor_test.go b/input/signdescriptor_test.go
index a929e3a..ddffaac 100644
--- a/input/signdescriptor_test.go
+++ b/input/signdescriptor_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
)
diff --git a/input/signer.go b/input/signer.go
index 1cf4003..978a40f 100644
--- a/input/signer.go
+++ b/input/signer.go
@@ -1,7 +1,7 @@
package input
import (
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// Signer represents an abstract object capable of generating raw signatures as
diff --git a/input/size.go b/input/size.go
index 97e251a..3618f20 100644
--- a/input/size.go
+++ b/input/size.go
@@ -2,8 +2,8 @@ package input
import (
"github.com/btcsuite/btcd/blockchain"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightningnetwork/lnd/lntypes"
)
diff --git a/input/size_test.go b/input/size_test.go
index b0531b1..7b19364 100644
--- a/input/size_test.go
+++ b/input/size_test.go
@@ -3,13 +3,14 @@ package input_test
import (
"testing"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/blockchain"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/keychain"
@@ -59,25 +60,25 @@ var (
func TestTxWeightEstimator(t *testing.T) {
netParams := &chaincfg.MainNetParams
- p2pkhAddr, err := btcutil.NewAddressPubKeyHash(
+ p2pkhAddr, err := address.NewAddressPubKeyHash(
make([]byte, 20), netParams)
require.NoError(t, err, "Failed to generate address")
p2pkhScript, err := txscript.PayToAddrScript(p2pkhAddr)
require.NoError(t, err, "Failed to generate scriptPubKey")
- p2wkhAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ p2wkhAddr, err := address.NewAddressWitnessPubKeyHash(
make([]byte, 20), netParams)
require.NoError(t, err, "Failed to generate address")
p2wkhScript, err := txscript.PayToAddrScript(p2wkhAddr)
require.NoError(t, err, "Failed to generate scriptPubKey")
- p2wshAddr, err := btcutil.NewAddressWitnessScriptHash(
+ p2wshAddr, err := address.NewAddressWitnessScriptHash(
make([]byte, 32), netParams)
require.NoError(t, err, "Failed to generate address")
p2wshScript, err := txscript.PayToAddrScript(p2wshAddr)
require.NoError(t, err, "Failed to generate scriptPubKey")
- p2shAddr, err := btcutil.NewAddressScriptHash([]byte{0}, netParams)
+ p2shAddr, err := address.NewAddressScriptHash([]byte{0}, netParams)
require.NoError(t, err, "Failed to generate address")
p2shScript, err := txscript.PayToAddrScript(p2shAddr)
require.NoError(t, err, "Failed to generate scriptPubKey")
diff --git a/input/taproot.go b/input/taproot.go
index aa467fb..32a634a 100644
--- a/input/taproot.go
+++ b/input/taproot.go
@@ -5,8 +5,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightningnetwork/lnd/fn/v2"
)
diff --git a/input/taproot_test.go b/input/taproot_test.go
index 8405092..e1eef69 100644
--- a/input/taproot_test.go
+++ b/input/taproot_test.go
@@ -7,9 +7,9 @@ import (
"testing"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/input/test_utils.go b/input/test_utils.go
index 682dfdc..ab9a586 100644
--- a/input/test_utils.go
+++ b/input/test_utils.go
@@ -5,14 +5,14 @@ import (
"encoding/hex"
"fmt"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
)
@@ -84,7 +84,7 @@ func (m *MockSigner) SignOutputRaw(tx *wire.MsgTx,
pubkey = DeriveRevocationPubkey(pubkey, signDesc.DoubleTweak.PubKey())
}
- hash160 := btcutil.Hash160(pubkey.SerializeCompressed())
+ hash160 := address.Hash160(pubkey.SerializeCompressed())
privKey := m.findKey(hash160, signDesc.SingleTweak, signDesc.DoubleTweak)
if privKey == nil {
return nil, fmt.Errorf("mock signer does not have key")
@@ -223,7 +223,7 @@ func (m *MockSigner) findKey(needleHash160 []byte, singleTweak []byte,
for _, privkey := range m.Privkeys {
// First check whether public key is directly derived from
// private key.
- hash160 := btcutil.Hash160(privkey.PubKey().SerializeCompressed())
+ hash160 := address.Hash160(privkey.PubKey().SerializeCompressed())
if bytes.Equal(hash160, needleHash160) {
return privkey
}
@@ -238,7 +238,7 @@ func (m *MockSigner) findKey(needleHash160 []byte, singleTweak []byte,
default:
continue
}
- hash160 = btcutil.Hash160(privkey.PubKey().SerializeCompressed())
+ hash160 = address.Hash160(privkey.PubKey().SerializeCompressed())
if bytes.Equal(hash160, needleHash160) {
return privkey
}
diff --git a/input/txout.go b/input/txout.go
index 381c6be..1322e35 100644
--- a/input/txout.go
+++ b/input/txout.go
@@ -4,7 +4,7 @@ import (
"encoding/binary"
"io"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
// writeTxOut serializes a wire.TxOut struct into the passed io.Writer stream.
diff --git a/input/txout_test.go b/input/txout_test.go
index 5587f19..9e98e73 100644
--- a/input/txout_test.go
+++ b/input/txout_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/wire/v2"
)
func TestTxOutSerialization(t *testing.T) {
diff --git a/input/witnessgen.go b/input/witnessgen.go
index eae3f5f..612cdc3 100644
--- a/input/witnessgen.go
+++ b/input/witnessgen.go
@@ -3,8 +3,8 @@ package input
import (
"fmt"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lntypes"
)
diff --git a/internal/musig2v040/keys.go b/internal/musig2v040/keys.go
index 9016f0b..96a4487 100644
--- a/internal/musig2v040/keys.go
+++ b/internal/musig2v040/keys.go
@@ -9,7 +9,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
secp "github.com/decred/dcrd/dcrec/secp256k1/v4"
)
diff --git a/internal/musig2v040/musig2_test.go b/internal/musig2v040/musig2_test.go
index a563176..fa2e1bc 100644
--- a/internal/musig2v040/musig2_test.go
+++ b/internal/musig2v040/musig2_test.go
@@ -16,7 +16,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/decred/dcrd/dcrec/secp256k1/v4"
)
diff --git a/internal/musig2v040/nonces.go b/internal/musig2v040/nonces.go
index 86ca683..2e13d64 100644
--- a/internal/musig2v040/nonces.go
+++ b/internal/musig2v040/nonces.go
@@ -10,7 +10,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
const (
diff --git a/internal/musig2v040/sign.go b/internal/musig2v040/sign.go
index b1236c3..ad070bf 100644
--- a/internal/musig2v040/sign.go
+++ b/internal/musig2v040/sign.go
@@ -9,7 +9,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
secp "github.com/decred/dcrd/dcrec/secp256k1/v4"
)
diff --git a/invoices/interface.go b/invoices/interface.go
index 567df45..b963b39 100644
--- a/invoices/interface.go
+++ b/invoices/interface.go
@@ -4,7 +4,7 @@ import (
"context"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/graph/db/models"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/invoices/invoice_expiry_watcher.go b/invoices/invoice_expiry_watcher.go
index d7659dc..8549dde 100644
--- a/invoices/invoice_expiry_watcher.go
+++ b/invoices/invoice_expiry_watcher.go
@@ -6,7 +6,7 @@ import (
"sync"
"time"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/clock"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/invoices/test_utils.go b/invoices/test_utils.go
index b218043..c632294 100644
--- a/invoices/test_utils.go
+++ b/invoices/test_utils.go
@@ -10,8 +10,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/clock"
"github.com/lightningnetwork/lnd/lntypes"
diff --git a/invoices/test_utils_test.go b/invoices/test_utils_test.go
index 3ee8e96..9698dc7 100644
--- a/invoices/test_utils_test.go
+++ b/invoices/test_utils_test.go
@@ -13,8 +13,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/clock"
invpkg "github.com/lightningnetwork/lnd/invoices"
diff --git a/invoices/update.go b/invoices/update.go
index 6f7a34f..7db86c0 100644
--- a/invoices/update.go
+++ b/invoices/update.go
@@ -5,7 +5,7 @@ import (
"encoding/hex"
"errors"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/amp"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
diff --git a/itest/lnd_amp_test.go b/itest/lnd_amp_test.go
index 525dff0..72c3678 100644
--- a/itest/lnd_amp_test.go
+++ b/itest/lnd_amp_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/amp"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_bump_fee.go b/itest/lnd_bump_fee.go
index 3b89e10..3493a58 100644
--- a/itest/lnd_bump_fee.go
+++ b/itest/lnd_bump_fee.go
@@ -3,8 +3,8 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_channel_backup_test.go b/itest/lnd_channel_backup_test.go
index bdfb21a..ea28b45 100644
--- a/itest/lnd_channel_backup_test.go
+++ b/itest/lnd_channel_backup_test.go
@@ -11,8 +11,8 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chanbackup"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_channel_balance_test.go b/itest/lnd_channel_balance_test.go
index 75e3e85..4c5eee3 100644
--- a/itest/lnd_channel_balance_test.go
+++ b/itest/lnd_channel_balance_test.go
@@ -3,7 +3,7 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_channel_force_close_test.go b/itest/lnd_channel_force_close_test.go
index 817a356..2df19f9 100644
--- a/itest/lnd_channel_force_close_test.go
+++ b/itest/lnd_channel_force_close_test.go
@@ -5,8 +5,8 @@ import (
"errors"
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_channel_funding_fund_max_test.go b/itest/lnd_channel_funding_fund_max_test.go
index 3471862..d262151 100644
--- a/itest/lnd_channel_funding_fund_max_test.go
+++ b/itest/lnd_channel_funding_fund_max_test.go
@@ -4,7 +4,7 @@ import (
"errors"
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/input"
diff --git a/itest/lnd_channel_funding_utxo_selection_test.go b/itest/lnd_channel_funding_utxo_selection_test.go
index 32caf2b..70765a5 100644
--- a/itest/lnd_channel_funding_utxo_selection_test.go
+++ b/itest/lnd_channel_funding_utxo_selection_test.go
@@ -5,7 +5,7 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_channel_graph_test.go b/itest/lnd_channel_graph_test.go
index 52612b8..54db517 100644
--- a/itest/lnd_channel_graph_test.go
+++ b/itest/lnd_channel_graph_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_channel_policy_test.go b/itest/lnd_channel_policy_test.go
index 67f55d8..8a38c31 100644
--- a/itest/lnd_channel_policy_test.go
+++ b/itest/lnd_channel_policy_test.go
@@ -5,7 +5,7 @@ import (
"math"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_coop_close_external_delivery_test.go b/itest/lnd_coop_close_external_delivery_test.go
index 4c2f0a5..cc949d0 100644
--- a/itest/lnd_coop_close_external_delivery_test.go
+++ b/itest/lnd_coop_close_external_delivery_test.go
@@ -3,8 +3,9 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/address/v2"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lntest"
@@ -158,9 +159,9 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest,
// Use ImportPublicKey.
case importPubkey:
var (
- address btcutil.Address
- pubKey []byte
- addressType walletrpc.AddressType
+ deliveryAddr address.Address
+ pubKey []byte
+ addressType walletrpc.AddressType
)
switch deliveryAddressType {
case lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH:
@@ -170,15 +171,15 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest,
// Make new address for second sub-test.
pk[1]++
}
- address, err = btcutil.NewAddressWitnessPubKeyHash(
- btcutil.Hash160(pk[:]), harnessNetParams,
+ deliveryAddr, err = address.NewAddressWitnessPubKeyHash(
+ address.Hash160(pk[:]), harnessNetParams,
)
require.NoError(ht, err)
pubKey = pk[:]
addressType = walletrpc.AddressType_WITNESS_PUBKEY_HASH
case lnrpc.AddressType_UNUSED_TAPROOT_PUBKEY:
- address = taprootAddress
+ deliveryAddr = taprootAddress
pubKey = taprootPubkey[:]
addressType = walletrpc.AddressType_TAPROOT_PUBKEY
@@ -187,7 +188,7 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest,
deliveryAddressType)
}
- addr = address.String()
+ addr = deliveryAddr.String()
// Import the address to LND.
alice.RPC.ImportPublicKey(&walletrpc.ImportPublicKeyRequest{
diff --git a/itest/lnd_coop_close_rbf_test.go b/itest/lnd_coop_close_rbf_test.go
index f607e50..e23f8d3 100644
--- a/itest/lnd_coop_close_rbf_test.go
+++ b/itest/lnd_coop_close_rbf_test.go
@@ -4,8 +4,8 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/node"
diff --git a/itest/lnd_coop_close_with_htlcs_test.go b/itest/lnd_coop_close_with_htlcs_test.go
index b35b526..f465428 100644
--- a/itest/lnd_coop_close_with_htlcs_test.go
+++ b/itest/lnd_coop_close_with_htlcs_test.go
@@ -4,8 +4,8 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_estimate_on_chain_fee_test.go b/itest/lnd_estimate_on_chain_fee_test.go
index 7fd5d47..93130b9 100644
--- a/itest/lnd_estimate_on_chain_fee_test.go
+++ b/itest/lnd_estimate_on_chain_fee_test.go
@@ -3,7 +3,7 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_estimate_route_fee_test.go b/itest/lnd_estimate_route_fee_test.go
index ad19e7b..c9f40ea 100644
--- a/itest/lnd_estimate_route_fee_test.go
+++ b/itest/lnd_estimate_route_fee_test.go
@@ -3,7 +3,7 @@ package itest
import (
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_etcd_failover_test.go b/itest/lnd_etcd_failover_test.go
index 3821229..ef36123 100644
--- a/itest/lnd_etcd_failover_test.go
+++ b/itest/lnd_etcd_failover_test.go
@@ -12,7 +12,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/cluster"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lncfg"
diff --git a/itest/lnd_experimental_accountability.go b/itest/lnd_experimental_accountability.go
index 30296e7..56b5d0b 100644
--- a/itest/lnd_experimental_accountability.go
+++ b/itest/lnd_experimental_accountability.go
@@ -3,7 +3,7 @@ package itest
import (
"math"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_forward_delete_test.go b/itest/lnd_forward_delete_test.go
index 678a0d7..0361d7e 100644
--- a/itest/lnd_forward_delete_test.go
+++ b/itest/lnd_forward_delete_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_forward_interceptor_test.go b/itest/lnd_forward_interceptor_test.go
index f68042d..0724429 100644
--- a/itest/lnd_forward_interceptor_test.go
+++ b/itest/lnd_forward_interceptor_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_funding_test.go b/itest/lnd_funding_test.go
index d23c886..cf7dad2 100644
--- a/itest/lnd_funding_test.go
+++ b/itest/lnd_funding_test.go
@@ -4,10 +4,10 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/labels"
diff --git a/itest/lnd_graph.go b/itest/lnd_graph.go
index 2069482..25c08d2 100644
--- a/itest/lnd_graph.go
+++ b/itest/lnd_graph.go
@@ -3,7 +3,7 @@ package itest
import (
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/wait"
"github.com/stretchr/testify/require"
diff --git a/itest/lnd_hold_persistence_test.go b/itest/lnd_hold_persistence_test.go
index f024453..73c096d 100644
--- a/itest/lnd_hold_persistence_test.go
+++ b/itest/lnd_hold_persistence_test.go
@@ -3,7 +3,7 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_htlc_test.go b/itest/lnd_htlc_test.go
index e582599..27169a9 100644
--- a/itest/lnd_htlc_test.go
+++ b/itest/lnd_htlc_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/stretchr/testify/require"
diff --git a/itest/lnd_htlc_timeout_resolver_test.go b/itest/lnd_htlc_timeout_resolver_test.go
index 2710086..d4107e9 100644
--- a/itest/lnd_htlc_timeout_resolver_test.go
+++ b/itest/lnd_htlc_timeout_resolver_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_invoice_acceptor_test.go b/itest/lnd_invoice_acceptor_test.go
index 4d5e30c..23bb30e 100644
--- a/itest/lnd_invoice_acceptor_test.go
+++ b/itest/lnd_invoice_acceptor_test.go
@@ -3,7 +3,7 @@ package itest
import (
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/invoices"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_max_channel_size_test.go b/itest/lnd_max_channel_size_test.go
index 4e19f86..9f565f3 100644
--- a/itest/lnd_max_channel_size_test.go
+++ b/itest/lnd_max_channel_size_test.go
@@ -3,7 +3,7 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lnwallet"
diff --git a/itest/lnd_misc_test.go b/itest/lnd_misc_test.go
index 33b44ef..99d8de6 100644
--- a/itest/lnd_misc_test.go
+++ b/itest/lnd_misc_test.go
@@ -7,10 +7,10 @@ import (
"os"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/wallet"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/input"
diff --git a/itest/lnd_mpp_test.go b/itest/lnd_mpp_test.go
index abc61e2..f9c38fb 100644
--- a/itest/lnd_mpp_test.go
+++ b/itest/lnd_mpp_test.go
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_multi-hop-payments_test.go b/itest/lnd_multi-hop-payments_test.go
index 718fdca..dea04bd 100644
--- a/itest/lnd_multi-hop-payments_test.go
+++ b/itest/lnd_multi-hop-payments_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_multi-hop_force_close_test.go b/itest/lnd_multi-hop_force_close_test.go
index 1e90129..fbd82ec 100644
--- a/itest/lnd_multi-hop_force_close_test.go
+++ b/itest/lnd_multi-hop_force_close_test.go
@@ -3,7 +3,7 @@ package itest
import (
"fmt"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
diff --git a/itest/lnd_network_test.go b/itest/lnd_network_test.go
index c5df649..fb5c175 100644
--- a/itest/lnd_network_test.go
+++ b/itest/lnd_network_test.go
@@ -5,7 +5,7 @@ import (
"net"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_neutrino_headers_import_test.go b/itest/lnd_neutrino_headers_import_test.go
index 46cd0c0..48fdcc6 100644
--- a/itest/lnd_neutrino_headers_import_test.go
+++ b/itest/lnd_neutrino_headers_import_test.go
@@ -7,7 +7,7 @@ import (
"os"
"path/filepath"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightninglabs/neutrino/chainimport"
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_nonstd_sweep_test.go b/itest/lnd_nonstd_sweep_test.go
index ca596d1..b261938 100644
--- a/itest/lnd_nonstd_sweep_test.go
+++ b/itest/lnd_nonstd_sweep_test.go
@@ -3,34 +3,35 @@ package itest
import (
"testing"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/address/v2"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/stretchr/testify/require"
)
func testNonstdSweep(ht *lntest.HarnessTest) {
- p2shAddr, err := btcutil.NewAddressScriptHash(
+ p2shAddr, err := address.NewAddressScriptHash(
make([]byte, 1), harnessNetParams,
)
require.NoError(ht, err)
- p2pkhAddr, err := btcutil.NewAddressPubKeyHash(
+ p2pkhAddr, err := address.NewAddressPubKeyHash(
make([]byte, 20), harnessNetParams,
)
require.NoError(ht, err)
- p2wshAddr, err := btcutil.NewAddressWitnessScriptHash(
+ p2wshAddr, err := address.NewAddressWitnessScriptHash(
make([]byte, 32), harnessNetParams,
)
require.NoError(ht, err)
- p2wkhAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ p2wkhAddr, err := address.NewAddressWitnessPubKeyHash(
make([]byte, 20), harnessNetParams,
)
require.NoError(ht, err)
- p2trAddr, err := btcutil.NewAddressTaproot(
+ p2trAddr, err := address.NewAddressTaproot(
make([]byte, 32), harnessNetParams,
)
require.NoError(ht, err)
diff --git a/itest/lnd_onchain_test.go b/itest/lnd_onchain_test.go
index d5d0a19..08860c1 100644
--- a/itest/lnd_onchain_test.go
+++ b/itest/lnd_onchain_test.go
@@ -4,10 +4,10 @@ import (
"bytes"
"fmt"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
diff --git a/itest/lnd_onion_message_forward_test.go b/itest/lnd_onion_message_forward_test.go
index 049e33a..192dbd8 100644
--- a/itest/lnd_onion_message_forward_test.go
+++ b/itest/lnd_onion_message_forward_test.go
@@ -5,7 +5,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_onion_message_test.go b/itest/lnd_onion_message_test.go
index 74ec0b8..c74423e 100644
--- a/itest/lnd_onion_message_test.go
+++ b/itest/lnd_onion_message_test.go
@@ -4,7 +4,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
sphinx "github.com/lightningnetwork/lightning-onion"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_open_channel_test.go b/itest/lnd_open_channel_test.go
index 15b0bd7..5e92ebe 100644
--- a/itest/lnd_open_channel_test.go
+++ b/itest/lnd_open_channel_test.go
@@ -5,8 +5,8 @@ import (
"strings"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lncfg"
diff --git a/itest/lnd_payment_test.go b/itest/lnd_payment_test.go
index 5b69371..707e6d5 100644
--- a/itest/lnd_payment_test.go
+++ b/itest/lnd_payment_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_postgres_network_separation_test.go b/itest/lnd_postgres_network_separation_test.go
index d950d8c..5fd6db9 100644
--- a/itest/lnd_postgres_network_separation_test.go
+++ b/itest/lnd_postgres_network_separation_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/lightningnetwork/lnd/chainparams"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/sqldb"
diff --git a/itest/lnd_psbt_test.go b/itest/lnd_psbt_test.go
index c70803d..d0ac35c 100644
--- a/itest/lnd_psbt_test.go
+++ b/itest/lnd_psbt_test.go
@@ -6,15 +6,16 @@ import (
"testing"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "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/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/btcutil/v2/hdkeychain"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/psbt/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/keychain"
@@ -501,7 +502,7 @@ func runPsbtChanFundingSingleStep(ht *lntest.HarnessTest, private bool,
Type: lnrpc.AddressType_WITNESS_PUBKEY_HASH,
}
addrResp := carol.RPC.NewAddress(req)
- reserveAddr, err := btcutil.DecodeAddress(
+ reserveAddr, err := address.DecodeAddress(
addrResp.Address, harnessNetParams,
)
require.NoError(ht, err)
@@ -720,8 +721,8 @@ func runSignPsbtSegWitV0P2WKH(ht *lntest.HarnessTest, alice *node.HarnessNode) {
addrPubKey, err := addrKey.ECPubKey()
require.NoError(ht, err)
- pubKeyHash := btcutil.Hash160(addrPubKey.SerializeCompressed())
- witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ pubKeyHash := address.Hash160(addrPubKey.SerializeCompressed())
+ witnessAddr, err := address.NewAddressWitnessPubKeyHash(
pubKeyHash, harnessNetParams,
)
require.NoError(ht, err)
@@ -801,15 +802,15 @@ func runSignPsbtSegWitV0NP2WKH(ht *lntest.HarnessTest,
addrPubKey, err := addrKey.ECPubKey()
require.NoError(ht, err)
- pubKeyHash := btcutil.Hash160(addrPubKey.SerializeCompressed())
- witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ pubKeyHash := address.Hash160(addrPubKey.SerializeCompressed())
+ witnessAddr, err := address.NewAddressWitnessPubKeyHash(
pubKeyHash, harnessNetParams,
)
require.NoError(ht, err)
witnessProgram, err := txscript.PayToAddrScript(witnessAddr)
require.NoError(ht, err)
- np2wkhAddr, err := btcutil.NewAddressScriptHash(
+ np2wkhAddr, err := address.NewAddressScriptHash(
witnessProgram, harnessNetParams,
)
require.NoError(ht, err)
@@ -857,7 +858,7 @@ func runSignPsbtSegWitV1KeySpendBip86(ht *lntest.HarnessTest,
// Our taproot key is a BIP0086 key spend only construction that just
// commits to the internal key and no root hash.
taprootKey := txscript.ComputeTaprootKeyNoScript(internalKey)
- tapScriptAddr, err := btcutil.NewAddressTaproot(
+ tapScriptAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -905,7 +906,7 @@ func runSignPsbtSegWitV1KeySpendRootHash(ht *lntest.HarnessTest,
rootHash := leaf1.TapHash()
taprootKey := txscript.ComputeTaprootOutputKey(internalKey, rootHash[:])
- tapScriptAddr, err := btcutil.NewAddressTaproot(
+ tapScriptAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -953,7 +954,7 @@ func runSignPsbtSegWitV1ScriptSpend(ht *lntest.HarnessTest,
rootHash := leaf1.TapHash()
taprootKey := txscript.ComputeTaprootOutputKey(internalKey, rootHash[:])
- tapScriptAddr, err := btcutil.NewAddressTaproot(
+ tapScriptAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1178,7 +1179,7 @@ func runFundPsbt(ht *lntest.HarnessTest, alice, bob *node.HarnessNode) {
// addressToPkScript parses the given address string and returns the pkScript
// for the regtest environment.
func addressToPkScript(t testing.TB, addr string) []byte {
- parsed, err := btcutil.DecodeAddress(addr, harnessNetParams)
+ parsed, err := address.DecodeAddress(addr, harnessNetParams)
require.NoError(t, err)
pkScript, err := txscript.PayToAddrScript(parsed)
diff --git a/itest/lnd_quiescence_test.go b/itest/lnd_quiescence_test.go
index c60f938..10a01fe 100644
--- a/itest/lnd_quiescence_test.go
+++ b/itest/lnd_quiescence_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/devrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_recovery_test.go b/itest/lnd_recovery_test.go
index ea93f37..dee8027 100644
--- a/itest/lnd_recovery_test.go
+++ b/itest/lnd_recovery_test.go
@@ -5,11 +5,12 @@ import (
"fmt"
"math"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/hdkeychain"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/address/v2"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/btcutil/v2/hdkeychain"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/aezeed"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnrpc"
@@ -335,8 +336,8 @@ func testRescanAddressDetection(ht *lntest.HarnessTest) {
// Create an address generated from internal keys.
keyDesc := carol.RPC.DeriveNextKey(&walletrpc.KeyReq{KeyFamily: 123})
- pubKeyHash := btcutil.Hash160(keyDesc.RawKeyBytes)
- ghostUtxoAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ pubKeyHash := address.Hash160(keyDesc.RawKeyBytes)
+ ghostUtxoAddr, err := address.NewAddressWitnessPubKeyHash(
pubKeyHash, harnessNetParams,
)
require.NoError(ht, err)
diff --git a/itest/lnd_remote_signer_test.go b/itest/lnd_remote_signer_test.go
index db1e283..1c1ffa5 100644
--- a/itest/lnd_remote_signer_test.go
+++ b/itest/lnd_remote_signer_test.go
@@ -4,8 +4,8 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/hdkeychain"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/btcutil/v2/hdkeychain"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/itest/lnd_res_handoff_test.go b/itest/lnd_res_handoff_test.go
index d7bf499..626a218 100644
--- a/itest/lnd_res_handoff_test.go
+++ b/itest/lnd_res_handoff_test.go
@@ -3,7 +3,7 @@ package itest
import (
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/stretchr/testify/require"
diff --git a/itest/lnd_revocation_test.go b/itest/lnd_revocation_test.go
index 0c7b29c..0cc7d6d 100644
--- a/itest/lnd_revocation_test.go
+++ b/itest/lnd_revocation_test.go
@@ -6,9 +6,9 @@ import (
"fmt"
"testing"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_route_blinding_test.go b/itest/lnd_route_blinding_test.go
index 2c69548..e113fce 100644
--- a/itest/lnd_route_blinding_test.go
+++ b/itest/lnd_route_blinding_test.go
@@ -9,7 +9,7 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_routing_test.go b/itest/lnd_routing_test.go
index b68f796..9d34940 100644
--- a/itest/lnd_routing_test.go
+++ b/itest/lnd_routing_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_rpc_middleware_interceptor_test.go b/itest/lnd_rpc_middleware_interceptor_test.go
index 3a82e5a..ab4c96d 100644
--- a/itest/lnd_rpc_middleware_interceptor_test.go
+++ b/itest/lnd_rpc_middleware_interceptor_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/node"
diff --git a/itest/lnd_signer_test.go b/itest/lnd_signer_test.go
index 8c408aa..9ef7dde 100644
--- a/itest/lnd_signer_test.go
+++ b/itest/lnd_signer_test.go
@@ -4,12 +4,12 @@ import (
"bytes"
"crypto/sha256"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
@@ -282,8 +282,8 @@ func assertSignOutputRaw(ht *lntest.HarnessTest,
keyDesc *signrpc.KeyDescriptor,
sigHash txscript.SigHashType) {
- pubKeyHash := btcutil.Hash160(targetPubKey.SerializeCompressed())
- targetAddr, err := btcutil.NewAddressWitnessPubKeyHash(
+ pubKeyHash := address.Hash160(targetPubKey.SerializeCompressed())
+ targetAddr, err := address.NewAddressWitnessPubKeyHash(
pubKeyHash, harnessNetParams,
)
require.NoError(ht, err)
@@ -310,7 +310,7 @@ func assertSignOutputRaw(ht *lntest.HarnessTest,
addrReq := &lnrpc.NewAddressRequest{Type: AddrTypeWitnessPubkeyHash}
p2wkhResp := alice.RPC.NewAddress(addrReq)
- p2wkhAdrr, err := btcutil.DecodeAddress(
+ p2wkhAdrr, err := address.DecodeAddress(
p2wkhResp.Address, harnessNetParams,
)
require.NoError(ht, err)
diff --git a/itest/lnd_single_hop_invoice_test.go b/itest/lnd_single_hop_invoice_test.go
index cc29438..7d75371 100644
--- a/itest/lnd_single_hop_invoice_test.go
+++ b/itest/lnd_single_hop_invoice_test.go
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/hex"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_sweep_test.go b/itest/lnd_sweep_test.go
index 2b9c32e..07bae5f 100644
--- a/itest/lnd_sweep_test.go
+++ b/itest/lnd_sweep_test.go
@@ -4,9 +4,9 @@ import (
"fmt"
"time"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/contractcourt"
"github.com/lightningnetwork/lnd/fn/v2"
"github.com/lightningnetwork/lnd/lncfg"
diff --git a/itest/lnd_switch_test.go b/itest/lnd_switch_test.go
index 82900c9..42e1511 100644
--- a/itest/lnd_switch_test.go
+++ b/itest/lnd_switch_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/node"
diff --git a/itest/lnd_taproot_test.go b/itest/lnd_taproot_test.go
index 9da9ccb..d26bbe7 100644
--- a/itest/lnd_taproot_test.go
+++ b/itest/lnd_taproot_test.go
@@ -6,15 +6,16 @@ import (
"encoding/hex"
"testing"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/blockchain"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
- "github.com/btcsuite/btcd/btcutil"
- "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/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/psbt/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnrpc"
@@ -1152,7 +1153,7 @@ func testTaprootImportTapscriptFullTree(ht *lntest.HarnessTest,
}
importResp := alice.RPC.ImportTapscript(req)
- calculatedAddr, err := btcutil.NewAddressTaproot(
+ calculatedAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1220,7 +1221,7 @@ func testTaprootImportTapscriptPartialReveal(ht *lntest.HarnessTest,
}
importResp := alice.RPC.ImportTapscript(req)
- calculatedAddr, err := btcutil.NewAddressTaproot(
+ calculatedAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1277,7 +1278,7 @@ func testTaprootImportTapscriptRootHashOnly(ht *lntest.HarnessTest,
}
importResp := alice.RPC.ImportTapscript(req)
- calculatedAddr, err := btcutil.NewAddressTaproot(
+ calculatedAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1334,7 +1335,7 @@ func testTaprootImportTapscriptFullKey(ht *lntest.HarnessTest,
}
importResp := alice.RPC.ImportTapscript(req)
- calculatedAddr, err := btcutil.NewAddressTaproot(
+ calculatedAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1392,7 +1393,7 @@ func testTaprootImportTapscriptFullKeyFundPsbt(ht *lntest.HarnessTest,
}
importResp := alice.RPC.ImportTapscript(req)
- calculatedAddr, err := btcutil.NewAddressTaproot(
+ calculatedAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1567,7 +1568,7 @@ func testScriptHashLock(t *testing.T, preimage []byte) txscript.TapLeaf {
builder := txscript.NewScriptBuilder()
builder.AddOp(txscript.OP_DUP)
builder.AddOp(txscript.OP_HASH160)
- builder.AddData(btcutil.Hash160(preimage))
+ builder.AddData(address.Hash160(preimage))
builder.AddOp(txscript.OP_EQUALVERIFY)
script1, err := builder.Script()
require.NoError(t, err)
@@ -1589,12 +1590,12 @@ func testScriptSchnorrSig(t *testing.T,
// newAddrWithScript returns a new address and its pkScript.
func newAddrWithScript(ht *lntest.HarnessTest, node *node.HarnessNode,
- addrType lnrpc.AddressType) (btcutil.Address, []byte) {
+ addrType lnrpc.AddressType) (address.Address, []byte) {
p2wkhResp := node.RPC.NewAddress(&lnrpc.NewAddressRequest{
Type: addrType,
})
- p2wkhAddr, err := btcutil.DecodeAddress(
+ p2wkhAddr, err := address.DecodeAddress(
p2wkhResp.Address, harnessNetParams,
)
require.NoError(ht, err)
@@ -1610,7 +1611,7 @@ func newAddrWithScript(ht *lntest.HarnessTest, node *node.HarnessNode,
func sendToTaprootOutput(ht *lntest.HarnessTest, hn *node.HarnessNode,
taprootKey *btcec.PublicKey) (wire.OutPoint, []byte) {
- tapScriptAddr, err := btcutil.NewAddressTaproot(
+ tapScriptAddr, err := address.NewAddressTaproot(
schnorr.SerializePubKey(taprootKey), harnessNetParams,
)
require.NoError(ht, err)
@@ -1749,7 +1750,7 @@ func confirmAddress(ht *lntest.HarnessTest, hn *node.HarnessNode,
// Before we confirm the transaction, let's register a confirmation
// listener for it, which we expect to fire after mining a block.
- parsedAddr, err := btcutil.DecodeAddress(addrString, harnessNetParams)
+ parsedAddr, err := address.DecodeAddress(addrString, harnessNetParams)
require.NoError(ht, err)
addrPkScript, err := txscript.PayToAddrScript(parsedAddr)
require.NoError(ht, err)
diff --git a/itest/lnd_test.go b/itest/lnd_test.go
index e6b25b6..0580bb1 100644
--- a/itest/lnd_test.go
+++ b/itest/lnd_test.go
@@ -11,7 +11,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/chaincfg"
+ "github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/integration/rpctest"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
diff --git a/itest/lnd_trackpayments_test.go b/itest/lnd_trackpayments_test.go
index dc8655a..d92a55d 100644
--- a/itest/lnd_trackpayments_test.go
+++ b/itest/lnd_trackpayments_test.go
@@ -4,7 +4,7 @@ import (
"encoding/hex"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_wallet.go b/itest/lnd_wallet.go
index 1c07b08..4b40abb 100644
--- a/itest/lnd_wallet.go
+++ b/itest/lnd_wallet.go
@@ -1,8 +1,8 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/node"
"github.com/lightningnetwork/lnd/lnwallet"
diff --git a/itest/lnd_wallet_import_test.go b/itest/lnd_wallet_import_test.go
index 39774ba..78602ff 100644
--- a/itest/lnd_wallet_import_test.go
+++ b/itest/lnd_wallet_import_test.go
@@ -6,12 +6,13 @@ import (
"testing"
"time"
+ "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/btcutil"
- "github.com/btcsuite/btcd/btcutil/hdkeychain"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
- "github.com/btcsuite/btcd/wire"
+ "github.com/btcsuite/btcd/btcutil/v2"
+ "github.com/btcsuite/btcd/btcutil/v2/hdkeychain"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
+ "github.com/btcsuite/btcd/wire/v2"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/davecgh/go-spew/spew"
"github.com/lightningnetwork/lnd/funding"
@@ -123,20 +124,20 @@ func newExternalAddr(ht *lntest.HarnessTest, funder, signer *node.HarnessNode,
func assertExternalAddrType(t *testing.T, addrStr string,
accountAddrType walletrpc.AddressType) {
- addr, err := btcutil.DecodeAddress(addrStr, harnessNetParams)
+ addr, err := address.DecodeAddress(addrStr, harnessNetParams)
require.NoError(t, err)
switch accountAddrType {
case walletrpc.AddressType_WITNESS_PUBKEY_HASH:
- require.IsType(t, addr, &btcutil.AddressWitnessPubKeyHash{})
+ require.IsType(t, addr, &address.AddressWitnessPubKeyHash{})
case walletrpc.AddressType_NESTED_WITNESS_PUBKEY_HASH,
walletrpc.AddressType_HYBRID_NESTED_WITNESS_PUBKEY_HASH:
- require.IsType(t, addr, &btcutil.AddressScriptHash{})
+ require.IsType(t, addr, &address.AddressScriptHash{})
case walletrpc.AddressType_TAPROOT_PUBKEY:
- require.IsType(t, addr, &btcutil.AddressTaproot{})
+ require.IsType(t, addr, &address.AddressTaproot{})
default:
t.Fatalf("unsupported account addr type %v", accountAddrType)
diff --git a/itest/lnd_watchtower_test.go b/itest/lnd_watchtower_test.go
index 29b45f8..303ded4 100644
--- a/itest/lnd_watchtower_test.go
+++ b/itest/lnd_watchtower_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
diff --git a/itest/lnd_wumbo_channels_test.go b/itest/lnd_wumbo_channels_test.go
index 8bf1810..74c1569 100644
--- a/itest/lnd_wumbo_channels_test.go
+++ b/itest/lnd_wumbo_channels_test.go
@@ -1,7 +1,7 @@
package itest
import (
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lnwallet"
diff --git a/itest/lnd_zero_conf_close_event_test.go b/itest/lnd_zero_conf_close_event_test.go
index 40c06d1..bfd6dc7 100644
--- a/itest/lnd_zero_conf_close_event_test.go
+++ b/itest/lnd_zero_conf_close_event_test.go
@@ -3,7 +3,7 @@ package itest
import (
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/rpc"
diff --git a/itest/lnd_zero_conf_test.go b/itest/lnd_zero_conf_test.go
index 84602ec..ba5edda 100644
--- a/itest/lnd_zero_conf_test.go
+++ b/itest/lnd_zero_conf_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/btcsuite/btcd/btcutil"
+ "github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/aliasmgr"
"github.com/lightningnetwork/lnd/chainreg"
"github.com/lightningnetwork/lnd/lnrpc"
diff --git a/keychain/btcwallet.go b/keychain/btcwallet.go
index cdacef5..41167f3 100644
--- a/keychain/btcwallet.go
+++ b/keychain/btcwallet.go
@@ -7,8 +7,8 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
- "github.com/btcsuite/btcd/txscript"
+ "github.com/btcsuite/btcd/chainhash/v2"
+ "github.com/btcsuite/btcd/txscript/v2"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wallet"
"github.com/btcsuite/btcwallet/walletdb"
diff --git a/keychain/interface_test.go b/keychain/interface_test.go
index c88384b..5d66b97 100644
--- a/keychain/interface_test.go
+++ b/keychain/interface_test.go
@@ -7,8 +7,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcec/v2"
- "github.com/btcsuite/btcd/chaincfg"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chaincfg/v2"
+ "github.com/btcsuite/btcd/chainhash/v2"
"github.com/btcsuite/btcwallet/snacl"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/btcsuite/btcwallet/wallet"
diff --git a/keychain/signer.go b/keychain/signer.go
index fa2b707..f0fe98f 100644
--- a/keychain/signer.go
+++ b/keychain/signer.go
@@ -3,7 +3,7 @@ package keychain
import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
- "github.com/btcsuite/btcd/chaincfg/chainhash"
+ "github.com/btcsuite/btcd/chainhash/v2"
)
func NewPubKeyMessageSigner(pubKey *btcec.PublicKey, keyLoc KeyLocator,
diff --git a/kvdb/go.mod b/kvdb/go.mod
index 22ab254..d932a0d 100644
--- a/kvdb/go.mod
+++ b/kvdb/go.mod
@@ -2,7 +2,7 @@ module github.com/lightningnetwork/lnd/kvdb
require (
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084
- github.com/btcsuite/btcwallet/walletdb v1.5.1
+ github.com/btcsuite/btcwallet/walletdb v1.6.0
github.com/davecgh/go-spew v1.1.1
github.com/fergusstrange/embedded-postgres v1.25.0
github.com/google/btree v1.0.1
@@ -25,9 +25,11 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
- github.com/btcsuite/btcd v0.24.2 // indirect
- github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
- github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
+ github.com/btcsuite/btcd v0.26.0 // indirect
+ github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 // indirect
+ github.com/btcsuite/btcd/chainhash/v2 v2.0.0 // indirect
+ github.com/btcsuite/btcd/wire/v2 v2.0.0 // indirect
+ github.com/btcsuite/btclog v1.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
@@ -48,7 +50,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
- github.com/gorilla/websocket v1.5.0 // indirect
+ github.com/gorilla/websocket v1.5.3 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
@@ -103,13 +105,13 @@ require (
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
- go.opentelemetry.io/otel v1.40.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
+ go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
- go.opentelemetry.io/otel/metric v1.40.0 // indirect
- go.opentelemetry.io/otel/sdk v1.40.0 // indirect
- go.opentelemetry.io/otel/trace v1.40.0 // indirect
+ go.opentelemetry.io/otel/metric v1.44.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.44.0 // indirect
+ go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
@@ -120,7 +122,7 @@ require (
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/sync v0.19.0 // indirect
- golang.org/x/sys v0.40.0 // indirect
+ golang.org/x/sys v0.45.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.39.0 // indirect
diff --git a/kvdb/go.sum b/kvdb/go.sum
index 2803bf8..d977fce 100644
--- a/kvdb/go.sum
+++ b/kvdb/go.sum
@@ -22,21 +22,25 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7alexyj/lHlOtr2PJK7L/+HDJZpcGDn/pAU98r7DY08=
-github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
-github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
+github.com/btcsuite/btcd v0.26.0 h1:yntnSshlG3+H7dTwIOR4LTFXDPojVBsFORBNN5y5c/c=
+github.com/btcsuite/btcd v0.26.0/go.mod h1:7ft7+a/MoJHFouFopCb1zyiR9IWPlrcPVn6K/lJ1dcA=
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok=
+github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
+github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
+github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
+github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c h1:4HxD1lBUGUddhzgaNgrCPsFWd7cGYNpeFUgd9ZIgyM0=
-github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
+github.com/btcsuite/btclog v1.0.0 h1:sEkpKJMmfGiyZjADwEIgB1NSwMyfdD1FB8v6+w1T0Ns=
+github.com/btcsuite/btclog v1.0.0/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084 h1:y3bvkt8ki0KX35eUEU8XShRHusz1S+55QwXUTmxn888=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI=
-github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
+github.com/btcsuite/btcwallet/walletdb v1.6.0 h1:Yund5XbdqFxNW7+R2Sxs02bMC5fMrmORj4GN8MV55no=
+github.com/btcsuite/btcwallet/walletdb v1.6.0/go.mod h1:q9xif0Csp52GVb3l252BbHCuyiCnuEbrPWu/HAsvaYc=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
@@ -147,8 +151,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
@@ -325,22 +329,22 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
-go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=
+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0=
-go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
-go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
-go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
-go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
-go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
-go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
-go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
-go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -423,8 +427,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWhy this scored 32/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.