Skip to content

Commit 5267d1d

Browse files
ViktorT-11ViktorT-11
authored
Merge pull request #109 from ViktorTigerstrom/litd-v0_14_0
multi: Bump go to `1.22.6` & litd to `v0.14.0-alpha`
2 parents ee4e7ff + 8560754 commit 5267d1d

File tree

10 files changed

+482
-487
lines changed

10 files changed

+482
-487
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
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.22.3
19+
GO_VERSION: 1.22.6
2020

2121
jobs:
2222
########################
@@ -164,7 +164,7 @@ jobs:
164164
run: 7z a logs-itest.zip itest/**/*.log
165165

166166
- name: Upload log files on failure
167-
uses: actions/upload-artifact@v2.2.4
167+
uses: actions/upload-artifact@v4
168168
if: ${{ failure() }}
169169
with:
170170
name: logs-itest

‎Dockerfile-wasm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#Get golang 1.22.3 as a base image
2-
FROM golang:1.22.3 as builder
1+
#Get golang 1.22.6 as a base image
2+
FROM golang:1.22.6 as builder
33

44
#Define the working directory in the container
55
WORKDIR /app

‎RELEASE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This document describes the steps needed to release a new version of LNC binarie
66

77
1. Android Studio with Android SDK (API level 16 or newer)
88
2. Xcode (latest version)
9-
3. Go v1.22.3 or newer
9+
3. Go v1.22.6 or newer
1010
4. gomobile (https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile)
1111
5. javac version 1.7 or higher (Included in Java Development Kit 7+)
1212

‎cmd/wasm-client/go.mod‎

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
module github.com/lightninglabs/lightning-node-connect/cmd/wasm-client
22

33
require (
4-
github.com/btcsuite/btcd/btcec/v2 v2.3.3
5-
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
4+
github.com/btcsuite/btcd/btcec/v2 v2.3.4
5+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
66
github.com/jessevdk/go-flags v1.4.0
77
github.com/lightninglabs/faraday v0.2.13-alpha
8-
github.com/lightninglabs/lightning-node-connect v0.3.1-alpha
9-
github.com/lightninglabs/lightning-terminal v0.13.2-alpha
10-
github.com/lightninglabs/loop v0.28.5-beta
11-
github.com/lightninglabs/pool v0.6.5-beta.0.20240531084722-4000ec802aaa
12-
github.com/lightninglabs/taproot-assets v0.3.4-0.20240531080458-69ff7704168c
13-
github.com/lightningnetwork/lnd v0.18.2-beta
14-
google.golang.org/grpc v1.59.0
15-
google.golang.org/protobuf v1.33.0
8+
github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee4e7ff52f83
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
14+
google.golang.org/grpc v1.65.0
15+
google.golang.org/protobuf v1.34.2
1616
gopkg.in/macaroon-bakery.v2 v2.1.0
1717
gopkg.in/macaroon.v2 v2.1.0
1818
)
1919

2020
require (
21+
dario.cat/mergo v1.0.1 // indirect
2122
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2223
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2324
github.com/Microsoft/go-winio v0.6.1 // indirect
@@ -28,21 +29,21 @@ require (
2829
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
2930
github.com/aead/siphash v1.0.1 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/btcsuite/btcd v0.24.2 // indirect
32+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 // indirect
3233
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
3334
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
3435
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
35-
github.com/btcsuite/btcwallet v0.16.10-0.20240706055350-e391a1c31df2 // indirect
36-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 // indirect
37-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 // indirect
38-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 // indirect
39-
github.com/btcsuite/btcwallet/walletdb v1.4.2 // indirect
40-
github.com/btcsuite/btcwallet/wtxmgr v1.5.3 // indirect
36+
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5 // indirect
37+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
38+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
39+
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
4142
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
4243
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
4344
github.com/btcsuite/winsvc v1.0.0 // indirect
44-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
45-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
45+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
46+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4647
github.com/containerd/continuity v0.3.0 // indirect
4748
github.com/coreos/go-semver v0.3.0 // indirect
4849
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
@@ -51,18 +52,19 @@ require (
5152
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
5253
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
5354
github.com/decred/dcrd/lru v1.1.2 // indirect
54-
github.com/docker/cli v20.10.17+incompatible // indirect
55-
github.com/docker/docker v24.0.9+incompatible // indirect
55+
github.com/docker/cli v27.1.1+incompatible // indirect
56+
github.com/docker/docker v27.1.1+incompatible // indirect
5657
github.com/docker/go-connections v0.4.0 // indirect
5758
github.com/docker/go-units v0.5.0 // indirect
5859
github.com/dustin/go-humanize v1.0.1 // indirect
5960
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
6061
github.com/frankban/quicktest v1.14.3 // indirect
6162
github.com/go-errors/errors v1.0.1 // indirect
62-
github.com/go-logr/logr v1.3.0 // indirect
63+
github.com/go-logr/logr v1.4.2 // indirect
6364
github.com/go-logr/stdr v1.2.2 // indirect
65+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
6466
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
67+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
6668
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
6769
github.com/golang/protobuf v1.5.4 // indirect
6870
github.com/golang/snappy v0.0.4 // indirect
@@ -73,11 +75,10 @@ require (
7375
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
7476
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7577
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
76-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
78+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7779
github.com/hashicorp/errwrap v1.1.0 // indirect
7880
github.com/hashicorp/go-multierror v1.1.1 // indirect
7981
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
80-
github.com/imdario/mergo v0.3.13 // indirect
8182
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
8283
github.com/jackc/pgconn v1.14.3 // indirect
8384
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -87,55 +88,55 @@ require (
8788
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
8889
github.com/jackc/pgtype v1.14.0 // indirect
8990
github.com/jackc/pgx/v4 v4.18.2 // indirect
91+
github.com/jackc/pgx/v5 v5.6.0 // indirect
92+
github.com/jackc/puddle/v2 v2.2.1 // indirect
9093
github.com/jackpal/gateway v1.0.5 // indirect
9194
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
9295
github.com/jonboulle/clockwork v0.2.2 // indirect
93-
github.com/jrick/logrotate v1.0.0 // indirect
96+
github.com/jrick/logrotate v1.1.2 // indirect
9497
github.com/json-iterator/go v1.1.12 // indirect
95-
github.com/juju/clock v1.0.3 // indirect
96-
github.com/juju/errors v1.0.0 // indirect
9798
github.com/juju/loggo v1.0.0 // indirect
98-
github.com/juju/testing v1.0.2 // indirect
99-
github.com/juju/utils/v3 v3.0.2 // indirect
10099
github.com/kkdai/bstream v1.0.0 // indirect
101-
github.com/klauspost/compress v1.15.11 // indirect
102-
github.com/kr/pretty v0.3.1 // indirect
100+
github.com/klauspost/compress v1.17.9 // indirect
103101
github.com/lib/pq v1.10.9 // indirect
104102
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
105103
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
106-
github.com/lightninglabs/lndclient v0.18.0-1 // indirect
107-
github.com/lightninglabs/loop/swapserverrpc v1.0.8 // 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
108108
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
109109
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
110110
github.com/lightninglabs/pool/auctioneerrpc v1.1.2 // indirect
111-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
111+
github.com/lightninglabs/pool/poolrpc v1.0.0 // indirect
112+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
112113
github.com/lightningnetwork/lnd/cert v1.2.2 // indirect
113114
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
114-
github.com/lightningnetwork/lnd/fn v1.0.5 // indirect
115-
github.com/lightningnetwork/lnd/healthcheck v1.2.4 // indirect
116-
github.com/lightningnetwork/lnd/kvdb v1.4.8 // 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
117118
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
118-
github.com/lightningnetwork/lnd/sqldb v1.0.2 // indirect
119+
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
119120
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
120121
github.com/lightningnetwork/lnd/tlv v1.2.6 // indirect
121122
github.com/lightningnetwork/lnd/tor v1.1.2 // indirect
122123
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
123124
github.com/mattn/go-isatty v0.0.20 // indirect
124125
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
125126
github.com/miekg/dns v1.1.50 // indirect
126-
github.com/mitchellh/mapstructure v1.4.1 // indirect
127+
github.com/moby/docker-image-spec v1.3.1 // indirect
127128
github.com/moby/term v0.5.0 // indirect
128129
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
129130
github.com/modern-go/reflect2 v1.0.2 // indirect
130131
github.com/ncruces/go-strftime v0.1.9 // indirect
131132
github.com/opencontainers/go-digest v1.0.0 // indirect
132133
github.com/opencontainers/image-spec v1.0.2 // indirect
133-
github.com/opencontainers/runc v1.1.12 // indirect
134+
github.com/opencontainers/runc v1.1.14 // indirect
134135
github.com/ory/dockertest/v3 v3.10.0 // indirect
135136
github.com/pkg/errors v0.9.1 // indirect
136137
github.com/pmezard/go-difflib v1.0.0 // indirect
137138
github.com/prometheus/client_golang v1.14.0 // indirect
138-
github.com/prometheus/client_model v0.3.0 // indirect
139+
github.com/prometheus/client_model v0.4.0 // indirect
139140
github.com/prometheus/common v0.37.0 // indirect
140141
github.com/prometheus/procfs v0.8.0 // indirect
141142
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
@@ -154,51 +155,51 @@ require (
154155
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
155156
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
156157
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
157-
go.etcd.io/bbolt v1.3.7 // indirect
158-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
159-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
160-
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
161-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
162-
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
163-
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
164-
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
158+
go.etcd.io/bbolt v1.3.11 // indirect
159+
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
160+
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
161+
go.etcd.io/etcd/client/v2 v2.305.12 // indirect
162+
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
163+
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
164+
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
165+
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
165166
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
166-
go.opentelemetry.io/otel v1.21.0 // indirect
167-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
168-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
169-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
167+
go.opentelemetry.io/otel v1.32.0 // indirect
168+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
169+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
170+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
171171
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
172-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
173-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
172+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
173+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
174174
go.uber.org/atomic v1.10.0 // indirect
175175
go.uber.org/multierr v1.6.0 // indirect
176176
go.uber.org/zap v1.23.0 // indirect
177-
golang.org/x/crypto v0.22.0 // indirect
177+
golang.org/x/crypto v0.31.0 // indirect
178178
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
179-
golang.org/x/mod v0.16.0 // indirect
180-
golang.org/x/net v0.24.0 // indirect
181-
golang.org/x/sync v0.6.0 // indirect
182-
golang.org/x/sys v0.19.0 // indirect
183-
golang.org/x/term v0.19.0 // indirect
184-
golang.org/x/text v0.14.0 // 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
185185
golang.org/x/time v0.3.0 // indirect
186-
golang.org/x/tools v0.19.0 // indirect
186+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
187187
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
188-
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
189-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
188+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
189+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
190190
gopkg.in/errgo.v1 v1.0.1 // indirect
191191
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
192192
gopkg.in/yaml.v2 v2.4.0 // indirect
193193
gopkg.in/yaml.v3 v3.0.1 // indirect
194194
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
195-
modernc.org/libc v1.49.3 // indirect
195+
modernc.org/libc v1.50.9 // indirect
196196
modernc.org/mathutil v1.6.0 // indirect
197197
modernc.org/memory v1.8.0 // indirect
198-
modernc.org/sqlite v1.29.8 // indirect
198+
modernc.org/sqlite v1.30.0 // indirect
199199
modernc.org/strutil v1.2.0 // indirect
200200
modernc.org/token v1.1.0 // indirect
201201
nhooyr.io/websocket v1.8.7 // indirect
202+
pgregory.net/rapid v1.1.0 // indirect
202203
sigs.k8s.io/yaml v1.2.0 // indirect
203204
)
204205

@@ -209,6 +210,6 @@ replace github.com/lightninglabs/lightning-node-connect/hashmailrpc => ../../has
209210
// We want to format raw bytes as hex instead of base64. The forked version
210211
// allows us to specify that as an option. This is required for the
211212
// taproot-assets dependency to function properly.
212-
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
213+
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display
213214

214-
go 1.22.3
215+
go 1.22.6

0 commit comments

Comments
 (0)