Skip to content
Merged
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.12
GO_VERSION: 1.24.6

jobs:
########################
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.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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.12
go 1.24.6

require (
google.golang.org/grpc v1.56.3
Expand Down
2 changes: 1 addition & 1 deletion 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.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.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 3 additions & 5 deletions itest/network_harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion litrpc/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion litrpc/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion make/builder.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.12-bookworm@sha256:d22457a90736648a605cf54c33a7a310bb290e1ac78af2bcbc1d87821c52c4b7
FROM golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c

MAINTAINER Olaoluwa Osuntokun <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion perms/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion rpc_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
)
}
Expand Down
6 changes: 5 additions & 1 deletion rpcmiddleware/proto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions status/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
}
5 changes: 1 addition & 4 deletions terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down