looprpc, swapserverrpc: bump protobuf deps

assets/client.go

@@ -306,7 +306,7 @@ func getClientConn(config *TapdConfig) (*grpc.ClientConn, error) {
 	}
 
 	// Dial the gRPC server.
-	conn, err := grpc.Dial(config.Host, opts...)
+	conn, err := grpc.NewClient(config.Host, opts...)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -39,7 +39,7 @@ require (
 	go.etcd.io/bbolt v1.4.3
 	golang.org/x/sync v0.18.0
 	google.golang.org/grpc v1.64.1
-	google.golang.org/protobuf v1.36.5
+	google.golang.org/protobuf v1.36.11
 	gopkg.in/macaroon-bakery.v2 v2.3.0
 	gopkg.in/macaroon.v2 v2.1.0
 	modernc.org/sqlite v1.34.5

loopd/daemon.go

@@ -892,7 +892,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			defer infof("Static address manager stopped")
 
 			err := staticAddressManager.Run(d.mainCtx, initChan)
-			if err != nil && !errors.Is(context.Canceled, err) {
+			if err != nil && !errors.Is(err, context.Canceled) {
 				d.internalErrChan <- err
 			}
 		}()
@@ -924,7 +924,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			defer infof("Static address deposit manager stopped")
 
 			err := depositManager.Run(d.mainCtx, initChan)
-			if err != nil && !errors.Is(context.Canceled, err) {
+			if err != nil && !errors.Is(err, context.Canceled) {
 				d.internalErrChan <- err
 			}
 		}()
@@ -956,7 +956,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			defer infof("Static address withdrawal manager stopped")
 
 			err := withdrawalManager.Run(d.mainCtx, initChan)
-			if err != nil && !errors.Is(context.Canceled, err) {
+			if err != nil && !errors.Is(err, context.Canceled) {
 				d.internalErrChan <- err
 			}
 		}()
@@ -992,7 +992,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			infof("Starting static address loop-in manager...")
 			defer infof("Static address loop-in manager stopped")
 			err := staticLoopInManager.Run(d.mainCtx, initChan)
-			if err != nil && !errors.Is(context.Canceled, err) {
+			if err != nil && !errors.Is(err, context.Canceled) {
 				d.internalErrChan <- err
 			}
 		}()

loopdb/store.go

@@ -194,7 +194,7 @@ func NewBoltSwapStore(dbPath string, chainParams *chaincfg.Params) (
 	bdb, err := bbolt.Open(path, 0600, &bbolt.Options{
 		Timeout: DefaultLoopDBTimeout,
 	})
-	if err == bbolt.ErrTimeout {
+	if errors.Is(err, bbolt.ErrTimeout) {
 		return nil, fmt.Errorf("%w: couldn't obtain exclusive lock on "+
 			"%s, timed out after %v", bbolt.ErrTimeout, path,
 			DefaultLoopDBTimeout)

loopin_test.go

@@ -593,7 +593,7 @@ func TestAbandonPublishedHtlcState(t *testing.T) {
 
 	height := int32(600)
 
-	cfg, err, inSwap := startNewLoopIn(t, ctx, height)
+	cfg, inSwap, err := startNewLoopIn(t, ctx, height)
 	require.NoError(t, err)
 
 	advanceToPublishedHtlc(t, ctx)
@@ -663,7 +663,7 @@ func TestAbandonSettledInvoiceState(t *testing.T) {
 
 	height := int32(600)
 
-	cfg, err, inSwap := startNewLoopIn(t, ctx, height)
+	cfg, inSwap, err := startNewLoopIn(t, ctx, height)
 	require.NoError(t, err)
 
 	advanceToPublishedHtlc(t, ctx)
@@ -760,7 +760,7 @@ func advanceToPublishedHtlc(t *testing.T, ctx *loopInTestContext) SwapInfo {
 }
 
 func startNewLoopIn(t *testing.T, ctx *loopInTestContext, height int32) (
-	*swapConfig, error, *loopInSwap) {
+	*swapConfig, *loopInSwap, error) {
 
 	cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server, nil)
 
@@ -783,5 +783,6 @@ func startNewLoopIn(t *testing.T, ctx *loopInTestContext, height int32) (
 		}
 		ctx.errChan <- err
 	}()
-	return cfg, err, inSwap
+
+	return cfg, inSwap, err
 }

looprpc/Dockerfile

@@ -1,17 +1,17 @@
-FROM golang:1.21.9-bookworm
+FROM golang:1.24.9-trixie
 
 RUN apt-get update && apt-get install -y \
   git \
   protobuf-compiler='3.21.12*' \
-  clang-format='1:14.0*'
+  clang-format='1:19.0*'
 
 # We don't want any default values for these variables to make sure they're
 # explicitly provided by parsing the go.mod file. Otherwise we might forget to
 # update them here if we bump the versions.
 ARG PROTOBUF_VERSION
 ARG GRPC_GATEWAY_VERSION
 
-ENV PROTOC_GEN_GO_GRPC_VERSION="v1.1.0"
+ENV PROTOC_GEN_GO_GRPC_VERSION="v1.6.0"
 ENV FALAFEL_VERSION="v0.9.1"
 ENV GOCACHE=/tmp/build/.cache
 ENV GOMODCACHE=/tmp/build/.modcache