Skip to content

Bump dependencies and go to 1.23.10 #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: tapd-main-branch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
# If you change this value, please change it in the following files as well:
# /Dockerfile
# /dev.Dockerfile
GO_VERSION: 1.23.9
GO_VERSION: 1.23.10

jobs:
########################
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
# timeout for analysis
timeout: 4m
timeout: 10m

build-tags:
- autopilotrpc
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN apk add --no-cache --update alpine-sdk \

# The first stage is already done and all static assets should now be generated
# in the app/build sub directory.
FROM golang:1.23.9-alpine3.20@sha256:96917b18cf0bf6dc54f726696eb526fe6e6a1ab45e43d4a292aae11f3d503ffe as golangbuilder
FROM golang:1.23.10-alpine as golangbuilder

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The base image golang:1.23.10-alpine is not pinned to a specific digest. This can lead to non-reproducible builds and potential security issues if the tag is updated to point to a different image. It's best practice to pin the base image using its SHA256 digest.

You can find the digest by running docker pull golang:1.23.10-alpine and then docker inspect golang:1.23.10-alpine or docker images --digests golang:1.23.10-alpine.

For example:

FROM golang:1.23.10-alpine@sha256:<some-digest-hash>


# Instead of checking out from git again, we just copy the whole working
# directory of the previous stage that includes the generated static assets.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ PUBLIC_URL :=
# GO_VERSION is the Go version used for the release build, docker files, and
# GitHub Actions. This is the reference version for the project. All other Go
# versions are checked against this version.
GO_VERSION = 1.23.9
GO_VERSION = 1.23.10

# LITD_COMPAT_VERSIONS is a space-separated list of litd versions that are
# installed before running the integration tests which include backward
# compatibility tests. The list of versions must be in sync with any version
# used in the backwardCompat map in itest/litd_test_list_on_test.go.
LITD_COMPAT_VERSIONS = v0.14.1-alpha
LITD_COMPAT_VERSIONS = v0.14.1-alpha v0.15.0-alpha

LOOP_COMMIT := $(shell cat go.mod | \
grep $(LOOP_PKG) | \
Expand Down
2 changes: 1 addition & 1 deletion autopilotserverrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/lightninglabs/lightning-terminal/autopilotserverrpc

go 1.23.9
go 1.23.10

require (
google.golang.org/grpc v1.56.3
Expand Down
59 changes: 53 additions & 6 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN cd /go/src/github.com/lightninglabs/lightning-terminal/app \

# The first stage is already done and all static assets should now be generated
# in the app/build sub directory.
FROM golang:1.23.9-alpine3.20@sha256:96917b18cf0bf6dc54f726696eb526fe6e6a1ab45e43d4a292aae11f3d503ffe as golangbuilder
FROM golang:1.23.10-alpine as golangbuilder

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The base image golang:1.23.10-alpine is not pinned to a specific digest. This can lead to non-reproducible builds and potential security issues if the tag is updated to point to a different image. It's best practice to pin the base image using its SHA256 digest.

You can find the digest by running docker pull golang:1.23.10-alpine and then docker inspect golang:1.23.10-alpine or docker images --digests golang:1.23.10-alpine.

For example:

FROM golang:1.23.10-alpine@sha256:<some-digest-hash>


# Instead of checking out from git again, we just copy the whole working
# directory of the previous stage that includes the generated static assets.
Expand All @@ -30,13 +30,35 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g
# queries required to connect to linked containers succeed.
ENV GODEBUG netdns=cgo

# Allow forcing a specific lnd, taproot-assets, and taprpc version through a
# build argument.
# Allow forcing a specific lnd, taproot-assets, taprpc, and/or loop repo so that
# commits referenced by LND_VERSION, TAPROOT_ASSETS_VERSION, TAPRPC_VERSION, and
# LOOP_VERSION don't have to exist in the default repository. If any of these
# build arguments are not defined, the build continues using the default
# repository for that module. NOTE: If these arguments ARE defined then the
# corresponding `_VERSION` argument MUST also be defined, otherwise the build
# continues using the default repository defined for that module.
ARG LND_REPO
ARG TAPROOT_ASSETS_REPO
ARG TAPRPC_REPO
ARG LOOP_REPO

# Allow forcing a specific lnd, taproot-assets, taprpc, and/or loop version
# through a build argument.
# Please see https://go.dev/ref/mod#version-queries for the types of
# queries that can be used to define a version.
# If any of these build arguments are not defined then build uses the version
# already defined in go.mod and go.sum for that module.
# Note: If the corresponding `_REPO` argument is not defined, `go get` will
# be used along with `go mod tidy`, which sometimes may change the version you
# are trying to use because some other module requires the same requirement
# but of a different version. A trick to overcome this is to also use the
# `_REPO` argument and just put in the default repository for that module and
# that will cause a `go mod edit -replace=` to be used instead which won't have
# this issue.
ARG LND_VERSION
ARG TAPROOT_ASSETS_VERSION
ARG TAPRPC_VERSION
ARG LOOP_VERSION

# Need to restate this since running in a new container from above.
ARG NO_UI
Expand All @@ -46,17 +68,42 @@ RUN apk add --no-cache --update alpine-sdk make \
&& cd /go/src/github.com/lightninglabs/lightning-terminal \
# If a custom lnd version is supplied, force it now.
&& if [ -n "$LND_VERSION" ]; then \
go get -v github.com/lightningnetwork/lnd@$LND_VERSION \
# If a custom lnd repo is supplied, force it now.
if [ -n "$LND_REPO" ]; then \
go mod edit -replace=github.com/lightningnetwork/lnd=$LND_REPO@$LND_VERSION; \
else \
go get -v github.com/lightningnetwork/lnd@$LND_VERSION; \
fi \
&& go mod tidy; \
fi \
# If a custom taproot-assets version is supplied, force it now.
&& if [ -n "$TAPROOT_ASSETS_VERSION" ]; then \
go get -v github.com/lightninglabs/taproot-assets@$TAPROOT_ASSETS_VERSION \
# If a custom taproot-assets repo is supplied, force it now.
if [ -n "$TAPROOT_ASSETS_REPO" ]; then \
go mod edit -replace=github.com/lightninglabs/taproot-assets=$TAPROOT_ASSETS_REPO@$TAPROOT_ASSETS_VERSION; \
else \
go get -v github.com/lightninglabs/taproot-assets@$TAPROOT_ASSETS_VERSION; \
fi \
&& go mod tidy; \
fi \
# If a custom taprpc version is supplied, force it now.
&& if [ -n "$TAPRPC_VERSION" ]; then \
go get -v github.com/lightninglabs/taproot-assets/taprpc@$TAPRPC_VERSION \
# If a custom taprpc repo is supplied, force it now.
if [ -n "$TAPRPC_REPO" ]; then \
go mod edit -replace=github.com/lightninglabs/taproot-assets/taprpc=$TAPRPC_REPO@$TAPRPC_VERSION; \
else \
go get -v github.com/lightninglabs/taproot-assets/taprpc@$TAPRPC_VERSION; \
fi \
&& go mod tidy; \
fi \
# If a custom loop version is supplied, force it now.
&& if [ -n "$LOOP_VERSION" ]; then \
# If a custom loop repo is supplied, force it now.
if [ -n "$LOOP_REPO" ]; then \
go mod edit -replace=github.com/lightninglabs/loop=$LOOP_REPO@$LOOP_VERSION; \
else \
go get -v github.com/lightninglabs/loop@$LOOP_VERSION; \
fi \
&& go mod tidy; \
fi \
&& if [ "$NO_UI" -eq "1" ]; then \
Expand Down
48 changes: 25 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/lightninglabs/lightning-terminal

go 1.23.9
go 1.23.10

require (
github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6
github.com/btcsuite/btcd/btcec/v2 v2.3.4
github.com/btcsuite/btcd/btcutil v1.1.5
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
github.com/btcsuite/btcwallet/walletdb v1.5.1
github.com/davecgh/go-spew v1.1.1
github.com/go-errors/errors v1.0.1
Expand All @@ -26,18 +26,18 @@ require (
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2
github.com/lightninglabs/lightning-terminal/perms v1.0.1
github.com/lightninglabs/lndclient v0.19.0-12
github.com/lightninglabs/loop v0.31.2-beta
github.com/lightninglabs/loop v0.31.2-beta.0.20250730111713-3b0f6e84dc14
github.com/lightninglabs/loop/looprpc v1.0.8
github.com/lightninglabs/loop/swapserverrpc v1.0.15
github.com/lightninglabs/pool v0.6.6-beta
github.com/lightninglabs/pool/auctioneerrpc v1.1.3
github.com/lightninglabs/pool/poolrpc v1.0.1
github.com/lightninglabs/taproot-assets v0.6.1
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036
github.com/lightninglabs/taproot-assets v0.6.1-0.20250806135252-08f114ecaa27
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250806135252-08f114ecaa27
github.com/lightningnetwork/lnd v0.19.2-beta
github.com/lightningnetwork/lnd/cert v1.2.2
github.com/lightningnetwork/lnd/clock v1.1.1
github.com/lightningnetwork/lnd/fn v1.2.3
github.com/lightningnetwork/lnd/fn v1.2.5
github.com/lightningnetwork/lnd/fn/v2 v2.0.8
github.com/lightningnetwork/lnd/kvdb v1.4.16
github.com/lightningnetwork/lnd/sqldb v1.0.11-0.20250623231731-45c15646c68b
Expand All @@ -50,10 +50,10 @@ require (
github.com/stretchr/testify v1.10.0
github.com/urfave/cli v1.22.14
go.etcd.io/bbolt v1.3.11
golang.org/x/crypto v0.36.0
golang.org/x/crypto v0.37.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/net v0.38.0
golang.org/x/sync v0.12.0
golang.org/x/net v0.39.0
golang.org/x/sync v0.13.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gopkg.in/macaroon-bakery.v2 v2.3.0
Expand All @@ -76,7 +76,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
github.com/btcsuite/btcwallet v0.16.14 // indirect
github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3 // indirect
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
Expand All @@ -96,8 +96,8 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/decred/dcrd/lru v1.1.2 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/docker/cli v28.0.1+incompatible // indirect
github.com/docker/docker v28.0.1+incompatible // indirect
github.com/docker/cli v28.1.1+incompatible // indirect
github.com/docker/docker v28.1.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -127,12 +127,12 @@ require (
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/pgx/v4 v4.18.2 // indirect
github.com/jackc/pgx/v5 v5.6.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgtype v1.14.4 // indirect
github.com/jackc/pgx/v4 v4.18.3 // indirect
github.com/jackc/pgx/v5 v5.7.4 // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jackpal/gateway v1.0.5 // indirect
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
github.com/jedib0t/go-pretty/v6 v6.2.7 // indirect
Expand All @@ -148,7 +148,7 @@ require (
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 // indirect
github.com/lightninglabs/neutrino v0.16.1 // indirect
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240815225420-8b40adf04ab9 // indirect
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
Expand Down Expand Up @@ -213,8 +213,8 @@ require (
go.uber.org/zap v1.23.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
Expand Down Expand Up @@ -248,6 +248,8 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
// automatically, so we need to add it manually.
replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2

// tapd wants v0.19.0-12, but loop can't handle that yet. So we'll just use the
// previous version for now.
replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v0.19.0-11
replace github.com/lightningnetwork/lnd => github.com/GeorgeTsagk/lnd v0.0.0-20250806121655-c98792e8a1c1

replace github.com/lightningnetwork/lnd/sqldb => github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20250806121655-c98792e8a1c1

replace github.com/lightninglabs/lndclient => github.com/GeorgeTsagk/lndclient v0.0.0-20250806122136-d60d44f906c3
Comment on lines +251 to +255

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

These replace directives point to a personal fork (GeorgeTsagk). While this might be necessary for testing against unmerged pull requests in other repositories, it's a significant security risk and should not be merged into the main branch. Please ensure these are removed before this pull request is merged.

Loading
Loading