Skip to content

Commit 3626c13

Browse files
authored
Merge pull request #73 from djkazic/lnd-v0.20-0-beta.rc1
[HOLD] build: bump lnd to v0.20.0-beta.rc1
2 parents c1fcd7c + 0fadd2d commit 3626c13

File tree

8 files changed

+162
-109
lines changed

8 files changed

+162
-109
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
GOCACHE: /home/runner/work/go/pkg/build
1818
GOPATH: /home/runner/work/go
1919

20-
GO_VERSION: 1.23.12
20+
GO_VERSION: 1.24.6
2121

2222
jobs:
2323
########################

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG GO_VERSION=1.23.12
1+
ARG GO_VERSION=1.24.6
22
ARG BASE_IMAGE=lightninglabs/lnd
3-
ARG BASE_IMAGE_VERSION=v0.19.3-beta
3+
ARG BASE_IMAGE_VERSION=v0.20.0-beta.rc1
44

55
FROM golang:${GO_VERSION}-alpine as builder
66

dev.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG GO_VERSION=1.23.12
1+
ARG GO_VERSION=1.24.6
22
ARG BASE_IMAGE=lightninglabs/lnd
3-
ARG BASE_IMAGE_VERSION=v0.19.3-beta
3+
ARG BASE_IMAGE_VERSION=v0.20.0-beta.rc1
44

55
FROM golang:${GO_VERSION}-alpine as builder
66

go.mod

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ require (
44
github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6
55
github.com/btcsuite/btcd/btcutil v1.1.5
66
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
7-
github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3
7+
github.com/btcsuite/btcwallet v0.16.17
88
github.com/btcsuite/btcwallet/walletdb v1.5.1 // indirect
99
github.com/fergusstrange/embedded-postgres v1.25.0
1010
github.com/jessevdk/go-flags v1.4.0
1111
github.com/kkdai/bstream v1.0.0
1212
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
13-
github.com/lightningnetwork/lnd v0.19.3-beta
13+
github.com/lightningnetwork/lnd v0.20.0-beta.rc1
1414
github.com/lightningnetwork/lnd/kvdb v1.4.16
15-
github.com/stretchr/testify v1.9.0
16-
go.etcd.io/bbolt v1.3.11
15+
github.com/stretchr/testify v1.11.1
16+
go.etcd.io/bbolt v1.4.3
1717
google.golang.org/grpc v1.59.0
1818
k8s.io/api v0.18.3
1919
k8s.io/apimachinery v0.18.3
@@ -23,6 +23,7 @@ require (
2323
require github.com/lightningnetwork/lnd/healthcheck v1.2.6
2424

2525
require (
26+
dario.cat/mergo v1.0.1 // indirect
2627
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2728
github.com/Microsoft/go-winio v0.6.1 // indirect
2829
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // 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.7+incompatible // indirect
55+
github.com/docker/cli v28.1.1+incompatible // indirect
56+
github.com/docker/docker v28.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
59-
github.com/go-logr/logr v1.3.0 // indirect
60+
github.com/go-logr/logr v1.4.3 // indirect
6061
github.com/go-logr/stdr v1.2.2 // indirect
62+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
6163
github.com/gofrs/uuid v4.2.0+incompatible // indirect
6264
github.com/gogo/protobuf v1.3.2 // indirect
63-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
65+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6466
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
65-
github.com/golang/protobuf v1.5.3 // indirect
67+
github.com/golang/protobuf v1.5.4 // indirect
6668
github.com/golang/snappy v0.0.4 // indirect
6769
github.com/google/btree v1.0.1 // indirect
6870
github.com/google/gofuzz v1.1.0 // indirect
@@ -77,17 +79,17 @@ require (
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.12 // 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
8485
github.com/jackc/pgio v1.0.0 // indirect
8586
github.com/jackc/pgpassfile v1.0.0 // indirect
8687
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
87-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
88-
github.com/jackc/pgtype v1.14.0 // indirect
89-
github.com/jackc/pgx/v4 v4.18.2 // indirect
90-
github.com/jackc/pgx/v5 v5.3.1 // indirect
88+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
89+
github.com/jackc/pgtype v1.14.4 // indirect
90+
github.com/jackc/pgx/v4 v4.18.3 // indirect
91+
github.com/jackc/pgx/v5 v5.7.4 // indirect
92+
github.com/jackc/puddle/v2 v2.2.2 // indirect
9193
github.com/jonboulle/clockwork v0.2.2 // indirect
9294
github.com/jrick/logrotate v1.1.2 // indirect
9395
github.com/json-iterator/go v1.1.11 // indirect
@@ -104,26 +106,26 @@ require (
104106
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
105107
github.com/lightninglabs/neutrino v0.16.1 // indirect
106108
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
107-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
109+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240815225420-8b40adf04ab9 // indirect
108110
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
109111
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
110112
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
111-
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
113+
github.com/lightningnetwork/lnd/sqldb v1.0.11-0.20250930033359-90c96c7df117 // indirect
112114
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
113-
github.com/lightningnetwork/lnd/tlv v1.3.1 // indirect
115+
github.com/lightningnetwork/lnd/tlv v1.3.2 // indirect
114116
github.com/lightningnetwork/lnd/tor v1.1.6 // indirect
115117
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
116118
github.com/mattn/go-isatty v0.0.20 // indirect
117119
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
118120
github.com/miekg/dns v1.1.43 // indirect
119-
github.com/mitchellh/mapstructure v1.4.1 // indirect
121+
github.com/moby/docker-image-spec v1.3.1 // indirect
120122
github.com/moby/term v0.5.0 // indirect
121123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
122124
github.com/modern-go/reflect2 v1.0.1 // indirect
123125
github.com/ncruces/go-strftime v0.1.9 // indirect
124126
github.com/opencontainers/go-digest v1.0.0 // indirect
125127
github.com/opencontainers/image-spec v1.0.2 // indirect
126-
github.com/opencontainers/runc v1.1.12 // indirect
128+
github.com/opencontainers/runc v1.1.14 // indirect
127129
github.com/ory/dockertest/v3 v3.10.0 // indirect
128130
github.com/pkg/errors v0.9.1 // indirect
129131
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -135,7 +137,7 @@ require (
135137
github.com/rogpeppe/fastuuid v1.2.0 // indirect
136138
github.com/sirupsen/logrus v1.9.2 // indirect
137139
github.com/soheilhy/cmux v0.1.5 // indirect
138-
github.com/spf13/pflag v1.0.5 // indirect
140+
github.com/spf13/pflag v1.0.6 // indirect
139141
github.com/stretchr/objx v0.5.2 // indirect
140142
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
141143
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
@@ -152,28 +154,30 @@ require (
152154
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
153155
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
154156
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
157+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
155158
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
156-
go.opentelemetry.io/otel v1.20.0 // indirect
159+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
160+
go.opentelemetry.io/otel v1.38.0 // indirect
157161
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
158162
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
159-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
160-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
161-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
163+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
164+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
165+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
162166
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
163167
go.uber.org/atomic v1.7.0 // indirect
164168
go.uber.org/multierr v1.6.0 // indirect
165169
go.uber.org/zap v1.17.0 // indirect
166-
golang.org/x/crypto v0.22.0 // indirect
170+
golang.org/x/crypto v0.37.0 // indirect
167171
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
168-
golang.org/x/mod v0.16.0 // indirect
169-
golang.org/x/net v0.24.0 // indirect
172+
golang.org/x/mod v0.17.0 // indirect
173+
golang.org/x/net v0.39.0 // indirect
170174
golang.org/x/oauth2 v0.14.0 // indirect
171-
golang.org/x/sync v0.7.0 // indirect
172-
golang.org/x/sys v0.19.0 // indirect
173-
golang.org/x/term v0.19.0 // indirect
174-
golang.org/x/text v0.14.0 // indirect
175+
golang.org/x/sync v0.13.0 // indirect
176+
golang.org/x/sys v0.35.0 // indirect
177+
golang.org/x/term v0.31.0 // indirect
178+
golang.org/x/text v0.24.0 // indirect
175179
golang.org/x/time v0.3.0 // indirect
176-
golang.org/x/tools v0.19.0 // indirect
180+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
177181
google.golang.org/appengine v1.6.7 // indirect
178182
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
179183
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -202,6 +206,6 @@ require (
202206

203207
// We want to format raw bytes as hex instead of base64. The forked version
204208
// allows us to specify that as an option.
205-
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
209+
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display
206210

207-
go 1.23.12
211+
go 1.24.6

0 commit comments

Comments
 (0)