Merge pull request #112 from ellemouton/slog

multi: bump LND, aperture and btclog deps

Author: ellemouton

.github/workflows/main.yml

@@ -16,7 +16,7 @@ env:
   # go needs absolute directories, using the $HOME variable doesn't work here.
   GOCACHE: /home/runner/work/go/pkg/build
   GOPATH: /home/runner/work/go
-  GO_VERSION: 1.22.6
+  GO_VERSION: 1.23.6
 
 jobs:
   ########################

.golangci.yml

@@ -1,6 +1,6 @@
 run:
   # timeout for analysis
-  deadline: 4m
+  timeout: 4m
   build-tags:
     - autopilotrpc
     - chainrpc
@@ -40,7 +40,7 @@ linters:
   enable-all: true
   disable:
     # Allow dynamic errors.
-    - goerr113
+    - err113
 
     # We want to allow short variable names.
     - varnamelen
@@ -70,36 +70,34 @@ linters:
     # guidelines. See https://github.com/mvdan/gofumpt/issues/235.
     - gofumpt
 
-    # Disable gomnd even though we generally don't use magic numbers, but there
-    # are exceptions where this improves readability.
-    - gomnd
-
     # Disable whitespace linter as it has conflict rules against our
     # contribution guidelines. See https://github.com/bombsimon/wsl/issues/109.
     #
     # TODO: bring it back when the above issue is fixed.
     - wsl
 
     # Deprecated linters. See https://golangci-lint.run/usage/linters/.
-    - interfacer
-    - golint
-    - maligned
-    - scopelint
-    - exhaustivestruct
     - bodyclose
     - contextcheck
     - nilerr
     - noctx
     - rowserrcheck
     - sqlclosecheck
-    - structcheck
     - tparallel
     - unparam
     - wastedassign
-    - ifshort
-    - varcheck
-    - deadcode
-    - nosnakecase
+
+    # New linters that need a code adjustment first.
+    - depguard
+    - testifylint
+    - intrange
+
+    # We use a replace directive for a custom protobuf library.
+    - gomoddirectives
+
+    # The linter is too aggressive and doesn't add much value since reviewers
+    # will also catch magic numbers that make sense to extract.
+    - mnd
 
 issues:
   # Only show newly introduced problems.

Makefile

@@ -7,7 +7,7 @@ GOACC_PKG := github.com/ory/go-acc
 GO_BIN := ${GOPATH}/bin
 LINT_BIN := $(GO_BIN)/golangci-lint
 
-LINT_COMMIT := v1.51.2
+LINT_COMMIT := v1.64.5
 
 GOBUILD := go build -v
 GOINSTALL := go install -v

cmd/wasm-client/go.mod

@@ -5,7 +5,7 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/lightninglabs/faraday v0.2.13-alpha
-	github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee4e7ff52f83
+	github.com/lightninglabs/lightning-node-connect v0.3.3-alpha.0.20250303090341-f823ad04b9de
 	github.com/lightninglabs/lightning-terminal v0.14.0-alpha
 	github.com/lightninglabs/loop v0.29.0-beta
 	github.com/lightninglabs/pool v0.6.5-beta.0.20241015105339-044cb451b5df
@@ -203,7 +203,9 @@ require (
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 
-replace github.com/lightninglabs/lightning-node-connect => ../../
+// TODO: uncomment once LiT has been updated to point to the latest version of
+// LNC and LND.
+// replace github.com/lightninglabs/lightning-node-connect => ../../
 
 replace github.com/lightninglabs/lightning-node-connect/hashmailrpc => ../../hashmailrpc
 

cmd/wasm-client/go.sum

@@ -1123,6 +1123,8 @@ github.com/lightninglabs/faraday v0.2.13-alpha h1:rpk3IM5WyyEd/wghGWpGcUyDazQhwd
 github.com/lightninglabs/faraday v0.2.13-alpha/go.mod h1:hzuTMntsY7X3gxeBLZ6kYduZlKtXUgqtk1WnnEF0aIg=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
+github.com/lightninglabs/lightning-node-connect v0.3.3-alpha.0.20250303090341-f823ad04b9de h1:6BgRi1DJsbQT65Xpv2MHa74NkkjcTsjvSnkanrc5Vfo=
+github.com/lightninglabs/lightning-node-connect v0.3.3-alpha.0.20250303090341-f823ad04b9de/go.mod h1:XVUoEXsLibWHAeSCn9mjvQUnmu+id8tSYl3WiUtVXAA=
 github.com/lightninglabs/lightning-terminal v0.14.0-alpha h1:pHc5UZ/tlvEk5d4dcazIR7gC0Vco1utRMHpG5dD3b/I=
 github.com/lightninglabs/lightning-terminal v0.14.0-alpha/go.mod h1:wUWNHFligQcGcijmIu6KjEOlWKEN8xcZUzhIgyZm8f8=
 github.com/lightninglabs/lightning-terminal/litrpc v1.0.0 h1:7FBvcridXz+EhftcjjbKR6l67pT86YnDFtgLh0A7Htk=

gbn/gbn_conn.go

@@ -8,8 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/btcsuite/btclog"
-	"github.com/lightningnetwork/lnd/build"
+	"github.com/btcsuite/btclog/v2"
 )
 
 var (
@@ -80,8 +79,7 @@ func newGoBackNConn(ctx context.Context, cfg *config,
 	ctxc, cancel := context.WithCancel(ctx)
 
 	// Construct a new prefixed logger.
-	prefix := fmt.Sprintf("(%s)", loggerPrefix)
-	plog := build.NewPrefixLog(prefix, log)
+	plog := log.WithPrefix(fmt.Sprintf("(%s)", loggerPrefix))
 
 	timeoutManager := NewTimeOutManager(plog, cfg.timeoutOptions...)
 

gbn/log.go

@@ -1,7 +1,7 @@
 package gbn
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

gbn/queue.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 type queueCfg struct {

gbn/syncer.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 const (

gbn/timeout_manager.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 const (