Skip to content

Commit 6b71582

Browse files
bhandrasbhandras
authored
Merge pull request #985 from bhandras/bump-lnd-tapd
build: bump tapd to v0.6.1 and lnd to v0.19.2-beta
2 parents 26b38cf + 31f996c commit 6b71582

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/btcsuite/btcd/btcutil v1.1.5
77
github.com/btcsuite/btcd/btcutil/psbt v1.1.10
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
9-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
10-
github.com/btcsuite/btcwallet v0.16.13
9+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084
10+
github.com/btcsuite/btcwallet v0.16.14
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.6
1212
github.com/davecgh/go-spew v1.1.1
1313
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
@@ -19,12 +19,12 @@ require (
1919
github.com/jessevdk/go-flags v1.4.0
2020
github.com/lib/pq v1.10.9
2121
github.com/lightninglabs/aperture v0.3.13-beta
22-
github.com/lightninglabs/lndclient v0.19.0-7
22+
github.com/lightninglabs/lndclient v0.19.0-12
2323
github.com/lightninglabs/loop/looprpc v1.0.7
2424
github.com/lightninglabs/loop/swapserverrpc v1.0.14
25-
github.com/lightninglabs/taproot-assets v0.6.0-rc2.0.20250526132410-324bce0a1a7b
26-
github.com/lightninglabs/taproot-assets/taprpc v1.0.5
27-
github.com/lightningnetwork/lnd v0.19.0-beta
25+
github.com/lightninglabs/taproot-assets v0.6.1
26+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250617163017-cf2a5e5bb47c
27+
github.com/lightningnetwork/lnd v0.19.2-beta
2828
github.com/lightningnetwork/lnd/cert v1.2.2
2929
github.com/lightningnetwork/lnd/clock v1.1.1
3030
github.com/lightningnetwork/lnd/queue v1.1.1
@@ -79,7 +79,6 @@ require (
7979
github.com/docker/go-units v0.5.0 // indirect
8080
github.com/dustin/go-humanize v1.0.1 // indirect
8181
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
82-
github.com/go-errors/errors v1.0.1 // indirect
8382
github.com/go-logr/logr v1.4.2 // indirect
8483
github.com/go-logr/stdr v1.2.2 // indirect
8584
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect

‎go.sum

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,11 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
666666
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
667667
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c h1:4HxD1lBUGUddhzgaNgrCPsFWd7cGYNpeFUgd9ZIgyM0=
668668
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
669-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318 h1:oCjIcinPt7XQ644MP/22JcjYEC84qRc3bRBH0d7Hhd4=
670-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
669+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084 h1:y3bvkt8ki0KX35eUEU8XShRHusz1S+55QwXUTmxn888=
670+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
671671
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
672-
github.com/btcsuite/btcwallet v0.16.13 h1:JGu+wrihQ0I00ODb3w92JtBPbrHxZhbcvU01O+e+lKw=
673-
github.com/btcsuite/btcwallet v0.16.13/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
672+
github.com/btcsuite/btcwallet v0.16.14 h1:CofysgmI1ednkLsXontAdBoXJkbiim7unXnFKhLLjnE=
673+
github.com/btcsuite/btcwallet v0.16.14/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
674674
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
675675
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
676676
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
@@ -804,8 +804,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
804804
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
805805
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
806806
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
807-
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
808-
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
809807
github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
810808
github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
811809
github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -1108,8 +1106,8 @@ github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI
11081106
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
11091107
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNMSzZ/+RzWsjgAgQSr/REDxTiHmTczZxlXA=
11101108
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
1111-
github.com/lightninglabs/lndclient v0.19.0-7 h1:8+wGQnO8KSUq9elzGLscBUGchID+bWvrpX2qCo+tU48=
1112-
github.com/lightninglabs/lndclient v0.19.0-7/go.mod h1:35d50tEMFxlJlKTZGYA6EdOllPsbxS4FUmEVbETUx+Q=
1109+
github.com/lightninglabs/lndclient v0.19.0-12 h1:aSIKfnvnHKiyFWppUGHJG5fn8VoF5WG5Lx958ksLmqs=
1110+
github.com/lightninglabs/lndclient v0.19.0-12/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
11131111
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2 h1:eFjp1dIB2BhhQp/THKrjLdlYuPugO9UU4kDqu91OX/Q=
11141112
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=
11151113
github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs=
@@ -1118,14 +1116,14 @@ github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3
11181116
github.com/lightninglabs/neutrino/cache v1.1.2/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo=
11191117
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11201118
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1121-
github.com/lightninglabs/taproot-assets v0.6.0-rc2.0.20250526132410-324bce0a1a7b h1:efkHuTt81lB2kYrMBVdOMplAPv3FsI5QtXMIXwOn+XM=
1122-
github.com/lightninglabs/taproot-assets v0.6.0-rc2.0.20250526132410-324bce0a1a7b/go.mod h1:36UvvlHbnj/ch8AhaEQAcDkMyUadi/+AHVPOxKQ6kVI=
1123-
github.com/lightninglabs/taproot-assets/taprpc v1.0.5 h1:/T8A5f2O6uud1gjBX4ZuxSxagcq7ALwNNGggFTsmzaI=
1124-
github.com/lightninglabs/taproot-assets/taprpc v1.0.5/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
1119+
github.com/lightninglabs/taproot-assets v0.6.1 h1:98XCk7nvAridyE67uct0NDVpyY1evpIdvPQpeNElskM=
1120+
github.com/lightninglabs/taproot-assets v0.6.1/go.mod h1:rF+GwuUVuDVUejAHsUCml4Nru9xnl7A4YZQfR4qLMzY=
1121+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250617163017-cf2a5e5bb47c h1:Fzob+kYq68uPuaEd78rVa/Jvjn/Rp4rLcG7xRTOxK7Y=
1122+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250617163017-cf2a5e5bb47c/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
11251123
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11261124
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1127-
github.com/lightningnetwork/lnd v0.19.0-beta h1:/8i2UdARiEpI2iAmPoSDcwZSSEuWqXyfsMxz/mLGbdw=
1128-
github.com/lightningnetwork/lnd v0.19.0-beta/go.mod h1:hu6zo1zcznx7nViiFlJY8qGDwwGw5LNLdGJ7ICz5Ysc=
1125+
github.com/lightningnetwork/lnd v0.19.2-beta h1:3SKVrKYFY4IJLlrMf7cDzZcBeT+MxjI9Xy6YpY+EEX4=
1126+
github.com/lightningnetwork/lnd v0.19.2-beta/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
11291127
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11301128
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11311129
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

‎instantout/reservation/actions_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (m *MockChainNotifier) RawClientWithMacAuth(
172172

173173
func (m *MockChainNotifier) RegisterConfirmationsNtfn(ctx context.Context,
174174
txid *chainhash.Hash, pkScript []byte, numConfs, heightHint int32,
175-
options ...lndclient.NotifierOption) (chan *chainntnfs.TxConfirmation,
175+
_ ...lndclient.NotifierOption) (chan *chainntnfs.TxConfirmation,
176176
chan error, error) {
177177

178178
args := m.Called(ctx, txid, pkScript, numConfs, heightHint)
@@ -187,7 +187,8 @@ func (m *MockChainNotifier) RegisterBlockEpochNtfn(ctx context.Context) (
187187
}
188188

189189
func (m *MockChainNotifier) RegisterSpendNtfn(ctx context.Context,
190-
outpoint *wire.OutPoint, pkScript []byte, heightHint int32) (
190+
outpoint *wire.OutPoint, pkScript []byte, heightHint int32,
191+
_ ...lndclient.NotifierOption) (
191192
chan *chainntnfs.SpendDetail, chan error, error) {
192193

193194
args := m.Called(ctx, pkScript, heightHint)

‎staticaddr/deposit/manager_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ func (m *MockChainNotifier) RegisterBlockEpochNtfn(ctx context.Context) (
199199
}
200200

201201
func (m *MockChainNotifier) RegisterSpendNtfn(ctx context.Context,
202-
outpoint *wire.OutPoint, pkScript []byte, heightHint int32) (
203-
chan *chainntnfs.SpendDetail, chan error, error) {
202+
outpoint *wire.OutPoint, pkScript []byte, heightHint int32,
203+
_ ...lndclient.NotifierOption) (chan *chainntnfs.SpendDetail,
204+
chan error, error) {
204205

205206
args := m.Called(ctx, pkScript, heightHint)
206207
return args.Get(0).(chan *chainntnfs.SpendDetail),

‎test/chainnotifier_mock.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ type ConfRegistration struct {
5151
}
5252

5353
func (c *mockChainNotifier) RegisterSpendNtfn(ctx context.Context,
54-
outpoint *wire.OutPoint, pkScript []byte, heightHint int32) (
55-
chan *chainntnfs.SpendDetail, chan error, error) {
54+
outpoint *wire.OutPoint, pkScript []byte, heightHint int32,
55+
_ ...lndclient.NotifierOption) (chan *chainntnfs.SpendDetail,
56+
chan error, error) {
5657

5758
spendChan0 := make(chan *chainntnfs.SpendDetail)
5859
spendErrChan := make(chan error, 1)

0 commit comments

Comments
 (0)