Skip to content

Commit 8ba2c8b

Browse files
author
ffranr
authored
Merge pull request #114 from lightninglabs/issue-113-WASM-build-fix
wasm-client: upgrade to latest `master` litd version
2 parents cad4234 + dfdb37f commit 8ba2c8b

File tree

13 files changed

+1195
-302
lines changed

13 files changed

+1195
-302
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
# go needs absolute directories, using the $HOME variable doesn't work here.
1717
GOCACHE: /home/runner/work/go/pkg/build
1818
GOPATH: /home/runner/work/go
19-
GO_VERSION: 1.23.6
19+
GO_VERSION: 1.24.2
2020

2121
jobs:
2222
########################

cmd/wasm-client/go.mod

+59-61
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@ module github.com/lightninglabs/lightning-node-connect/cmd/wasm-client
22

33
require (
44
github.com/btcsuite/btcd/btcec/v2 v2.3.4
5-
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
5+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
66
github.com/jessevdk/go-flags v1.4.0
7-
github.com/lightninglabs/faraday v0.2.13-alpha
8-
github.com/lightninglabs/lightning-node-connect v0.3.3-alpha.0.20250303090341-f823ad04b9de
9-
github.com/lightninglabs/lightning-terminal v0.14.0-alpha
10-
github.com/lightninglabs/loop v0.29.0-beta
11-
github.com/lightninglabs/pool v0.6.5-beta.0.20241015105339-044cb451b5df
12-
github.com/lightninglabs/taproot-assets v0.5.0
13-
github.com/lightningnetwork/lnd v0.18.4-beta
7+
github.com/lightninglabs/faraday v0.2.14-alpha.0.20250305102803-f668619b351e
8+
github.com/lightninglabs/lightning-node-connect/gbn v1.0.0
9+
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.0
10+
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2-0.20250506112654-08095d30dd1a
11+
github.com/lightninglabs/lightning-terminal/perms v0.0.0-20250506112654-08095d30dd1a
12+
github.com/lightninglabs/loop/looprpc v1.0.7
13+
github.com/lightninglabs/pool/poolrpc v1.0.1
14+
github.com/lightninglabs/taproot-assets/taprpc v1.0.1
15+
github.com/lightningnetwork/lnd v0.19.0-beta.rc3
1416
google.golang.org/grpc v1.65.0
1517
google.golang.org/protobuf v1.34.2
16-
gopkg.in/macaroon-bakery.v2 v2.1.0
18+
gopkg.in/macaroon-bakery.v2 v2.3.0
1719
gopkg.in/macaroon.v2 v2.1.0
1820
)
1921

@@ -29,16 +31,17 @@ require (
2931
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
3032
github.com/aead/siphash v1.0.1 // indirect
3133
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 // indirect
34+
github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 // indirect
3335
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
34-
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
36+
github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect
3537
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
36-
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5 // indirect
38+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
39+
github.com/btcsuite/btcwallet v0.16.13 // indirect
3740
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
3841
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
3942
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
40-
github.com/btcsuite/btcwallet/walletdb v1.4.4 // indirect
41-
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 // indirect
43+
github.com/btcsuite/btcwallet/walletdb v1.5.1 // indirect
44+
github.com/btcsuite/btcwallet/wtxmgr v1.5.6 // indirect
4245
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
4346
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
4447
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -47,13 +50,13 @@ require (
4750
github.com/containerd/continuity v0.3.0 // indirect
4851
github.com/coreos/go-semver v0.3.0 // indirect
4952
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
50-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
53+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5154
github.com/davecgh/go-spew v1.1.1 // indirect
5255
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
5356
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
5457
github.com/decred/dcrd/lru v1.1.2 // indirect
55-
github.com/docker/cli v27.1.1+incompatible // indirect
56-
github.com/docker/docker v27.1.1+incompatible // indirect
58+
github.com/docker/cli v28.0.1+incompatible // indirect
59+
github.com/docker/docker v28.0.1+incompatible // indirect
5760
github.com/docker/go-connections v0.4.0 // indirect
5861
github.com/docker/go-units v0.5.0 // indirect
5962
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -62,9 +65,10 @@ require (
6265
github.com/go-errors/errors v1.0.1 // indirect
6366
github.com/go-logr/logr v1.4.2 // indirect
6467
github.com/go-logr/stdr v1.2.2 // indirect
68+
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
6569
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
6670
github.com/gogo/protobuf v1.3.2 // indirect
67-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
71+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6872
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
6973
github.com/golang/protobuf v1.5.4 // indirect
7074
github.com/golang/snappy v0.0.4 // indirect
@@ -78,7 +82,6 @@ require (
7882
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7983
github.com/hashicorp/errwrap v1.1.0 // indirect
8084
github.com/hashicorp/go-multierror v1.1.1 // indirect
81-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8285
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
8386
github.com/jackc/pgconn v1.14.3 // indirect
8487
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -95,43 +98,40 @@ require (
9598
github.com/jonboulle/clockwork v0.2.2 // indirect
9699
github.com/jrick/logrotate v1.1.2 // indirect
97100
github.com/json-iterator/go v1.1.12 // indirect
98-
github.com/juju/loggo v1.0.0 // indirect
99101
github.com/kkdai/bstream v1.0.0 // indirect
100102
github.com/klauspost/compress v1.17.9 // indirect
101103
github.com/lib/pq v1.10.9 // indirect
104+
github.com/lightninglabs/faraday/frdrpc v1.0.0 // indirect
102105
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
103106
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
104-
github.com/lightninglabs/lightning-terminal/litrpc v1.0.0 // indirect
105-
github.com/lightninglabs/lndclient v0.18.4-9 // indirect
106-
github.com/lightninglabs/loop/looprpc v1.0.2 // indirect
107-
github.com/lightninglabs/loop/swapserverrpc v1.0.11 // indirect
108-
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
107+
github.com/lightninglabs/loop/swapserverrpc v1.0.13 // indirect
108+
github.com/lightninglabs/neutrino v0.16.1 // indirect
109109
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
110110
github.com/lightninglabs/pool/auctioneerrpc v1.1.2 // indirect
111-
github.com/lightninglabs/pool/poolrpc v1.0.0 // indirect
112111
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
113112
github.com/lightningnetwork/lnd/cert v1.2.2 // indirect
114113
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
115-
github.com/lightningnetwork/lnd/fn v1.2.3 // indirect
116-
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
117-
github.com/lightningnetwork/lnd/kvdb v1.4.10 // indirect
114+
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
115+
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
116+
github.com/lightningnetwork/lnd/kvdb v1.4.16 // indirect
118117
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
119-
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
118+
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
120119
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
121-
github.com/lightningnetwork/lnd/tlv v1.2.6 // indirect
122-
github.com/lightningnetwork/lnd/tor v1.1.2 // indirect
120+
github.com/lightningnetwork/lnd/tlv v1.3.0 // indirect
121+
github.com/lightningnetwork/lnd/tor v1.1.6 // indirect
123122
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
124123
github.com/mattn/go-isatty v0.0.20 // indirect
125124
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
126125
github.com/miekg/dns v1.1.50 // indirect
127126
github.com/moby/docker-image-spec v1.3.1 // indirect
127+
github.com/moby/sys/user v0.3.0 // indirect
128128
github.com/moby/term v0.5.0 // indirect
129129
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
130130
github.com/modern-go/reflect2 v1.0.2 // indirect
131131
github.com/ncruces/go-strftime v0.1.9 // indirect
132132
github.com/opencontainers/go-digest v1.0.0 // indirect
133133
github.com/opencontainers/image-spec v1.0.2 // indirect
134-
github.com/opencontainers/runc v1.1.14 // indirect
134+
github.com/opencontainers/runc v1.2.0 // indirect
135135
github.com/ory/dockertest/v3 v3.10.0 // indirect
136136
github.com/pkg/errors v0.9.1 // indirect
137137
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -141,11 +141,11 @@ require (
141141
github.com/prometheus/procfs v0.8.0 // indirect
142142
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
143143
github.com/rogpeppe/fastuuid v1.2.0 // indirect
144-
github.com/sirupsen/logrus v1.9.2 // indirect
144+
github.com/sirupsen/logrus v1.9.3 // indirect
145145
github.com/soheilhy/cmux v0.1.5 // indirect
146146
github.com/spf13/pflag v1.0.5 // indirect
147147
github.com/stretchr/objx v0.5.2 // indirect
148-
github.com/stretchr/testify v1.9.0 // indirect
148+
github.com/stretchr/testify v1.10.0 // indirect
149149
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
150150
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
151151
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
@@ -163,55 +163,53 @@ require (
163163
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
164164
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
165165
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
166+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
166167
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
167-
go.opentelemetry.io/otel v1.32.0 // indirect
168+
go.opentelemetry.io/otel v1.35.0 // indirect
168169
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
169170
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
171-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
172-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
171+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
172+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
173+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
173174
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
174175
go.uber.org/atomic v1.10.0 // indirect
175176
go.uber.org/multierr v1.6.0 // indirect
176177
go.uber.org/zap v1.23.0 // indirect
177-
golang.org/x/crypto v0.31.0 // indirect
178+
golang.org/x/crypto v0.36.0 // indirect
178179
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
179-
golang.org/x/mod v0.17.0 // indirect
180-
golang.org/x/net v0.27.0 // indirect
181-
golang.org/x/sync v0.10.0 // indirect
182-
golang.org/x/sys v0.28.0 // indirect
183-
golang.org/x/term v0.27.0 // indirect
184-
golang.org/x/text v0.21.0 // indirect
180+
golang.org/x/mod v0.21.0 // indirect
181+
golang.org/x/net v0.38.0 // indirect
182+
golang.org/x/sync v0.12.0 // indirect
183+
golang.org/x/sys v0.31.0 // indirect
184+
golang.org/x/term v0.30.0 // indirect
185+
golang.org/x/text v0.23.0 // indirect
185186
golang.org/x/time v0.3.0 // indirect
186-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
187-
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
187+
golang.org/x/tools v0.24.0 // indirect
188+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
188189
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
189190
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
190191
gopkg.in/errgo.v1 v1.0.1 // indirect
191192
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
192193
gopkg.in/yaml.v2 v2.4.0 // indirect
193194
gopkg.in/yaml.v3 v3.0.1 // indirect
194-
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
195-
modernc.org/libc v1.50.9 // indirect
195+
modernc.org/libc v1.55.3 // indirect
196196
modernc.org/mathutil v1.6.0 // indirect
197197
modernc.org/memory v1.8.0 // indirect
198-
modernc.org/sqlite v1.30.0 // indirect
199-
modernc.org/strutil v1.2.0 // indirect
200-
modernc.org/token v1.1.0 // indirect
198+
modernc.org/sqlite v1.34.5 // indirect
201199
nhooyr.io/websocket v1.8.7 // indirect
202-
pgregory.net/rapid v1.1.0 // indirect
200+
pgregory.net/rapid v1.2.0 // indirect
203201
sigs.k8s.io/yaml v1.2.0 // indirect
204202
)
205203

206-
// TODO: uncomment once LiT has been updated to point to the latest version of
207-
// LNC and LND.
208-
// replace github.com/lightninglabs/lightning-node-connect => ../../
209-
210-
replace github.com/lightninglabs/lightning-node-connect/hashmailrpc => ../../hashmailrpc
211-
212204
// We want to format raw bytes as hex instead of base64. The forked version
213205
// allows us to specify that as an option. This is required for the
214206
// taproot-assets dependency to function properly.
215207
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display
216208

217-
go 1.22.6
209+
replace (
210+
github.com/lightninglabs/lightning-node-connect/gbn => ../../gbn
211+
github.com/lightninglabs/lightning-node-connect/hashmailrpc => ../../hashmailrpc
212+
github.com/lightninglabs/lightning-node-connect/mailbox => ../../mailbox
213+
)
214+
215+
go 1.24.2

0 commit comments

Comments
 (0)