Skip to content

Commit 87405ce

Browse files
committed
mod+docs+server: bump to latest lnd version
1 parent b4feb3e commit 87405ce

File tree

6 files changed

+32
-27
lines changed

6 files changed

+32
-27
lines changed

docs/examples/basic-price-oracle/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ require (
9898
github.com/lightninglabs/neutrino v0.16.1 // indirect
9999
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
100100
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
101-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91 // indirect
101+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250422202345-1aad61c2b6f0 // indirect
102102
github.com/lightningnetwork/lnd/cert v1.2.2 // indirect
103103
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
104104
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
105105
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
106-
github.com/lightningnetwork/lnd/kvdb v1.4.15 // indirect
106+
github.com/lightningnetwork/lnd/kvdb v1.4.16 // indirect
107107
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
108108
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
109109
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect

docs/examples/basic-price-oracle/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display h1:Y2WiPkBS
448448
github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
449449
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
450450
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
451-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91 h1:LzLA7+J/fP1VrK4BcyAt86cg4/bkfY38gYRBJoy109o=
452-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91/go.mod h1:v4Y0gLAIqqxY83J+4HilQHIiScIy2ok2GSuBFtoc1zc=
451+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250422202345-1aad61c2b6f0 h1:tdDIzAvasOOoseR6we4DKXBuHXrQl7a21ta0dEcywXw=
452+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250422202345-1aad61c2b6f0/go.mod h1:nCkZ6G6twxDKn31117M0BNfN5JSAmJVAHNTwYrn31BQ=
453453
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
454454
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
455455
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
@@ -458,8 +458,8 @@ github.com/lightningnetwork/lnd/fn/v2 v2.0.8 h1:r2SLz7gZYQPVc3IZhU82M66guz3Zk2oY
458458
github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
459459
github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
460460
github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
461-
github.com/lightningnetwork/lnd/kvdb v1.4.15 h1:3eN6uGcubvGB5itPp1D0D4uEEkIMYht3w0LDnqLzAWI=
462-
github.com/lightningnetwork/lnd/kvdb v1.4.15/go.mod h1:HW+bvwkxNaopkz3oIgBV6NEnV4jCEZCACFUcNg4xSjM=
461+
github.com/lightningnetwork/lnd/kvdb v1.4.16 h1:9BZgWdDfjmHRHLS97cz39bVuBAqMc4/p3HX1xtUdbDI=
462+
github.com/lightningnetwork/lnd/kvdb v1.4.16/go.mod h1:HW+bvwkxNaopkz3oIgBV6NEnV4jCEZCACFUcNg4xSjM=
463463
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
464464
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
465465
github.com/lightningnetwork/lnd/sqldb v1.0.9 h1:7OHi+Hui823mB/U9NzCdlZTAGSVdDCbjp33+6d/Q+G0=

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ require (
2727
github.com/lib/pq v1.10.9
2828
github.com/lightninglabs/aperture v0.3.8-beta
2929
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
30-
github.com/lightninglabs/lndclient v0.19.0-3
30+
github.com/lightninglabs/lndclient v0.19.0-4
3131
github.com/lightninglabs/neutrino/cache v1.1.2
32-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91
32+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250423092132-a35ace7371af
3333
github.com/lightningnetwork/lnd/cert v1.2.2
3434
github.com/lightningnetwork/lnd/clock v1.1.1
3535
github.com/lightningnetwork/lnd/fn/v2 v2.0.8
@@ -127,7 +127,7 @@ require (
127127
github.com/lightninglabs/neutrino v0.16.1 // indirect
128128
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
129129
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
130-
github.com/lightningnetwork/lnd/kvdb v1.4.15 // indirect
130+
github.com/lightningnetwork/lnd/kvdb v1.4.16 // indirect
131131
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
132132
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
133133
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ github.com/lightninglabs/lightning-node-connect v0.2.5-alpha h1:ZRVChwczFXK0CEbx
492492
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha/go.mod h1:A9Pof9fETkH+F67BnOmrBDThPKstqp73wlImWOZvTXQ=
493493
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
494494
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
495-
github.com/lightninglabs/lndclient v0.19.0-3 h1:PGGlDaz8x1dXGowDfAWhbuDqXTKNaJyb7SOTrRdG1es=
496-
github.com/lightninglabs/lndclient v0.19.0-3/go.mod h1:5YMrFx00NvcmUHGZRxT4Qw/gOfR5x50/ReJmJ6w0yVk=
495+
github.com/lightninglabs/lndclient v0.19.0-4 h1:U+koisg716/i51kf5ENI5+9a1joXcPXeJYl3q0s4/co=
496+
github.com/lightninglabs/lndclient v0.19.0-4/go.mod h1:LP3FM3JGBdvOX8Lum9x1r7q54oiftoqaq4EYhtpp/fk=
497497
github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs=
498498
github.com/lightninglabs/neutrino v0.16.1/go.mod h1:L+5UAccpUdyM7yDgmQySgixf7xmwBgJtOfs/IP26jCs=
499499
github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3shmlu5hIQ798g=
@@ -502,8 +502,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display h1:Y2WiPkBS
502502
github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
503503
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
504504
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
505-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91 h1:LzLA7+J/fP1VrK4BcyAt86cg4/bkfY38gYRBJoy109o=
506-
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250417120008-a304be6bad91/go.mod h1:v4Y0gLAIqqxY83J+4HilQHIiScIy2ok2GSuBFtoc1zc=
505+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250423092132-a35ace7371af h1:+t8N7kmI7YVu7Hzv8pPiMVCTjnSRi/qOxbAkXa5rn+0=
506+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250423092132-a35ace7371af/go.mod h1:nCkZ6G6twxDKn31117M0BNfN5JSAmJVAHNTwYrn31BQ=
507507
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
508508
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
509509
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
@@ -512,8 +512,8 @@ github.com/lightningnetwork/lnd/fn/v2 v2.0.8 h1:r2SLz7gZYQPVc3IZhU82M66guz3Zk2oY
512512
github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
513513
github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
514514
github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
515-
github.com/lightningnetwork/lnd/kvdb v1.4.15 h1:3eN6uGcubvGB5itPp1D0D4uEEkIMYht3w0LDnqLzAWI=
516-
github.com/lightningnetwork/lnd/kvdb v1.4.15/go.mod h1:HW+bvwkxNaopkz3oIgBV6NEnV4jCEZCACFUcNg4xSjM=
515+
github.com/lightningnetwork/lnd/kvdb v1.4.16 h1:9BZgWdDfjmHRHLS97cz39bVuBAqMc4/p3HX1xtUdbDI=
516+
github.com/lightningnetwork/lnd/kvdb v1.4.16/go.mod h1:HW+bvwkxNaopkz3oIgBV6NEnV4jCEZCACFUcNg4xSjM=
517517
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
518518
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
519519
github.com/lightningnetwork/lnd/sqldb v1.0.9 h1:7OHi+Hui823mB/U9NzCdlZTAGSVdDCbjp33+6d/Q+G0=

server.go

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -997,16 +997,19 @@ func (s *Server) ChannelFinalized(pid funding.PendingChanID) error {
997997
//
998998
// NOTE: This method is part of the routing.TlvTrafficShaper interface.
999999
func (s *Server) ShouldHandleTraffic(cid lnwire.ShortChannelID,
1000-
fundingBlob lfn.Option[tlv.Blob]) (bool, error) {
1000+
fundingBlob, htlcBlob lfn.Option[tlv.Blob]) (bool, error) {
10011001

1002-
srvrLog.Debugf("HandleTraffic called (cid=%v, fundingBlob=%x)", cid,
1003-
fundingBlob.UnwrapOr(tlv.Blob{}))
1002+
srvrLog.Debugf("HandleTraffic called (cid=%v, fundingBlob=%v, "+
1003+
"htlcBlob=%v)", cid, fundingBlob.UnwrapOr(tlv.Blob{}),
1004+
htlcBlob.UnwrapOr(tlv.Blob{}))
10041005

10051006
if err := s.waitForReady(); err != nil {
10061007
return false, err
10071008
}
10081009

1009-
return s.cfg.AuxTrafficShaper.ShouldHandleTraffic(cid, fundingBlob)
1010+
return s.cfg.AuxTrafficShaper.ShouldHandleTraffic(
1011+
cid, fundingBlob, htlcBlob,
1012+
)
10101013
}
10111014

10121015
// PaymentBandwidth returns the available bandwidth for a custom channel decided
@@ -1016,20 +1019,22 @@ func (s *Server) ShouldHandleTraffic(cid lnwire.ShortChannelID,
10161019
// called first.
10171020
//
10181021
// NOTE: This method is part of the routing.TlvTrafficShaper interface.
1019-
func (s *Server) PaymentBandwidth(htlcBlob, commitmentBlob lfn.Option[tlv.Blob],
1020-
linkBandwidth, htlcAmt lnwire.MilliSatoshi,
1022+
func (s *Server) PaymentBandwidth(fundingBlob, htlcBlob,
1023+
commitmentBlob lfn.Option[tlv.Blob], linkBandwidth,
1024+
htlcAmt lnwire.MilliSatoshi,
10211025
htlcView lnwallet.AuxHtlcView) (lnwire.MilliSatoshi, error) {
10221026

1023-
srvrLog.Debugf("PaymentBandwidth called, htlcBlob=%v, "+
1024-
"commitmentBlob=%v", spew.Sdump(htlcBlob),
1025-
spew.Sdump(commitmentBlob))
1027+
srvrLog.Debugf("PaymentBandwidth called, fundingBlob=%v, htlcBlob=%v, "+
1028+
"commitmentBlob=%v", spew.Sdump(fundingBlob),
1029+
spew.Sdump(htlcBlob), spew.Sdump(commitmentBlob))
10261030

10271031
if err := s.waitForReady(); err != nil {
10281032
return 0, err
10291033
}
10301034

10311035
return s.cfg.AuxTrafficShaper.PaymentBandwidth(
1032-
htlcBlob, commitmentBlob, linkBandwidth, htlcAmt, htlcView,
1036+
fundingBlob, htlcBlob, commitmentBlob, linkBandwidth, htlcAmt,
1037+
htlcView,
10331038
)
10341039
}
10351040

tapchannel/aux_traffic_shaper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s *AuxTrafficShaper) Stop() error {
8282
// can be skipped and the bandwidth returned by PaymentBandwidth should be used
8383
// instead.
8484
func (s *AuxTrafficShaper) ShouldHandleTraffic(_ lnwire.ShortChannelID,
85-
fundingBlob lfn.Option[tlv.Blob]) (bool, error) {
85+
fundingBlob, _ lfn.Option[tlv.Blob]) (bool, error) {
8686

8787
// If there is no auxiliary blob in the channel, it's not a custom
8888
// channel, and we don't need to handle it.
@@ -110,7 +110,7 @@ func (s *AuxTrafficShaper) ShouldHandleTraffic(_ lnwire.ShortChannelID,
110110
// is no bandwidth available. To find out if a channel is a custom channel that
111111
// should be handled by the traffic shaper, the HandleTraffic method should be
112112
// called first.
113-
func (s *AuxTrafficShaper) PaymentBandwidth(htlcBlob,
113+
func (s *AuxTrafficShaper) PaymentBandwidth(_, htlcBlob,
114114
commitmentBlob lfn.Option[tlv.Blob], linkBandwidth,
115115
htlcAmt lnwire.MilliSatoshi,
116116
htlcView lnwallet.AuxHtlcView) (lnwire.MilliSatoshi, error) {

0 commit comments

Comments
 (0)