Skip to content

Commit 2e72f7a

Browse files
committed
Swaps
1 parent 4bac81f commit 2e72f7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+495
-178
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ env:
2525

2626
TRANCHES: 8
2727

28-
# If you change this please also update GO_VERSION in Makefile (then run
29-
# `make lint` to see where else it needs to be updated as well).
30-
GO_VERSION: 1.22.11
28+
# If you change this value, please change it in the following files as well:
29+
# /.travis.yml
30+
# /Dockerfile
31+
# /dev.Dockerfile
32+
# /make/builder.Dockerfile
33+
# /.github/workflows/release.yml
34+
GO_VERSION: 1.23.0
3135

3236
jobs:
3337
########################

.github/workflows/release.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ defaults:
1010
shell: bash
1111

1212
env:
13-
# If you change this please also update GO_VERSION in Makefile (then run
14-
# `make lint` to see where else it needs to be updated as well).
15-
GO_VERSION: 1.22.11
13+
# If you change this value, please change it in the following files as well:
14+
# /Dockerfile
15+
# /dev.Dockerfile
16+
# /make/builder.Dockerfile
17+
# /.github/workflows/main.yml
18+
GO_VERSION: 1.23.0
1619

1720
jobs:
1821
main:

.golangci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
run:
2-
# If you change this please also update GO_VERSION in Makefile (then run
3-
# `make lint` to see where else it needs to be updated as well).
4-
go: "1.22.11"
2+
go: "1.23.0"
53

64
# Abort after 10 minutes.
75
timeout: 10m

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# If you change this please also update GO_VERSION in Makefile (then run
2-
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.22.11-alpine as builder
1+
# If you change this value, please change it in the following files as well:
2+
# /dev.Dockerfile
3+
# /make/builder.Dockerfile
4+
# /.github/workflows/main.yml
5+
# /.github/workflows/release.yml
6+
FROM golang:1.23.0-alpine as builder
47

58
# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
69
# queries required to connect to linked containers succeed.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535
# GO_VERSION is the Go version used for the release build, docker files, and
3636
# GitHub Actions. This is the reference version for the project. All other Go
3737
# versions are checked against this version.
38-
GO_VERSION = 1.22.11
38+
GO_VERSION = 1.23.0
3939

4040
GOBUILD := $(LOOPVARFIX) go build -v
4141
GOINSTALL := $(LOOPVARFIX) go install -v

dev.Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# If you change this please also update GO_VERSION in Makefile (then run
2-
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.22.11-alpine as builder
1+
# If you change this value, please change it in the following files as well:
2+
# /Dockerfile
3+
# /make/builder.Dockerfile
4+
# /.github/workflows/main.yml
5+
# /.github/workflows/release.yml
6+
FROM golang:1.23.0-alpine as builder
47

58
LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
69

docker/btcd/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# If you change this please also update GO_VERSION in Makefile (then run
2-
# `make lint` to see where else it needs to be updated as well).
3-
FROM golang:1.22.11-alpine as builder
1+
FROM golang:1.23.0-alpine as builder
42

53
LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
64

docs/INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ the following commands for your OS:
100100
<summary>Linux (x86-64)</summary>
101101

102102
```
103-
wget https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz
103+
wget https://dl.google.com/go/go1.23.0.linux-amd64.tar.gz
104104
sha256sum go1.22.5.linux-amd64.tar.gz | awk -F " " '{ print $1 }'
105105
```
106106

go.mod

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/lightningnetwork/lnd
22

33
require (
4+
github.com/BoltzExchange/boltz-client v1.2.8-0.20241217064837-ea3afc0fc447
45
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
56
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
67
github.com/andybalholm/brotli v1.0.4
@@ -20,17 +21,17 @@ require (
2021
github.com/davecgh/go-spew v1.1.1
2122
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
2223
github.com/gabstv/go-bsdiff v1.0.5
23-
github.com/go-errors/errors v1.0.1
24+
github.com/go-errors/errors v1.4.2
2425
github.com/golang/protobuf v1.5.3
2526
github.com/gorilla/websocket v1.5.0
2627
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
2728
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
28-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
29+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
2930
github.com/jackc/pgx/v4 v4.18.2
3031
github.com/jackpal/gateway v1.0.5
3132
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad
3233
github.com/jedib0t/go-pretty/v6 v6.2.7
33-
github.com/jessevdk/go-flags v1.4.0
34+
github.com/jessevdk/go-flags v1.5.0
3435
github.com/jrick/logrotate v1.1.2
3536
github.com/kkdai/bstream v1.0.0
3637
github.com/lightninglabs/lightning-node-connect v0.3.1-alpha
@@ -48,25 +49,25 @@ require (
4849
github.com/lightningnetwork/lnd/ticker v1.1.1
4950
github.com/lightningnetwork/lnd/tlv v1.2.6
5051
github.com/lightningnetwork/lnd/tor v1.1.2
51-
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796
52+
github.com/ltcsuite/ltcd v0.22.1-beta
5253
github.com/miekg/dns v1.1.50
53-
github.com/prometheus/client_golang v1.11.1
54+
github.com/prometheus/client_golang v1.14.0
5455
github.com/stretchr/testify v1.9.0
5556
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02
5657
github.com/urfave/cli v1.22.9
5758
go.etcd.io/bbolt v1.3.11
5859
go.etcd.io/etcd/client/pkg/v3 v3.5.7
5960
go.etcd.io/etcd/client/v3 v3.5.7
60-
golang.org/x/crypto v0.22.0
61+
golang.org/x/crypto v0.31.0
6162
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
6263
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028
63-
golang.org/x/net v0.24.0
64-
golang.org/x/sync v0.7.0
65-
golang.org/x/term v0.19.0
64+
golang.org/x/net v0.25.0
65+
golang.org/x/sync v0.10.0
66+
golang.org/x/term v0.27.0
6667
golang.org/x/time v0.3.0
67-
google.golang.org/grpc v1.59.0
68+
google.golang.org/grpc v1.60.1
6869
google.golang.org/protobuf v1.33.0
69-
gopkg.in/macaroon-bakery.v2 v2.1.0
70+
gopkg.in/macaroon-bakery.v2 v2.3.0
7071
gopkg.in/macaroon.v2 v2.1.0
7172
pgregory.net/rapid v1.1.0
7273
)
@@ -83,36 +84,38 @@ require (
8384
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
8485
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
8586
github.com/btcsuite/winsvc v1.0.0 // indirect
86-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
87+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
8788
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8889
github.com/containerd/continuity v0.3.0 // indirect
89-
github.com/coreos/go-semver v0.3.0 // indirect
90-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
91-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
90+
github.com/coreos/go-semver v0.3.1 // indirect
91+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
92+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
9293
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
9394
github.com/decred/dcrd/lru v1.1.2 // indirect
9495
github.com/docker/cli v20.10.17+incompatible // indirect
95-
github.com/docker/docker v24.0.7+incompatible // indirect
96+
github.com/docker/docker v24.0.9+incompatible // indirect
9697
github.com/docker/go-connections v0.4.0 // indirect
9798
github.com/docker/go-units v0.5.0 // indirect
9899
github.com/dsnet/compress v0.0.1 // indirect
99100
github.com/dustin/go-humanize v1.0.1 // indirect
101+
github.com/fatih/color v1.15.0 // indirect
100102
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
101103
github.com/fsnotify/fsnotify v1.5.4 // indirect
102-
github.com/go-logr/logr v1.3.0 // indirect
104+
github.com/go-logr/logr v1.4.1 // indirect
103105
github.com/go-logr/stdr v1.2.2 // indirect
106+
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
104107
github.com/gogo/protobuf v1.3.2 // indirect
105-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
108+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
106109
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
107110
github.com/golang/snappy v0.0.4 // indirect
108-
github.com/google/btree v1.0.1 // indirect
111+
github.com/google/btree v1.1.2 // indirect
109112
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
110113
github.com/google/uuid v1.6.0 // indirect
111114
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
112115
github.com/hashicorp/errwrap v1.1.0 // indirect
113116
github.com/hashicorp/go-multierror v1.1.1 // indirect
114117
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
115-
github.com/imdario/mergo v0.3.12 // indirect
118+
github.com/imdario/mergo v0.3.13 // indirect
116119
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
117120
github.com/jackc/pgconn v1.14.3 // indirect
118121
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -123,9 +126,8 @@ require (
123126
github.com/jackc/pgtype v1.14.0 // indirect
124127
github.com/jackc/pgx/v5 v5.3.1 // indirect
125128
github.com/jackc/puddle v1.3.0 // indirect
126-
github.com/jonboulle/clockwork v0.2.2 // indirect
129+
github.com/jonboulle/clockwork v0.3.0 // indirect
127130
github.com/json-iterator/go v1.1.12 // indirect
128-
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
129131
github.com/klauspost/compress v1.15.11 // indirect
130132
github.com/lib/pq v1.10.9 // indirect
131133
github.com/lightninglabs/faraday v0.2.11-alpha // indirect
@@ -137,68 +139,69 @@ require (
137139
github.com/lightninglabs/pool/auctioneerrpc v1.1.0 // indirect
138140
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display // indirect
139141
github.com/lightninglabs/taproot-assets v0.2.3 // indirect
142+
github.com/mattn/go-colorable v0.1.13 // indirect
140143
github.com/mattn/go-isatty v0.0.20 // indirect
141144
github.com/mattn/go-runewidth v0.0.13 // indirect
142-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
143-
github.com/mitchellh/mapstructure v1.4.1 // indirect
145+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
146+
github.com/mitchellh/mapstructure v1.5.0 // indirect
144147
github.com/moby/term v0.5.0 // indirect
145148
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
146149
github.com/modern-go/reflect2 v1.0.2 // indirect
147150
github.com/ncruces/go-strftime v0.1.9 // indirect
148-
github.com/nxadm/tail v1.4.8 // indirect
149151
github.com/onsi/gomega v1.26.0 // indirect
150152
github.com/opencontainers/go-digest v1.0.0 // indirect
151153
github.com/opencontainers/image-spec v1.0.2 // indirect
152-
github.com/opencontainers/runc v1.1.12 // indirect
154+
github.com/opencontainers/runc v1.1.14 // indirect
153155
github.com/ory/dockertest/v3 v3.10.0 // indirect
154156
github.com/pkg/errors v0.9.1 // indirect
155157
github.com/pmezard/go-difflib v1.0.0 // indirect
156158
github.com/prometheus/client_model v0.4.0 // indirect
157-
github.com/prometheus/common v0.30.0 // indirect
158-
github.com/prometheus/procfs v0.7.3 // indirect
159+
github.com/prometheus/common v0.39.0 // indirect
160+
github.com/prometheus/procfs v0.9.0 // indirect
159161
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
160162
github.com/rivo/uniseg v0.2.0 // indirect
161163
github.com/rogpeppe/fastuuid v1.2.0 // indirect
162-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
163-
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
164+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
164165
github.com/sirupsen/logrus v1.9.2 // indirect
165166
github.com/soheilhy/cmux v0.1.5 // indirect
166167
github.com/spf13/pflag v1.0.5 // indirect
167168
github.com/stretchr/objx v0.5.2 // indirect
168169
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
169-
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
170+
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
171+
github.com/vulpemventures/fastsha256 v0.0.0-20160815193821-637e65642941 // indirect
172+
github.com/vulpemventures/go-elements v0.5.3 // indirect
173+
github.com/vulpemventures/go-secp256k1-zkp v1.1.6 // indirect
170174
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
171175
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
172176
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
173177
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
174-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
178+
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
175179
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
176180
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
177181
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
178182
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
179183
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
180184
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
181185
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
182-
go.opentelemetry.io/otel v1.20.0 // indirect
183-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
184-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
185-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
186-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
187-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
188-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
189-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
186+
go.opentelemetry.io/otel v1.22.0 // indirect
187+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
188+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
189+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
190+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
191+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
192+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
190193
go.uber.org/atomic v1.10.0 // indirect
191-
go.uber.org/multierr v1.6.0 // indirect
192-
go.uber.org/zap v1.23.0 // indirect
193-
golang.org/x/mod v0.16.0 // indirect
194-
golang.org/x/sys v0.19.0 // indirect
195-
golang.org/x/text v0.14.0 // indirect
196-
golang.org/x/tools v0.19.0 // indirect
194+
go.uber.org/multierr v1.9.0 // indirect
195+
go.uber.org/zap v1.24.0 // indirect
196+
golang.org/x/mod v0.17.0 // indirect
197+
golang.org/x/sys v0.28.0 // indirect
198+
golang.org/x/text v0.21.0 // indirect
199+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
197200
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
198201
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
199202
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
200203
gopkg.in/errgo.v1 v1.0.1 // indirect
201-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
204+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
202205
gopkg.in/yaml.v2 v2.4.0 // indirect
203206
gopkg.in/yaml.v3 v3.0.1 // indirect
204207
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
@@ -209,7 +212,7 @@ require (
209212
modernc.org/strutil v1.2.0 // indirect
210213
modernc.org/token v1.1.0 // indirect
211214
nhooyr.io/websocket v1.8.7 // indirect
212-
sigs.k8s.io/yaml v1.2.0 // indirect
215+
sigs.k8s.io/yaml v1.3.0 // indirect
213216
)
214217

215218
// This replace is for https://github.com/advisories/GHSA-25xm-hr59-7c27
@@ -241,6 +244,6 @@ replace github.com/lightninglabs/neutrino => github.com/djkazic/neutrino v0.16.1
241244

242245
// If you change this please also update .github/pull_request_template.md,
243246
// docs/INSTALL.md and GO_IMAGE in lnrpc/gen_protos_docker.sh.
244-
go 1.22.6
247+
go 1.23.0
245248

246249
retract v0.0.2

0 commit comments

Comments
 (0)