Nodeguard upgrade, swaps in progress revamp,

.justfile

@@ -17,10 +17,6 @@ install-loopd-loop:
 
 compile-nodeguard-proto:
     rm -rf nodeguard && protoc -I rpc --go_out=. --go-grpc_out=.  rpc/*.proto && mockgen -destination ./nodeguard/nodeguard_mock.go -source nodeguard/nodeguard_grpc.pb.go  -package nodeguard && mockgen -destination ./nodeguard/nodeguard_mock.go -source nodeguard/nodeguard_grpc.pb.go  -package nodeguard
-compile-lnd-client-mock:
-    mockgen -destination lightning_rpc_mock.go -source lnd/lnrpc/lightning_grpc.pb.go  -package main
-compile-provider-mock:
-    mockgen -destination ./provider/provider_mock.go -source provider/provider.go  -package provider && mockgen -destination ./provider/loopd_mock.go -source loop/looprpc/client_grpc.pb.go  -package provider 
 cover-test:
     go test ./... -coverprofile=coverage.out; go tool cover -html=coverage.out
 start-loopserver: build-loopserver

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.4-alpine AS builder
+FROM golang:1.25-alpine AS builder
     WORKDIR /src/
     COPY . .
     RUN go get -d -v ./...

README.md

@@ -23,6 +23,7 @@ Flags:
       --nodeguardHost string           Hostname:port to connect to nodeguard
       --pollingInterval string         Interval to poll data (default "15s")
       --retriesBeforeBackoff int       Number of retries before applying backoff to the swap (default 3)
+      --swapLockTimeout string         Timeout for swap locks to automatically expire (default "30m")
       --swapPublicationOffset string   Swap publication deadline offset (Maximum time for the swap provider to publish the swap) (default "60m")
       --sweepConfTarget string         Target number of confirmations for swaps, this uses bitcoin core broken estimator, procced with caution (default "400")
 ```
@@ -63,6 +64,7 @@ All the flags can be set as environment variables, with the following format, ex
 - LOGLEVEL (optional) : Log level (default info) from: {trace, debug, info, warn, error, fatal, panic}
 - LOGFORMAT (optional) : Log format (default json) from: {json, text}
 - SWAPPUBLICATIONOFFSET (optional) : Swap publication deadline offset (Maximum time for the swap provider to publish the swap) (default 30m)
+- SWAPLOCKTIMEOUT (optional) : Timeout for swap locks to automatically expire (default 30m)
 - RETRIESBEFOREBACKOFF (optional) : Number of retries before applying backoff to the swap (default: 3)
 - BACKOFFCOEFFICIENT (optional) : Coefficient to apply to the backoff (default: 0.95)
 - BACKOFFLIMIT (optional) : Limit coefficient of the backoff (default: 0.1)

flags.go

@@ -125,6 +125,10 @@ func init() {
 	rootCmd.Flags().String("sweepConfTarget", "400", "Target number of confirmations for swaps, this uses bitcoin core broken estimator, procced with caution")
 	viper.BindPFlag("sweepConfTarget", rootCmd.Flags().Lookup("sweepConfTarget"))
 
+	// Swap lock timeout
+	rootCmd.Flags().String("swapLockTimeout", "30m", "Timeout for swap locks to automatically expire (e.g. 30m, 1h, 45m)")
+	viper.BindPFlag("swapLockTimeout", rootCmd.Flags().Lookup("swapLockTimeout"))
+
 	//Now we set the global vars
 
 	pollingInterval = viper.GetDuration("pollingInterval")

liquidator.go

@@ -639,8 +639,9 @@ func performSwap(info ManageChannelLiquidityInfo, channel *lnrpc.Channel, swapAm
 		WalletId:       rule.SwapWalletId,
 		Address:        resp.InvoiceBTCAddress,
 		Amount:         swapAmount,
+		Destinations:   []*nodeguard.Destination{{Address: resp.InvoiceBTCAddress, AmountSats: swapAmount}},
 		Description:    fmt.Sprintf("Swap %v", resp.SwapId),
-		MempoolFeeRate: nodeguard.FEES_TYPE_ECONOMY_FEE,
+		MempoolFeeRate: nodeguard.FEES_TYPE_FASTEST_FEE,
 	}
 
 	withdrawalResponse, err := info.nodeguardClient.RequestWithdrawal(info.ctx, &withdrawalRequest)