Skip to content

Commit d47ecee

Browse files
guggeroguggero
authored
Merge pull request #282 from lightninglabs/lnd-14-final
multi: bump lnd to v0.14.0-beta final, release v0.6.0-alpha
2 parents ce6610a + 8fac669 commit d47ecee

File tree

6 files changed

+61
-34
lines changed

6 files changed

+61
-34
lines changed

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ If you’d prefer to compile from source code please follow [these instructions]
6666

6767
## Compatibility
6868

69-
Lightning Terminal is backwards compatible with `lnd` back to version v0.12.0-beta.
69+
Lightning Terminal is backwards compatible with `lnd` back to version v0.13.3-beta.
7070

7171
| LiT | LND |
7272
| ---------------- | ------------ |
73+
| **v0.6.0-alpha** | v0.13.3-beta |
7374
| **v0.5.2-alpha** | v0.12.0-beta |
7475
| **v0.5.1-alpha** | v0.12.0-beta |
7576
| **v0.5.0-alpha** | v0.12.0-beta |
@@ -86,6 +87,7 @@ Lightning Terminal is backwards compatible with `lnd` back to version v0.12.0-be
8687

8788
| LiT | LND | Loop | Faraday | Pool |
8889
| ---------------- | ------------ | ----------- | ------------ |---------------|
90+
| **v0.6.0-alpha** | v0.14.0-beta | v0.15.1-beta | v0.2.7-alpha | v0.5.2-alpha |
8991
| **v0.5.3-alpha** | v0.13.3-beta | v0.14.1-beta | v0.2.6-alpha | v0.5.0-alpha |
9092
| **v0.5.2-alpha** | v0.13.3-beta | v0.14.1-beta | v0.2.6-alpha | v0.5.0-alpha |
9193
| **v0.5.1-alpha** | v0.13.0-beta | v0.14.1-beta | v0.2.6-alpha | v0.5.0-alpha |

‎app/src/api/pool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const MIN_FEE_RATE_KW = 253;
2121

2222
// The latest order version. This should be updated along with pool CLI
2323
// see: https://github.com/lightninglabs/pool/blob/master/order/interface.go#L35
24-
export const ORDER_VERSION = 2;
24+
export const ORDER_VERSION = 4;
2525

2626
const POOL_INITIATOR = 'lit-ui';
2727

‎config.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
317317
// Show the version and exit if the version flag was specified.
318318
appName := filepath.Base(os.Args[0])
319319
appName = strings.TrimSuffix(appName, filepath.Ext(appName))
320-
usageMessage := fmt.Sprintf("Use %s -h to show usage", appName)
321320
if preCfg.Lnd.ShowVersion {
322321
fmt.Println(appName, "version", build.Version(),
323322
"commit="+build.Commit)
@@ -326,7 +325,7 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
326325

327326
// Load the main configuration file and parse any command line options.
328327
// This function will also set up logging properly.
329-
cfg, err := loadConfigFile(preCfg, usageMessage, interceptor)
328+
cfg, err := loadConfigFile(preCfg, interceptor)
330329
if err != nil {
331330
return nil, err
332331
}
@@ -470,8 +469,8 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
470469

471470
// loadConfigFile loads and sanitizes the lit main configuration from the config
472471
// file or command line arguments (or both).
473-
func loadConfigFile(preCfg *Config, usageMessage string,
474-
interceptor signal.Interceptor) (*Config, error) {
472+
func loadConfigFile(preCfg *Config, interceptor signal.Interceptor) (*Config,
473+
error) {
475474

476475
// If the config file path has not been modified by the user, then we'll
477476
// use the default config file path. However, if the user has modified
@@ -528,8 +527,7 @@ func loadConfigFile(preCfg *Config, usageMessage string,
528527
case ModeIntegrated:
529528
var err error
530529
cfg.Lnd, err = lnd.ValidateConfig(
531-
*cfg.Lnd, usageMessage, interceptor, fileParser,
532-
flagParser,
530+
*cfg.Lnd, interceptor, fileParser, flagParser,
533531
)
534532
if err != nil {
535533
return nil, err

‎go.mod

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require (
77
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
88
github.com/improbable-eng/grpc-web v0.12.0
99
github.com/jessevdk/go-flags v1.4.0
10-
github.com/lightninglabs/faraday v0.2.6-alpha.0.20211104103247-f8a995369c78
11-
github.com/lightninglabs/lndclient v0.14.0-3
12-
github.com/lightninglabs/loop v0.15.0-beta.0.20211104102229-139eac6febd0
13-
github.com/lightninglabs/pool v0.5.1-alpha.0.20211103184317-df007ad9b567
14-
github.com/lightningnetwork/lnd v0.14.0-beta.rc1
10+
github.com/lightninglabs/faraday v0.2.7-alpha
11+
github.com/lightninglabs/lndclient v0.14.0-5
12+
github.com/lightninglabs/loop v0.15.1-beta
13+
github.com/lightninglabs/pool v0.5.2-alpha
14+
github.com/lightningnetwork/lnd v0.14.0-beta
1515
github.com/lightningnetwork/lnd/cert v1.1.0
1616
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
1717
github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
@@ -23,4 +23,12 @@ require (
2323
gopkg.in/macaroon.v2 v2.1.0
2424
)
2525

26+
// A PR was merged without bumping the kvdb module version. We'll be able to
27+
// remove this once lnd 0.14.1-beta is out.
28+
replace github.com/lightningnetwork/lnd/kvdb => github.com/lightningnetwork/lnd/kvdb v1.2.1
29+
30+
// A PR was merged without bumping the auctioneerrpc module version. We'll be
31+
// able to remove this once pool 0.5.3-alpha is out.
32+
replace github.com/lightninglabs/pool/auctioneerrpc => github.com/lightninglabs/pool/auctioneerrpc v1.0.4
33+
2634
go 1.16

‎go.sum

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ github.com/btcsuite/btcutil/psbt v1.0.3-0.20210527170813-e2ba6805a890 h1:0xUNvvw
9797
github.com/btcsuite/btcutil/psbt v1.0.3-0.20210527170813-e2ba6805a890/go.mod h1:LVveMu4VaNSkIRTZu2+ut0HDBRuYjqGocxDMNS1KuGQ=
9898
github.com/btcsuite/btcwallet v0.11.1-0.20200814001439-1d31f4ea6fc5/go.mod h1:YkEbJaCyN6yncq5gEp2xG0OKDwus2QxGCEXTNF27w5I=
9999
github.com/btcsuite/btcwallet v0.11.1-0.20200904022754-2c5947a45222/go.mod h1:owv9oZqM0HnUW+ByF7VqOgfs2eb0ooiePW/+Tl/i/Nk=
100-
github.com/btcsuite/btcwallet v0.12.1-0.20211022222026-9043c19d8725 h1:YsJ15EzrUG0OHghRriFuJHctw3HP3RRhe8bwR20JuDE=
101-
github.com/btcsuite/btcwallet v0.12.1-0.20211022222026-9043c19d8725/go.mod h1:iLN1lG1MW0eREm+SikmPO8AZPz5NglBTEK/ErqkjGpo=
100+
github.com/btcsuite/btcwallet v0.13.0 h1:gtLWwueRm27KQiHJpycybv3uMdK1eo87JexfTfzvEhk=
101+
github.com/btcsuite/btcwallet v0.13.0/go.mod h1:iLN1lG1MW0eREm+SikmPO8AZPz5NglBTEK/ErqkjGpo=
102102
github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0/go.mod h1:VufDts7bd/zs3GV13f/lXc/0lXrPnvxD/NvmpG/FEKU=
103103
github.com/btcsuite/btcwallet/wallet/txauthor v1.1.0 h1:8pO0pvPX1rFRfRiol4oV6kX7dY5y4chPwhfVwUfvwtk=
104104
github.com/btcsuite/btcwallet/wallet/txauthor v1.1.0/go.mod h1:ktYuJyumYtwG+QQ832Q+kqvxWJRAei3Nqs5qhSn4nww=
@@ -258,6 +258,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
258258
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
259259
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
260260
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
261+
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
262+
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
261263
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
262264
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
263265
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -474,24 +476,24 @@ github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
474476
github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
475477
github.com/lightninglabs/aperture v0.1.6-beta h1:bhpK4O9xa0YUBFQfkfg/h/3sMAY+AOMxi9YUjg6/l/E=
476478
github.com/lightninglabs/aperture v0.1.6-beta/go.mod h1:9xl4mx778ZAzrB87nLHMqk+XQcSz8Dx/DypjWzGN1xo=
477-
github.com/lightninglabs/faraday v0.2.6-alpha.0.20211104103247-f8a995369c78 h1:q4X1/eUg1RZ3iceaSZiOmlBKXmlZvh8JzMImS53FwkU=
478-
github.com/lightninglabs/faraday v0.2.6-alpha.0.20211104103247-f8a995369c78/go.mod h1:EwKprpGpPenLw8OCzx5+BN4mbSwwGlp2WLunpDv6hw4=
479+
github.com/lightninglabs/faraday v0.2.7-alpha h1:lpSUk3RFfgr4/OCx1OdJ2AMHCAiTObK+5o54ml8ceHs=
480+
github.com/lightninglabs/faraday v0.2.7-alpha/go.mod h1:77P9EctYhneIXLvm9a6ylV9LCht/rj7j8mLwXpBgxB8=
479481
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
480482
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
481483
github.com/lightninglabs/lndclient v0.11.0-4/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
482-
github.com/lightninglabs/lndclient v0.14.0-3 h1:0k0vzHOcWy6gWTy26a7nkh9UtoNisiIJYBldrhy5ZSk=
483-
github.com/lightninglabs/lndclient v0.14.0-3/go.mod h1:LwAQ+f8oiQ/2+2saBaYA1VYPIV/vSof0kMYQosVn9Mg=
484-
github.com/lightninglabs/loop v0.15.0-beta.0.20211104102229-139eac6febd0 h1:ddt7VVIdYRbQuoClqYYwmBUtaVOWnDDHIhYbKvwfI3o=
485-
github.com/lightninglabs/loop v0.15.0-beta.0.20211104102229-139eac6febd0/go.mod h1:pVH/Pwx10e7pA0MuQScRWXzrMTWxWvb9uGjXxxqsIe0=
484+
github.com/lightninglabs/lndclient v0.14.0-5 h1:dI2/Y2fn9m5VuwMTd/DcF6y0DYdMy3pk0MPu4xNjj54=
485+
github.com/lightninglabs/lndclient v0.14.0-5/go.mod h1:2kH9vNoc29ghIkfMjxwSeK8yCxsYfR80XAJ9PU/QWWk=
486+
github.com/lightninglabs/loop v0.15.1-beta h1:X4qth5qAdpgKarmcltO85HxMze3Wrk8FzI46Cwt9H4A=
487+
github.com/lightninglabs/loop v0.15.1-beta/go.mod h1:9TawqLzvjDP4pswZ8QkvTcBqH+wGKBffP+r6mFGBVi4=
486488
github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg=
487489
github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0=
488490
github.com/lightninglabs/neutrino v0.12.1/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E=
489-
github.com/lightninglabs/neutrino v0.12.3 h1:9M4VTcfu9Ay4Qy8UgB4OFZ51MKKg1BAlYf2v66ZUMxc=
490-
github.com/lightninglabs/neutrino v0.12.3/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E=
491-
github.com/lightninglabs/pool v0.5.1-alpha.0.20211103184317-df007ad9b567 h1:0Bf15jZzXNqcSbHR76kvpDkSRknEd83XqfF2SxziJ/I=
492-
github.com/lightninglabs/pool v0.5.1-alpha.0.20211103184317-df007ad9b567/go.mod h1:L+8AvR6oiZzhsEHjorGhf5E7+1H+6hGEf4Ubc/Qyp4o=
493-
github.com/lightninglabs/pool/auctioneerrpc v1.0.3 h1:rbXy35s8Z6exuNrJjgcPZ016TxI6zq3z4L/YYGeS+8A=
494-
github.com/lightninglabs/pool/auctioneerrpc v1.0.3/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo=
491+
github.com/lightninglabs/neutrino v0.13.0 h1:j3PKWEJCwqwMn/qLASz2j0IuCF6AumS9DaM0i0pM/nY=
492+
github.com/lightninglabs/neutrino v0.13.0/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E=
493+
github.com/lightninglabs/pool v0.5.2-alpha h1:lr/c/MWiQyzirNrCZT9rBF/pnTr/J+b/dVN8g10sh7c=
494+
github.com/lightninglabs/pool v0.5.2-alpha/go.mod h1:UboT9W0g7o7fFoIHm6oNXvkcKDRJcY2SEjcnF53Y3ao=
495+
github.com/lightninglabs/pool/auctioneerrpc v1.0.4 h1:5mVMl6+U+uhvc57UNol7usrqXwnV0xPI8Uuzr0IrNRc=
496+
github.com/lightninglabs/pool/auctioneerrpc v1.0.4/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo=
495497
github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d/go.mod h1:KDb67YMzoh4eudnzClmvs2FbiLG9vxISmLApUkCa4uI=
496498
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display h1:RZJ8H4ueU/aQ9pFtx5wqsuD3B/DezrewJeVwDKKYY8E=
497499
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE=
@@ -501,8 +503,8 @@ github.com/lightningnetwork/lightning-onion v1.0.2-0.20210520211913-522b799e65b1
501503
github.com/lightningnetwork/lightning-onion v1.0.2-0.20210520211913-522b799e65b1/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4=
502504
github.com/lightningnetwork/lnd v0.11.0-beta/go.mod h1:CzArvT7NFDLhVyW06+NJWSuWFmE6Ea+AjjA3txUBqTM=
503505
github.com/lightningnetwork/lnd v0.11.1-beta/go.mod h1:PGIgxy8aH70Li33YVYkHSaCM8m8LjEevk5h1Dpldrr4=
504-
github.com/lightningnetwork/lnd v0.14.0-beta.rc1 h1:SFPz0WwBIdcN232N99ElCDbzLwfVO6i3NWVaFPmE6e4=
505-
github.com/lightningnetwork/lnd v0.14.0-beta.rc1/go.mod h1:r+KNDYoXIfaDQdrWEPuZeL/AT3+0mdxhK5bZaWoXGTg=
506+
github.com/lightningnetwork/lnd v0.14.0-beta h1:q9ExaoRD7+Pv5UKbxBaszkAOX9pZrxre1YzEEq3pveY=
507+
github.com/lightningnetwork/lnd v0.14.0-beta/go.mod h1:qqOImM4QBKeIXsmUUsJznAbAaEF9iAPHAwfBZf9ld4Y=
506508
github.com/lightningnetwork/lnd/cert v1.0.2/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo=
507509
github.com/lightningnetwork/lnd/cert v1.0.2/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo=
508510
github.com/lightningnetwork/lnd/cert v1.1.0 h1:Vgmse23SOB/ODIj+I5Utq1yuKLPbWQ34gUoNKfDs4pk=
@@ -513,8 +515,8 @@ github.com/lightningnetwork/lnd/clock v1.1.0/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ4
513515
github.com/lightningnetwork/lnd/healthcheck v1.0.0/go.mod h1:u92p1JGFJNMSkMvztKEwmt1P3TRnLeJBXZ3M85xkU1E=
514516
github.com/lightningnetwork/lnd/healthcheck v1.2.0 h1:00bkNn+hGJM9j3Ht+ulf8YNcSx1HEYSDv5pf4HB1/uQ=
515517
github.com/lightningnetwork/lnd/healthcheck v1.2.0/go.mod h1:WSz3lsUjErJQZ3gb+zW32nM3WIHNiZ3A40GVoaQY5wU=
516-
github.com/lightningnetwork/lnd/kvdb v1.2.0 h1:UcEi5fGd5YU3M7cRFYTXee9wrFAEkncrcg2y73kg+jk=
517-
github.com/lightningnetwork/lnd/kvdb v1.2.0/go.mod h1:4DW7zc9AWqqJBvwhSE251VasYikTELItN70hESIt9RU=
518+
github.com/lightningnetwork/lnd/kvdb v1.2.1 h1:QevYLPh6bh1SLIvlUaPbrpX/YMKzSPBfmGVvn2i8IlU=
519+
github.com/lightningnetwork/lnd/kvdb v1.2.1/go.mod h1:x+IpsuDynubjokUofavLXroeGfS/WrqUXXTK6vN/gp4=
518520
github.com/lightningnetwork/lnd/queue v1.0.1/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms=
519521
github.com/lightningnetwork/lnd/queue v1.0.4/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg=
520522
github.com/lightningnetwork/lnd/queue v1.1.0 h1:YpCJjlIvVxN/R7ww2aNiY8ex7U2fucZDLJ67tI3HFx8=
@@ -1006,6 +1008,7 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
10061008
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
10071009
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
10081010
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
1011+
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
10091012
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
10101013
golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
10111014
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=

‎terminal.go

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,17 @@ var (
104104
watchtowerrpc.RegisterWatchtowerHandlerFromEndpoint,
105105
wtclientrpc.RegisterWatchtowerClientHandlerFromEndpoint,
106106
}
107+
108+
// minimalCompatibleVersion is the minimal lnd version that is required
109+
// to run LiT in remote mode.
110+
minimalCompatibleVersion = &verrpc.Version{
111+
AppMajor: 0,
112+
AppMinor: 13,
113+
AppPatch: 3,
114+
BuildTags: []string{
115+
"signrpc", "walletrpc", "chainrpc", "invoicesrpc",
116+
},
117+
}
107118
)
108119

109120
// LightningTerminal is the main grand unified binary instance. Its task is to
@@ -368,6 +379,7 @@ func (g *LightningTerminal) startSubservers() error {
368379
BlockUntilChainSynced: true,
369380
BlockUntilUnlocked: true,
370381
CallerCtx: ctxc,
382+
CheckVersion: minimalCompatibleVersion,
371383
},
372384
)
373385
if err != nil {
@@ -377,23 +389,27 @@ func (g *LightningTerminal) startSubservers() error {
377389
// Both connection types are ready now, let's start our subservers if
378390
// they should be started locally as an integrated service.
379391
if !g.cfg.faradayRemote {
380-
err = g.faradayServer.StartAsSubserver(g.lndClient.LndServices)
392+
err = g.faradayServer.StartAsSubserver(
393+
g.lndClient.LndServices, true,
394+
)
381395
if err != nil {
382396
return err
383397
}
384398
g.faradayStarted = true
385399
}
386400

387401
if !g.cfg.loopRemote {
388-
err = g.loopServer.StartAsSubserver(g.lndClient)
402+
err = g.loopServer.StartAsSubserver(g.lndClient, true)
389403
if err != nil {
390404
return err
391405
}
392406
g.loopStarted = true
393407
}
394408

395409
if !g.cfg.poolRemote {
396-
err = g.poolServer.StartAsSubserver(basicClient, g.lndClient)
410+
err = g.poolServer.StartAsSubserver(
411+
basicClient, g.lndClient, true,
412+
)
397413
if err != nil {
398414
return err
399415
}

0 commit comments

Comments
 (0)