Skip to content

Commit 367bfa5

Browse files
authored
Merge pull request #1170 from starius/2025-10-litd_v0_16_0-rc1-wait-for-chainnotifier
update lndclient and enable waiting until chain notifier is ready
2 parents c924561 + ed3a247 commit 367bfa5

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.3
2626
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2
2727
github.com/lightninglabs/lightning-terminal/perms v1.0.1
28-
github.com/lightninglabs/lndclient v0.20.0-3
28+
github.com/lightninglabs/lndclient v0.20.0-6
2929
github.com/lightninglabs/loop v0.31.5-beta-lnd0.20
3030
github.com/lightninglabs/loop/looprpc v1.0.11
3131
github.com/lightninglabs/loop/swapserverrpc v1.0.18
@@ -166,7 +166,7 @@ require (
166166
github.com/ncruces/go-strftime v0.1.9 // indirect
167167
github.com/opencontainers/go-digest v1.0.0 // indirect
168168
github.com/opencontainers/image-spec v1.1.0 // indirect
169-
github.com/opencontainers/runc v1.2.0 // indirect
169+
github.com/opencontainers/runc v1.2.8 // indirect
170170
github.com/pkg/errors v0.9.1 // indirect
171171
github.com/prometheus/client_golang v1.14.0 // indirect
172172
github.com/prometheus/client_model v0.4.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,8 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
11541154
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
11551155
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
11561156
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
1157-
github.com/lightninglabs/lndclient v0.20.0-3 h1:hL37EJHYupIEQRSgogA6AFbFQ/6l+A+DuqJMGZ8vm8s=
1158-
github.com/lightninglabs/lndclient v0.20.0-3/go.mod h1:GMqsKYJ/CkKY2DgPJfcvvHf98qiwr4fpKir8oAN7TiI=
1157+
github.com/lightninglabs/lndclient v0.20.0-6 h1:sh23eZkOpHxe39c4QRYwhsM7qbnJlS++dXVmcwr0BNk=
1158+
github.com/lightninglabs/lndclient v0.20.0-6/go.mod h1:gBtIFPGmC2xIspGIv/G5+HiPSGJsFD8uIow7Oke1HFI=
11591159
github.com/lightninglabs/loop v0.31.5-beta-lnd0.20 h1:IO4s9WUER1OIO8Aqam/k6mVoZnWh+loJAGt19w/I12Y=
11601160
github.com/lightninglabs/loop v0.31.5-beta-lnd0.20/go.mod h1:11ojYzxnwdHkErhV8aFHy9IfReokOoNRg/B72F5Ck4g=
11611161
github.com/lightninglabs/loop/looprpc v1.0.11 h1:YCz67k5GSm3EKMCRBfis034Pd3R0+vPPHgfNwQqjpaE=
@@ -1273,8 +1273,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
12731273
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
12741274
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
12751275
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
1276-
github.com/opencontainers/runc v1.2.0 h1:qke7ZVCmJcKrJVY2iHJVC+0kql9uYdkusOPsQOOeBw4=
1277-
github.com/opencontainers/runc v1.2.0/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc=
1276+
github.com/opencontainers/runc v1.2.8 h1:RnEICeDReapbZ5lZEgHvj7E9Q3Eex9toYmaGBsbvU5Q=
1277+
github.com/opencontainers/runc v1.2.8/go.mod h1:cC0YkmZcuvr+rtBZ6T7NBoVbMGNAdLa/21vIElJDOzI=
12781278
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
12791279
github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4=
12801280
github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=

terminal.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -945,12 +945,14 @@ func (g *LightningTerminal) setupFullLNDClient(ctx context.Context,
945945
CustomMacaroonHex: hex.EncodeToString(
946946
macData,
947947
),
948-
BlockUntilChainSynced: true,
949-
BlockUntilUnlocked: true,
950948
CallerCtx: ctx,
951949
CheckVersion: minimalCompatibleVersion,
952950
RPCTimeout: g.cfg.LndRPCTimeout,
953951
ChainSyncPollInterval: g.cfg.LndConnectInterval,
952+
953+
BlockUntilChainSynced: true,
954+
BlockUntilUnlocked: true,
955+
BlockUntilChainNotifier: true,
954956
},
955957
)
956958
if err == nil {

0 commit comments

Comments
 (0)