Skip to content

Commit f185378

Browse files
ViktorTigerstromellemouton
authored andcommitted
mod: bump lnd, Go, lndclient, loop, pool and tapd
Bump lnd to `v0.18.0-beta`. This also bumps `lndclient` to `v0.18.0-1` and loop to `v0.28.5-beta`. Note that since loop `v0.28.5-beta` depends on the lnd `v0.18.0-beta.1` tag, litd will also use that tag. That tag is still referencing the same commit as lnd `v0.18.0-beta` though, so that's not an issue. We also need to bump the `pool` and `taproot-assets` daemons to branch specific versions that support lnd `v0.18.0-beta`. Finally, the `pool` auctioneerrpc package is also bumped to `v1.1.2`. We also adapt it itests for the new lnd version. Finally as lnd `v0.18.0-beta` uses go 1.22.3, we also bump the Go version in the go.mod file.
1 parent 1e1a856 commit f185378

File tree

7 files changed

+192
-203
lines changed

7 files changed

+192
-203
lines changed

autopilotserver/mock/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/lightninglabs/lightning-terminal/autopilotserverrpc"
1414
"github.com/lightninglabs/lightning-terminal/rules"
1515
"github.com/lightninglabs/lightning-terminal/session"
16-
"github.com/lightningnetwork/lnd/lntest/node"
16+
"github.com/lightningnetwork/lnd/lntest/port"
1717
"google.golang.org/grpc"
1818
"google.golang.org/grpc/credentials/insecure"
1919
"gopkg.in/macaroon-bakery.v2/bakery"
@@ -59,7 +59,7 @@ type clientSession struct {
5959
// NewServer constructs a new MockAutoPilotServer.
6060
func NewServer() *Server {
6161
return &Server{
62-
port: node.NextAvailablePort(),
62+
port: port.NextAvailablePort(),
6363
sessions: make(map[string]*clientSession),
6464
grpcServer: grpc.NewServer(
6565
grpc.Creds(insecure.NewCredentials()),

go.mod

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@ module github.com/lightninglabs/lightning-terminal
22

33
require (
44
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46
5-
github.com/btcsuite/btcd/btcec/v2 v2.3.2
5+
github.com/btcsuite/btcd/btcec/v2 v2.3.3
66
github.com/btcsuite/btcd/btcutil v1.1.5
77
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
88
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
9-
github.com/btcsuite/btcwallet/walletdb v1.4.0
9+
github.com/btcsuite/btcwallet/walletdb v1.4.2
1010
github.com/go-errors/errors v1.0.1
1111
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
1212
github.com/improbable-eng/grpc-web v0.12.0
1313
github.com/jessevdk/go-flags v1.4.0
1414
github.com/lightninglabs/faraday v0.2.13-alpha
1515
github.com/lightninglabs/lightning-node-connect v0.3.1-alpha
1616
github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.1
17-
github.com/lightninglabs/lndclient v0.17.4-1
18-
github.com/lightninglabs/loop v0.28.1-beta
19-
github.com/lightninglabs/loop/swapserverrpc v1.0.7
20-
github.com/lightninglabs/pool v0.6.4-beta.0.20231003174306-80d8854a0c4b
21-
github.com/lightninglabs/pool/auctioneerrpc v1.1.1
22-
github.com/lightninglabs/taproot-assets v0.3.3
23-
github.com/lightningnetwork/lnd v0.17.5-beta
17+
github.com/lightninglabs/lndclient v0.18.0-1
18+
github.com/lightninglabs/loop v0.28.5-beta
19+
github.com/lightninglabs/loop/swapserverrpc v1.0.8
20+
github.com/lightninglabs/pool v0.6.5-beta.0.20240531084722-4000ec802aaa
21+
github.com/lightninglabs/pool/auctioneerrpc v1.1.2
22+
github.com/lightninglabs/taproot-assets v0.3.4-0.20240531080458-69ff7704168c
23+
github.com/lightningnetwork/lnd v0.18.0-beta.1
2424
github.com/lightningnetwork/lnd/cert v1.2.2
25-
github.com/lightningnetwork/lnd/kvdb v1.4.4
26-
github.com/lightningnetwork/lnd/tlv v1.1.1
25+
github.com/lightningnetwork/lnd/kvdb v1.4.8
26+
github.com/lightningnetwork/lnd/tlv v1.2.6
2727
github.com/lightningnetwork/lnd/tor v1.1.2
2828
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
2929
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
30-
github.com/stretchr/testify v1.8.4
30+
github.com/stretchr/testify v1.9.0
3131
github.com/urfave/cli v1.22.9
3232
go.etcd.io/bbolt v1.3.7
33-
golang.org/x/crypto v0.21.0
33+
golang.org/x/crypto v0.22.0
3434
golang.org/x/net v0.23.0
3535
golang.org/x/sync v0.6.0
3636
google.golang.org/grpc v1.59.0
@@ -51,11 +51,11 @@ require (
5151
github.com/andybalholm/brotli v1.0.4 // indirect
5252
github.com/beorn7/perks v1.0.1 // indirect
5353
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
54-
github.com/btcsuite/btcwallet v0.16.10-0.20240127010340-16b422a2e8bf // indirect
55-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 // indirect
56-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
57-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.3 // indirect
58-
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 // indirect
54+
github.com/btcsuite/btcwallet v0.16.10-0.20240410030101-6fe19a472a62 // indirect
55+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 // indirect
56+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 // indirect
57+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 // indirect
58+
github.com/btcsuite/btcwallet/wtxmgr v1.5.3 // indirect
5959
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
6060
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
6161
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -69,29 +69,27 @@ require (
6969
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
7070
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
7171
github.com/davecgh/go-spew v1.1.1 // indirect
72-
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
73-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
74-
github.com/decred/dcrd/lru v1.0.0 // indirect
72+
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
73+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
74+
github.com/decred/dcrd/lru v1.1.2 // indirect
7575
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
7676
github.com/docker/cli v20.10.17+incompatible // indirect
7777
github.com/docker/docker v24.0.9+incompatible // indirect
7878
github.com/docker/go-connections v0.4.0 // indirect
7979
github.com/docker/go-units v0.5.0 // indirect
80-
github.com/dsnet/compress v0.0.1 // indirect
8180
github.com/dustin/go-humanize v1.0.1 // indirect
82-
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
81+
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
8382
github.com/fortytw2/leaktest v1.3.0 // indirect
8483
github.com/go-logr/logr v1.3.0 // indirect
8584
github.com/go-logr/stdr v1.2.2 // indirect
8685
github.com/gogo/protobuf v1.3.2 // indirect
8786
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
88-
github.com/golang-migrate/migrate/v4 v4.16.1 // indirect
89-
github.com/golang/mock v1.6.0 // indirect
90-
github.com/golang/protobuf v1.5.3 // indirect
87+
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
88+
github.com/golang/protobuf v1.5.4 // indirect
9189
github.com/golang/snappy v0.0.4 // indirect
9290
github.com/google/btree v1.0.1 // indirect
9391
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
94-
github.com/google/uuid v1.3.1 // indirect
92+
github.com/google/uuid v1.6.0 // indirect
9593
github.com/gorilla/websocket v1.5.0 // indirect
9694
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
9795
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0 // indirect
@@ -104,7 +102,7 @@ require (
104102
github.com/imdario/mergo v0.3.13 // indirect
105103
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
106104
github.com/jackc/pgconn v1.14.3 // indirect
107-
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa // indirect
105+
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
108106
github.com/jackc/pgio v1.0.0 // indirect
109107
github.com/jackc/pgpassfile v1.0.0 // indirect
110108
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
@@ -120,39 +118,37 @@ require (
120118
github.com/json-iterator/go v1.1.12 // indirect
121119
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
122120
github.com/kkdai/bstream v1.0.0 // indirect
123-
github.com/klauspost/compress v1.15.9 // indirect
124-
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
125-
github.com/klauspost/pgzip v1.2.5 // indirect
126-
github.com/lib/pq v1.10.7 // indirect
121+
github.com/klauspost/compress v1.15.11 // indirect
122+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
123+
github.com/lib/pq v1.10.9 // indirect
127124
github.com/libdns/libdns v0.2.1 // indirect
128-
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030 // indirect
125+
github.com/lightninglabs/aperture v0.3.2-beta // indirect
129126
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
130127
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
131-
github.com/lightninglabs/neutrino v0.16.0 // indirect
132-
github.com/lightninglabs/neutrino/cache v1.1.1 // indirect
128+
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
129+
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
133130
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
134131
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
135-
github.com/lightningnetwork/lnd/healthcheck v1.2.3 // indirect
132+
github.com/lightningnetwork/lnd/fn v1.0.5 // indirect
133+
github.com/lightningnetwork/lnd/healthcheck v1.2.4 // indirect
136134
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
135+
github.com/lightningnetwork/lnd/sqldb v1.0.2 // indirect
137136
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
138137
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
139-
github.com/mattn/go-isatty v0.0.17 // indirect
138+
github.com/mattn/go-isatty v0.0.20 // indirect
140139
github.com/mattn/go-runewidth v0.0.13 // indirect
141140
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
142141
github.com/mholt/acmez v1.0.4 // indirect
143-
github.com/mholt/archiver/v3 v3.5.0 // indirect
144142
github.com/miekg/dns v1.1.50 // indirect
145143
github.com/mitchellh/mapstructure v1.4.1 // indirect
146144
github.com/moby/term v0.5.0 // indirect
147145
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
148146
github.com/modern-go/reflect2 v1.0.2 // indirect
149147
github.com/ncruces/go-strftime v0.1.9 // indirect
150-
github.com/nwaples/rardecode v1.1.2 // indirect
151148
github.com/opencontainers/go-digest v1.0.0 // indirect
152149
github.com/opencontainers/image-spec v1.0.2 // indirect
153150
github.com/opencontainers/runc v1.1.12 // indirect
154151
github.com/ory/dockertest/v3 v3.10.0 // indirect
155-
github.com/pierrec/lz4/v4 v4.1.15 // indirect
156152
github.com/pkg/errors v0.9.1 // indirect
157153
github.com/pmezard/go-difflib v1.0.0 // indirect
158154
github.com/prometheus/client_golang v1.14.0 // indirect
@@ -170,11 +166,10 @@ require (
170166
github.com/sirupsen/logrus v1.9.2 // indirect
171167
github.com/soheilhy/cmux v0.1.5 // indirect
172168
github.com/spf13/pflag v1.0.5 // indirect
173-
github.com/stretchr/objx v0.5.0 // indirect
169+
github.com/stretchr/objx v0.5.2 // indirect
174170
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
175171
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
176172
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
177-
github.com/ulikunitz/xz v0.5.11 // indirect
178173
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
179174
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
180175
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -188,37 +183,38 @@ require (
188183
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
189184
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
190185
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
191-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
192-
go.opentelemetry.io/otel v1.20.0 // indirect
186+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
187+
go.opentelemetry.io/otel v1.21.0 // indirect
193188
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
194189
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
195190
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
196-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
197-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
198-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
191+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
192+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
193+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
199194
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
200195
go.uber.org/atomic v1.10.0 // indirect
196+
go.uber.org/mock v0.4.0 // indirect
201197
go.uber.org/multierr v1.6.0 // indirect
202198
go.uber.org/zap v1.23.0 // indirect
203-
golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
204-
golang.org/x/mod v0.14.0 // indirect
205-
golang.org/x/sys v0.18.0 // indirect
206-
golang.org/x/term v0.18.0 // indirect
199+
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
200+
golang.org/x/mod v0.16.0 // indirect
201+
golang.org/x/sys v0.19.0 // indirect
202+
golang.org/x/term v0.19.0 // indirect
207203
golang.org/x/text v0.14.0 // indirect
208204
golang.org/x/time v0.3.0 // indirect
209-
golang.org/x/tools v0.17.0 // indirect
210-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
211-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
212-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
205+
golang.org/x/tools v0.19.0 // indirect
206+
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
207+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
208+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
213209
gopkg.in/errgo.v1 v1.0.1 // indirect
214210
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
215211
gopkg.in/yaml.v2 v2.4.0 // indirect
216212
gopkg.in/yaml.v3 v3.0.1 // indirect
217213
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
218-
modernc.org/libc v1.41.0 // indirect
214+
modernc.org/libc v1.49.3 // indirect
219215
modernc.org/mathutil v1.6.0 // indirect
220-
modernc.org/memory v1.7.2 // indirect
221-
modernc.org/sqlite v1.29.5 // indirect
216+
modernc.org/memory v1.8.0 // indirect
217+
modernc.org/sqlite v1.29.8 // indirect
222218
modernc.org/strutil v1.2.0 // indirect
223219
modernc.org/token v1.1.0 // indirect
224220
nhooyr.io/websocket v1.8.7 // indirect
@@ -232,4 +228,4 @@ replace github.com/lightninglabs/lightning-terminal/autopilotserverrpc => ./auto
232228
// taproot-assets dependency to function properly.
233229
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
234230

235-
go 1.21
231+
go 1.22.3

0 commit comments

Comments
 (0)