Skip to content

Commit 12371de

Browse files
guggeroguggero
committed
multi: bump lnd to latest master version
1 parent b653b29 commit 12371de

File tree

7 files changed

+105
-19
lines changed

7 files changed

+105
-19
lines changed

‎go.mod‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
99
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
10-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd
10+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
12-
github.com/lightningnetwork/lnd v0.18.3-beta
12+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240919095711-611852fd34b1
1313
github.com/lightningnetwork/lnd/kvdb v1.4.10
1414
github.com/stretchr/testify v1.9.0
1515
google.golang.org/grpc v1.59.0
@@ -79,7 +79,7 @@ require (
7979
github.com/jackc/pgx/v5 v5.3.1 // indirect
8080
github.com/jessevdk/go-flags v1.4.0 // indirect
8181
github.com/jonboulle/clockwork v0.2.2 // indirect
82-
github.com/jrick/logrotate v1.0.0 // indirect
82+
github.com/jrick/logrotate v1.1.2 // indirect
8383
github.com/json-iterator/go v1.1.11 // indirect
8484
github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a // indirect
8585
github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a // indirect
@@ -90,18 +90,19 @@ require (
9090
github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0 // indirect
9191
github.com/juju/version/v2 v2.0.0-20220204124744-fc9915e3d935 // indirect
9292
github.com/kkdai/bstream v1.0.0 // indirect
93+
github.com/klauspost/compress v1.17.9 // indirect
9394
github.com/lib/pq v1.10.9 // indirect
9495
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
9596
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
9697
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
9798
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
9899
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
99-
github.com/lightningnetwork/lnd/fn v1.2.0 // indirect
100+
github.com/lightningnetwork/lnd/fn v1.2.1 // indirect
100101
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
101102
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
102103
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
103104
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
104-
github.com/lightningnetwork/lnd/tlv v1.2.3 // indirect
105+
github.com/lightningnetwork/lnd/tlv v1.2.6 // indirect
105106
github.com/lightningnetwork/lnd/tor v1.1.2 // indirect
106107
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
107108
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -186,6 +187,6 @@ require (
186187
// allows us to specify that as an option.
187188
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
188189

189-
go 1.21.4
190+
go 1.22.6
190191

191-
toolchain go1.22.2
192+
toolchain go1.22.7

‎go.sum‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
8383
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
8484
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
8585
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
86-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd h1:QDb8foTCRoXrfoZVEzSYgSde16MJh4gCtCin8OCS0kI=
87-
github.com/btcsuite/btcwallet v0.16.10-0.20240718224643-db3a4a2543bd/go.mod h1:X2xDre+j1QphTRo54y2TikUzeSvreL1t1aMXrD8Kc5A=
86+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2 h1:qa4Avm7p97JroZZyMJADbEb9u853pjleJYSeitENvLc=
87+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2/go.mod h1:X2xDre+j1QphTRo54y2TikUzeSvreL1t1aMXrD8Kc5A=
8888
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 h1:poyHFf7+5+RdxNp5r2T6IBRD7RyraUsYARYbp/7t4D8=
8989
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4/go.mod h1:GETGDQuyq+VFfH1S/+/7slLM/9aNa4l7P4ejX6dJfb0=
9090
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 h1:UZo7YRzdHbwhK7Rhv3PO9bXgTxiOH45edK5qdsdiatk=
@@ -368,8 +368,9 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS
368368
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
369369
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
370370
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
371-
github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI=
372371
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
372+
github.com/jrick/logrotate v1.1.2 h1:6ePk462NCX7TfKtNp5JJ7MbA2YIslkpfgP03TlTYMN0=
373+
github.com/jrick/logrotate v1.1.2/go.mod h1:f9tdWggSVK3iqavGpyvegq5IhNois7KXmasU6/N96OQ=
373374
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
374375
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
375376
github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
@@ -402,6 +403,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
402403
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
403404
github.com/kkdai/bstream v1.0.0 h1:Se5gHwgp2VT2uHfDrkbbgbgEvV9cimLELwrPJctSjg8=
404405
github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA=
406+
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
407+
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
405408
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
406409
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
407410
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -431,12 +434,12 @@ github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wl
431434
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
432435
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
433436
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
434-
github.com/lightningnetwork/lnd v0.18.3-beta h1:I1Mcz79HGpVGPz0U2jSdxzzqzIi2cwUF0DXtzYJS7C8=
435-
github.com/lightningnetwork/lnd v0.18.3-beta/go.mod h1:Xamph8AYM3iWyyn9w/tx+cLG6Tx1SSnSSPRFn71zuyQ=
437+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240919095711-611852fd34b1 h1:MPShouzqsQHRwgvzcfJnTl5qTi4d9rR0jrnglUemvoQ=
438+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240919095711-611852fd34b1/go.mod h1:Y4sP4cQS+V8IpDn6hD6zEyX3dkIwUqLkCPtHfXNaVY0=
436439
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
437440
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
438-
github.com/lightningnetwork/lnd/fn v1.2.0 h1:YTb2m8NN5ZiJAskHeBZAmR1AiPY8SXziIYPAX1VI/ZM=
439-
github.com/lightningnetwork/lnd/fn v1.2.0/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
441+
github.com/lightningnetwork/lnd/fn v1.2.1 h1:pPsVGrwi9QBwdLJzaEGK33wmiVKOxs/zc8H7+MamFf0=
442+
github.com/lightningnetwork/lnd/fn v1.2.1/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
440443
github.com/lightningnetwork/lnd/healthcheck v1.2.5 h1:aTJy5xeBpcWgRtW/PGBDe+LMQEmNm/HQewlQx2jt7OA=
441444
github.com/lightningnetwork/lnd/healthcheck v1.2.5/go.mod h1:G7Tst2tVvWo7cx6mSBEToQC5L1XOGxzZTPB29g9Rv2I=
442445
github.com/lightningnetwork/lnd/kvdb v1.4.10 h1:vK89IVv1oVH9ubQWU+EmoCQFeVRaC8kfmOrqHbY5zoY=
@@ -447,8 +450,8 @@ github.com/lightningnetwork/lnd/sqldb v1.0.4 h1:9cMwPxcrLQG8UmyZO4q8SpR7NmxSwBMb
447450
github.com/lightningnetwork/lnd/sqldb v1.0.4/go.mod h1:4cQOkdymlZ1znnjuRNvMoatQGJkRneTj2CoPSPaQhWo=
448451
github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
449452
github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
450-
github.com/lightningnetwork/lnd/tlv v1.2.3 h1:If5ibokA/UoCBGuCKaY6Vn2SJU0l9uAbehCnhTZjEP8=
451-
github.com/lightningnetwork/lnd/tlv v1.2.3/go.mod h1:zDkmqxOczP6LaLTvSFDQ1SJUfHcQRCMKFj93dn3eMB8=
453+
github.com/lightningnetwork/lnd/tlv v1.2.6 h1:icvQG2yDr6k3ZuZzfRdG3EJp6pHurcuh3R6dg0gv/Mw=
454+
github.com/lightningnetwork/lnd/tlv v1.2.6/go.mod h1:/CmY4VbItpOldksocmGT4lxiJqRP9oLxwSZOda2kzNQ=
452455
github.com/lightningnetwork/lnd/tor v1.1.2 h1:3zv9z/EivNFaMF89v3ciBjCS7kvCj4ZFG7XvD2Qq0/k=
453456
github.com/lightningnetwork/lnd/tor v1.1.2/go.mod h1:j7T9uJ2NLMaHwE7GiBGnpYLn4f7NRoTM6qj+ul6/ycA=
454457
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=

‎lightning_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ func newNode(lnNode *lnrpc.LightningNode) (*Node, error) {
882882
)
883883
}
884884

885-
for i := 0; i < len(lnNode.Addresses); i++ {
885+
for i := range lnNode.Addresses {
886886
node.Addresses[i] = lnNode.Addresses[i].Addr
887887
}
888888

‎macaroon_recipes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func MacaroonRecipe(c LightningClient, packages []string) ([]MacaroonPermission,
6969
// and what methods it declares.
7070
ifaceType := reflect.TypeOf(ifacePtr).Elem()
7171
serverName := strings.ReplaceAll(ifaceType.Name(), "Client", "")
72-
for i := 0; i < ifaceType.NumMethod(); i++ {
72+
for i := range ifaceType.NumMethod() {
7373
// The methods in lndclient might be called slightly
7474
// differently. Rename according to our rename mapping
7575
// table.

‎router_client.go‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,20 @@ type RouterClient interface {
7373
// (enabled, disabled, or auto).
7474
UpdateChanStatus(ctx context.Context,
7575
channel *wire.OutPoint, action routerrpc.ChanStatusAction) error
76+
77+
// XAddLocalChanAlias is an experimental method that allows the caller
78+
// to add a local channel alias to the router. This is only a locally
79+
// stored alias, and will not be communicated to the channel peer via
80+
// any message. Therefore, routing over such an alias will only work if
81+
// the peer also calls this same RPC on their end.
82+
XAddLocalChanAlias(ctx context.Context, alias,
83+
baseScid lnwire.ShortChannelID) error
84+
85+
// XDeleteLocalChanAlias is an experimental method that allows the
86+
// caller to remove a local channel alias in the router. The deletion
87+
// will not be communicated to the channel peer via any message.
88+
XDeleteLocalChanAlias(ctx context.Context, alias,
89+
baseScid lnwire.ShortChannelID) error
7690
}
7791

7892
// PaymentStatus describe the state of a payment.
@@ -1058,3 +1072,55 @@ func (r *routerClient) UpdateChanStatus(ctx context.Context,
10581072
)
10591073
return err
10601074
}
1075+
1076+
// XAddLocalChanAlias is an experimental method that allows the caller
1077+
// to add a local channel alias to the router. This is only a locally
1078+
// stored alias, and will not be communicated to the channel peer via
1079+
// any message. Therefore, routing over such an alias will only work if
1080+
// the peer also calls this same RPC on their end.
1081+
func (r *routerClient) XAddLocalChanAlias(ctx context.Context, alias,
1082+
baseScid lnwire.ShortChannelID) error {
1083+
1084+
rpcCtx, cancel := context.WithTimeout(ctx, r.timeout)
1085+
defer cancel()
1086+
1087+
_, err := r.client.XAddLocalChanAliases(
1088+
r.routerKitMac.WithMacaroonAuth(rpcCtx),
1089+
&routerrpc.AddAliasesRequest{
1090+
AliasMaps: []*lnrpc.AliasMap{
1091+
{
1092+
BaseScid: baseScid.ToUint64(),
1093+
Aliases: []uint64{
1094+
alias.ToUint64(),
1095+
},
1096+
},
1097+
},
1098+
},
1099+
)
1100+
return err
1101+
}
1102+
1103+
// XDeleteLocalChanAlias is an experimental method that allows the
1104+
// caller to remove a local channel alias in the router. The deletion
1105+
// will not be communicated to the channel peer via any message.
1106+
func (r *routerClient) XDeleteLocalChanAlias(ctx context.Context, alias,
1107+
baseScid lnwire.ShortChannelID) error {
1108+
1109+
rpcCtx, cancel := context.WithTimeout(ctx, r.timeout)
1110+
defer cancel()
1111+
1112+
_, err := r.client.XDeleteLocalChanAliases(
1113+
r.routerKitMac.WithMacaroonAuth(rpcCtx),
1114+
&routerrpc.DeleteAliasesRequest{
1115+
AliasMaps: []*lnrpc.AliasMap{
1116+
{
1117+
BaseScid: baseScid.ToUint64(),
1118+
Aliases: []uint64{
1119+
alias.ToUint64(),
1120+
},
1121+
},
1122+
},
1123+
},
1124+
)
1125+
return err
1126+
}

‎testdata/permissions.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,22 @@
880880
}
881881
]
882882
},
883+
"/routerrpc.Router/XAddLocalChanAlias": {
884+
"permissions": [
885+
{
886+
"entity": "offchain",
887+
"action": "write"
888+
}
889+
]
890+
},
891+
"/routerrpc.Router/XDeleteLocalChanAlias": {
892+
"permissions": [
893+
{
894+
"entity": "offchain",
895+
"action": "write"
896+
}
897+
]
898+
},
883899
"/signrpc.Signer/ComputeInputScript": {
884900
"permissions": [
885901
{

‎tools/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.3-bookworm
1+
FROM golang:1.22.6-bookworm
22

33
RUN apt-get update && apt-get install -y git
44
ENV GOCACHE=/tmp/build/.cache

0 commit comments

Comments
 (0)