diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37096a6ac..09bfe47d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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.12 + GO_VERSION: 1.24.6 jobs: ######################## diff --git a/Dockerfile b/Dockerfile index 98f2e8beb..5293e7713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.12-alpine3.22@sha256:383395b794dffa5b53012a212365d40c8e37109a626ca30d6151c8348d380b5f as golangbuilder +FROM golang:1.24.6-alpine3.22@sha256:c8c5f95d64aa79b6547f3b626eb84b16a7ce18a139e3e9ca19a8c078b85ba80d as golangbuilder # Instead of checking out from git again, we just copy the whole working # directory of the previous stage that includes the generated static assets. diff --git a/Makefile b/Makefile index 2c3a5ea19..7f22b8c3e 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ 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.12 +GO_VERSION = 1.24.6 # LITD_COMPAT_VERSIONS is a space-separated list of litd versions that are # installed before running the integration tests which include backward diff --git a/autopilotserverrpc/go.mod b/autopilotserverrpc/go.mod index 8a0249850..d7e2e411a 100644 --- a/autopilotserverrpc/go.mod +++ b/autopilotserverrpc/go.mod @@ -1,6 +1,6 @@ module github.com/lightninglabs/lightning-terminal/autopilotserverrpc -go 1.23.12 +go 1.24.6 require ( google.golang.org/grpc v1.56.3 diff --git a/dev.Dockerfile b/dev.Dockerfile index b68f6134c..9bb836b8a 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -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.12-alpine3.22@sha256:383395b794dffa5b53012a212365d40c8e37109a626ca30d6151c8348d380b5f as golangbuilder +FROM golang:1.24.6-alpine3.22@sha256:c8c5f95d64aa79b6547f3b626eb84b16a7ce18a139e3e9ca19a8c078b85ba80d as golangbuilder # Instead of checking out from git again, we just copy the whole working # directory of the previous stage that includes the generated static assets. diff --git a/go.mod b/go.mod index 85fbe26fb..6659556ae 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/lightninglabs/lightning-terminal -go 1.23.12 +go 1.24.6 require ( github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 diff --git a/itest/network_harness.go b/itest/network_harness.go index 2e3329294..4b24fede1 100644 --- a/itest/network_harness.go +++ b/itest/network_harness.go @@ -270,12 +270,10 @@ out: n.EnsureConnected(t, n.Alice, n.Bob) - logLine := fmt.Sprintf( - "STARTING ============ %v ============\n", testCase, - ) + logLine := "STARTING ============ %v ============\n" - n.Alice.AddToLog(logLine) - n.Bob.AddToLog(logLine) + n.Alice.AddToLog(logLine, testCase) + n.Bob.AddToLog(logLine, testCase) return nil } diff --git a/litrpc/Dockerfile b/litrpc/Dockerfile index 73466eac9..d29663b6f 100644 --- a/litrpc/Dockerfile +++ b/litrpc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.12-bookworm@sha256:d22457a90736648a605cf54c33a7a310bb290e1ac78af2bcbc1d87821c52c4b7 +FROM golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c RUN apt-get update && apt-get install -y \ git \ diff --git a/litrpc/go.mod b/litrpc/go.mod index cd3a2f6e4..2804ffa2a 100644 --- a/litrpc/go.mod +++ b/litrpc/go.mod @@ -1,6 +1,6 @@ module github.com/lightninglabs/lightning-terminal/litrpc -go 1.23.12 +go 1.24.6 require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index b6f840c17..cfcbcb962 100644 --- a/make/builder.Dockerfile +++ b/make/builder.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.12-bookworm@sha256:d22457a90736648a605cf54c33a7a310bb290e1ac78af2bcbc1d87821c52c4b7 +FROM golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c MAINTAINER Olaoluwa Osuntokun diff --git a/perms/go.mod b/perms/go.mod index a5d50a285..7029fa609 100644 --- a/perms/go.mod +++ b/perms/go.mod @@ -1,6 +1,6 @@ module github.com/lightninglabs/lightning-terminal/perms -go 1.23.12 +go 1.24.6 require ( github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 diff --git a/rpc_proxy.go b/rpc_proxy.go index 885afa643..950b527be 100644 --- a/rpc_proxy.go +++ b/rpc_proxy.go @@ -364,7 +364,7 @@ func (p *rpcProxy) makeDirector(allowLitRPC bool) func(ctx context.Context, // gRPC server. handled, conn, err := p.subServerMgr.GetRemoteConn(requestURI) if err != nil { - return outCtx, nil, status.Errorf( + return outCtx, nil, status.Error( codes.Unavailable, err.Error(), ) } diff --git a/rpcmiddleware/proto.go b/rpcmiddleware/proto.go index 8a7778920..4e859244c 100644 --- a/rpcmiddleware/proto.go +++ b/rpcmiddleware/proto.go @@ -76,8 +76,12 @@ func RPCErrString(req *lnrpc.RPCMiddlewareRequest, format string, }, } + if len(args) > 0 { + format = fmt.Sprintf(format, args...) + } + if format != "" { - feedback.Error = fmt.Sprintf(format, args...) + feedback.Error = format } return resp, nil diff --git a/status/manager.go b/status/manager.go index b2837bc66..0dab6ce52 100644 --- a/status/manager.go +++ b/status/manager.go @@ -264,18 +264,20 @@ func (s *Manager) SetErrored(name string, errStr string, s.mu.Lock() defer s.mu.Unlock() - err := fmt.Sprintf(errStr, params...) + if len(params) > 0 { + errStr = fmt.Sprintf(errStr, params...) + } - log.Debugf("Setting the %s sub-server as errored: %s", name, err) + log.Debugf("Setting the %s sub-server as errored: %s", name, errStr) ss, ok := s.subServers[name] if !ok { return } - log.Errorf("could not start the %s sub-server: %s", name, err) + log.Errorf("could not start the %s sub-server: %s", name, errStr) ss.running = false - ss.err = err + ss.err = errStr ss.customStatus = "" } diff --git a/terminal.go b/terminal.go index c8e19ddfe..5eaa3c24a 100644 --- a/terminal.go +++ b/terminal.go @@ -431,10 +431,7 @@ func (g *LightningTerminal) start(ctx context.Context) error { var err error accountServiceErrCallback := func(err error) { - g.statusMgr.SetErrored( - subservers.ACCOUNTS, - err.Error(), - ) + g.statusMgr.SetErrored(subservers.ACCOUNTS, err.Error()) log.Errorf("Error thrown in the accounts service, keeping "+ "litd running: %v", err, diff --git a/tools/Dockerfile b/tools/Dockerfile index 2850a099b..f2779b028 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.12-bookworm@sha256:d22457a90736648a605cf54c33a7a310bb290e1ac78af2bcbc1d87821c52c4b7 +FROM golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c RUN apt-get update && apt-get install -y git ENV GOCACHE=/tmp/build/.cache diff --git a/tools/go.mod b/tools/go.mod index 4ae1aab2d..6309fcaa4 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/lightninglabs/lightning-terminal/tools -go 1.23.12 +go 1.24.6 require ( github.com/btcsuite/btcd v0.24.2