Skip to content

Commit 97baec2

Browse files
authored
Merge pull request #1644 from lightninglabs/lnd-19-2
mod+server: update to lnd v0.19.2-beta.rc2, taprpc to v1.0.9
2 parents a62b68d + 6aa49bf commit 97baec2

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ require (
2929
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3
3030
github.com/lightninglabs/lndclient v0.19.0-9
3131
github.com/lightninglabs/neutrino/cache v1.1.2
32-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8
33-
github.com/lightningnetwork/lnd v0.19.1-beta.rc1.0.20250623232057-b48e2763a798
32+
github.com/lightninglabs/taproot-assets/taprpc v1.0.9
33+
github.com/lightningnetwork/lnd v0.19.2-beta.rc2
3434
github.com/lightningnetwork/lnd/cert v1.2.2
3535
github.com/lightningnetwork/lnd/clock v1.1.1
3636
github.com/lightningnetwork/lnd/fn/v2 v2.0.8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,8 +1149,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9
11491149
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
11501150
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11511151
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1152-
github.com/lightningnetwork/lnd v0.19.1-beta.rc1.0.20250623232057-b48e2763a798 h1:nSnOCqilf+ynsJlTOVOoNXEhjjxTrvcv6jxMyUlZJJE=
1153-
github.com/lightningnetwork/lnd v0.19.1-beta.rc1.0.20250623232057-b48e2763a798/go.mod h1:iHZ/FHFK00BqV6qgDkZZfqWE3LGtgE0U5KdO5WrM+eQ=
1152+
github.com/lightningnetwork/lnd v0.19.2-beta.rc2 h1:vPIMjQr8SWZJHn/j3QSFct4AbCVa0WA7k0j0lHqFDAA=
1153+
github.com/lightningnetwork/lnd v0.19.2-beta.rc2/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
11541154
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11551155
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11561156
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

server.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
"github.com/lightningnetwork/lnd/lnwire"
4141
"github.com/lightningnetwork/lnd/macaroons"
4242
"github.com/lightningnetwork/lnd/msgmux"
43+
"github.com/lightningnetwork/lnd/routing/route"
4344
"github.com/lightningnetwork/lnd/sweep"
4445
"github.com/lightningnetwork/lnd/tlv"
4546
"google.golang.org/grpc"
@@ -1045,13 +1046,14 @@ func (s *Server) ShouldHandleTraffic(cid lnwire.ShortChannelID,
10451046
// NOTE: This method is part of the routing.TlvTrafficShaper interface.
10461047
func (s *Server) PaymentBandwidth(fundingBlob, htlcBlob,
10471048
commitmentBlob lfn.Option[tlv.Blob], linkBandwidth,
1048-
htlcAmt lnwire.MilliSatoshi,
1049-
htlcView lnwallet.AuxHtlcView) (lnwire.MilliSatoshi, error) {
1049+
htlcAmt lnwire.MilliSatoshi, htlcView lnwallet.AuxHtlcView,
1050+
peer route.Vertex) (lnwire.MilliSatoshi, error) {
10501051

10511052
srvrLog.Debugf("PaymentBandwidth called, fundingBlob=%v, htlcBlob=%v, "+
1052-
"commitmentBlob=%v", lnutils.SpewLogClosure(fundingBlob),
1053+
"commitmentBlob=%v, peer=%x",
1054+
lnutils.SpewLogClosure(fundingBlob),
10531055
lnutils.SpewLogClosure(htlcBlob),
1054-
lnutils.SpewLogClosure(commitmentBlob))
1056+
lnutils.SpewLogClosure(commitmentBlob), peer[:])
10551057

10561058
if err := s.waitForReady(); err != nil {
10571059
return 0, err
@@ -1069,12 +1071,12 @@ func (s *Server) PaymentBandwidth(fundingBlob, htlcBlob,
10691071
//
10701072
// NOTE: This method is part of the routing.TlvTrafficShaper interface.
10711073
func (s *Server) ProduceHtlcExtraData(totalAmount lnwire.MilliSatoshi,
1072-
htlcCustomRecords lnwire.CustomRecords) (lnwire.MilliSatoshi,
1073-
lnwire.CustomRecords, error) {
1074+
htlcCustomRecords lnwire.CustomRecords,
1075+
peer route.Vertex) (lnwire.MilliSatoshi, lnwire.CustomRecords, error) {
10741076

10751077
srvrLog.Debugf("ProduceHtlcExtraData called, totalAmount=%d, "+
1076-
"htlcBlob=%v", totalAmount,
1077-
lnutils.SpewLogClosure(htlcCustomRecords))
1078+
"htlcBlob=%v, peer=%x", totalAmount,
1079+
lnutils.SpewLogClosure(htlcCustomRecords), peer[:])
10781080

10791081
if err := s.waitForReady(); err != nil {
10801082
return 0, nil, err

0 commit comments

Comments
 (0)