multi: update LND and friends

This commit updates:
- LND
- pool
- loop
- taproot-assets
- faraday
- lighting-node-connect
- aperture
- lndclient
- btclog

We start using the new btclog v2 library and the associated breaking
changes in the lnd/build package.

With this commit, we deprecate the `--remote.lit-maxlogfiles` and
`--remote.lit-maxlogfilesize` options and introduce new logging options
under the `--remote.lit-logging` namespace.

Finally, the LND update introduced a new `MaxBlocksMinedPerTest`
variable in the `lntest` package that we now need to override in order
for our itests to pass.

Author: ellemouton

accounts/context.go

@@ -4,8 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/btcsuite/btclog"
-	"github.com/lightningnetwork/lnd/build"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // ContextKey is the type that we use to identify account specific values in the
@@ -95,5 +94,5 @@ func requestScopedValuesFromCtx(ctx context.Context) (btclog.Logger,
 
 	prefix := fmt.Sprintf("[account: %s, request: %d]", acc.ID, reqID)
 
-	return build.NewPrefixLog(prefix, log), acc, reqID, nil
+	return log.WithPrefix(prefix), acc, reqID, nil
 }

accounts/log.go

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

autopilotserver/log.go

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

autopilotserver/mock/log.go

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

config.go

@@ -54,9 +54,7 @@ const (
 
 	defaultConfigFilename = "lit.conf"
 
-	defaultLogLevel       = "info"
-	defaultMaxLogFiles    = 3
-	defaultMaxLogFileSize = 10
+	defaultLogLevel = "info"
 
 	defaultLetsEncryptSubDir          = "letsencrypt"
 	defaultLetsEncryptListen          = ":80"
@@ -285,15 +283,17 @@ func (c *Config) lndConnectParams() (string, lndclient.Network, string,
 
 // defaultConfig returns a configuration struct with all default values set.
 func defaultConfig() *Config {
+	defaultLogCfg := build.DefaultLogConfig()
 	return &Config{
 		HTTPSListen: defaultHTTPSListen,
 		TLSCertPath: DefaultTLSCertPath,
 		TLSKeyPath:  defaultTLSKeyPath,
 		Remote: &subservers.RemoteConfig{
+			LitLogConfig:      defaultLogCfg,
 			LitDebugLevel:     defaultLogLevel,
 			LitLogDir:         defaultLogDir,
-			LitMaxLogFiles:    defaultMaxLogFiles,
-			LitMaxLogFileSize: defaultMaxLogFileSize,
+			LitMaxLogFiles:    defaultLogCfg.File.MaxLogFiles,
+			LitMaxLogFileSize: defaultLogCfg.File.MaxLogFileSize,
 			Lnd: &subservers.RemoteDaemonConfig{
 				RPCServer:    defaultRemoteLndRpcServer,
 				MacaroonPath: DefaultRemoteLndMacaroonPath,
@@ -376,11 +376,21 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
 		os.Exit(0)
 	}
 
+	// The logging config we use to initialise the sub-logger manager below
+	// depends on whether we're running in remote mode or not.
+	logCfg := preCfg.Lnd.LogConfig
+	if preCfg.LndMode == ModeRemote {
+		logCfg = preCfg.Remote.LitLogConfig
+	}
+
 	// Before we validate the config, we first hook up our own loggers.
 	// This must be done before the config is validated if LND is running
 	// in integrated mode so that the log levels for various non-LND related
 	// subsystems can be set via the `lnd.debuglevel` flag.
-	SetupLoggers(preCfg.Lnd.LogWriter, interceptor)
+	preCfg.Lnd.SubLogMgr = build.NewSubLoggerManager(
+		build.NewDefaultLogHandlers(logCfg, preCfg.Lnd.LogRotator)...,
+	)
+	SetupLoggers(preCfg.Lnd.SubLogMgr, interceptor)
 
 	// Load the main configuration file and parse any command line options.
 	// This function will also set up logging properly.
@@ -413,7 +423,7 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
 		debuglevel += fmt.Sprintf(",%s=off", GrpcLogSubsystem)
 	}
 
-	err = build.ParseAndSetDebugLevels(debuglevel, cfg.Lnd.LogWriter)
+	err = build.ParseAndSetDebugLevels(debuglevel, cfg.Lnd.SubLogMgr)
 	if err != nil {
 		return nil, err
 	}
@@ -753,16 +763,34 @@ func validateRemoteModeConfig(cfg *Config) error {
 
 	r.LitLogDir = lncfg.CleanAndExpandPath(r.LitLogDir)
 
+	// Initialize the log manager with the actual logging configuration. We
+	// need to support the deprecated max log files and max log file size
+	// options for now.
+	if r.LitMaxLogFiles != build.DefaultMaxLogFiles {
+		log.Warnf("Config option 'remote.lit-maxlogfiles' is " +
+			"deprecated, please use " +
+			"'remote.lit-logging.file.max-files' instead")
+
+		r.LitLogConfig.File.MaxLogFiles = r.LitMaxLogFiles
+	}
+	if r.LitMaxLogFileSize != build.DefaultMaxLogFileSize {
+		log.Warnf("Config option 'remote.lit-maxlogfilesize' is " +
+			"deprecated, please use " +
+			"'remote.lit-logging.file.max-file-size' instead")
+
+		r.LitLogConfig.File.MaxLogFileSize = r.LitMaxLogFileSize
+	}
+
 	// In remote mode, we don't call lnd's ValidateConfig that sets up a
 	// logging backend for us. We need to manually create and start one. The
 	// root logger should've already been created as part of the default
 	// config though.
-	if cfg.Lnd.LogWriter == nil {
-		cfg.Lnd.LogWriter = build.NewRotatingLogWriter()
+	if cfg.Lnd.LogRotator == nil {
+		cfg.Lnd.LogRotator = build.NewRotatingLogWriter()
 	}
-	err := cfg.Lnd.LogWriter.InitLogRotator(
+	err := cfg.Lnd.LogRotator.InitLogRotator(
+		cfg.Remote.LitLogConfig.File,
 		filepath.Join(r.LitLogDir, cfg.Network, defaultLogFilename),
-		r.LitMaxLogFileSize, r.LitMaxLogFiles,
 	)
 	if err != nil {
 		return fmt.Errorf("log rotation setup failed: %v", err.Error())

db/log.go

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

db/migrations.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/source/httpfs"

firewall/log.go

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

firewalldb/log.go

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

go.mod

@@ -1,11 +1,11 @@
 module github.com/lightninglabs/lightning-terminal
 
 require (
-	github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
+	github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
-	github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
+	github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
 	github.com/btcsuite/btcwallet/walletdb v1.4.4
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-errors/errors v1.0.1
@@ -16,41 +16,42 @@ require (
 	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/lib/pq v1.10.9
-	github.com/lightninglabs/faraday v0.2.14-alpha
+	github.com/lightninglabs/faraday v0.2.14-alpha.0.20250305102803-f668619b351e
 	github.com/lightninglabs/faraday/frdrpc v1.0.0
-	github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee4e7ff52f83
+	github.com/lightninglabs/lightning-node-connect v0.3.3-alpha.0.20250306111457-cad4234830cc
 	github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.2
 	github.com/lightninglabs/lightning-terminal/litrpc v1.0.1
-	github.com/lightninglabs/lndclient v0.18.4-9
-	github.com/lightninglabs/loop v0.29.0-beta
-	github.com/lightninglabs/loop/looprpc v1.0.3
-	github.com/lightninglabs/loop/swapserverrpc v1.0.12
-	github.com/lightninglabs/pool v0.6.5-beta.0.20241015105339-044cb451b5df
-	github.com/lightninglabs/pool/auctioneerrpc v1.1.2
-	github.com/lightninglabs/pool/poolrpc v1.0.0
-	github.com/lightninglabs/taproot-assets v0.5.1
-	github.com/lightningnetwork/lnd v0.18.5-beta
+	github.com/lightninglabs/lndclient v0.19.0-2
+	github.com/lightninglabs/loop v0.29.0-beta.rc2.0.20250306160707-1091a628755c
+	github.com/lightninglabs/loop/looprpc v1.0.4-0.20250306160707-1091a628755c
+	github.com/lightninglabs/loop/swapserverrpc v1.0.13-0.20250306160707-1091a628755c
+	github.com/lightninglabs/pool v0.6.5-beta.0.20250305125211-4e860ec4e77f
+	github.com/lightninglabs/pool/auctioneerrpc v1.1.3-0.20250305125211-4e860ec4e77f
+	github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f
+	github.com/lightninglabs/taproot-assets v0.5.2-0.20250313171535-331ac78538a3
+	github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20250310214651-97bba5752089
 	github.com/lightningnetwork/lnd/cert v1.2.2
 	github.com/lightningnetwork/lnd/clock v1.1.1
 	github.com/lightningnetwork/lnd/fn v1.2.3
-	github.com/lightningnetwork/lnd/kvdb v1.4.10
-	github.com/lightningnetwork/lnd/tlv v1.2.6
-	github.com/lightningnetwork/lnd/tor v1.1.2
+	github.com/lightningnetwork/lnd/fn/v2 v2.0.8
+	github.com/lightningnetwork/lnd/kvdb v1.4.12
+	github.com/lightningnetwork/lnd/tlv v1.3.0
+	github.com/lightningnetwork/lnd/tor v1.1.5
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli v1.22.9
+	github.com/urfave/cli v1.22.14
 	go.etcd.io/bbolt v1.3.11
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.35.0
 	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
-	golang.org/x/net v0.33.0
-	golang.org/x/sync v0.10.0
+	golang.org/x/net v0.36.0
+	golang.org/x/sync v0.11.0
 	google.golang.org/grpc v1.65.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/macaroon-bakery.v2 v2.1.0
 	gopkg.in/macaroon.v2 v2.1.0
-	modernc.org/sqlite v1.30.0
+	modernc.org/sqlite v1.34.5
 )
 
 require (
@@ -66,6 +67,7 @@ require (
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect
+	github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
 	github.com/btcsuite/btcwallet v0.16.10-0.20241127094224-93c858b2ad63 // indirect
 	github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
 	github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
@@ -81,8 +83,8 @@ require (
 	github.com/coreos/bbolt v1.3.3 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
 	github.com/decred/dcrd/lru v1.1.2 // indirect
@@ -92,12 +94,12 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
 	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/goccy/go-yaml v1.15.23 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -113,7 +115,6 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -135,15 +136,15 @@ require (
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/libdns/libdns v0.2.1 // indirect
-	github.com/lightninglabs/aperture v0.3.4-beta // indirect
+	github.com/lightninglabs/aperture v0.3.8-beta.0.20250305101039-2eead0180691 // indirect
 	github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
 	github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
 	github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
 	github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
 	github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
-	github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
+	github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
 	github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
-	github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
+	github.com/lightningnetwork/lnd/sqldb v1.0.7 // indirect
 	github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
 	github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -152,13 +153,14 @@ require (
 	github.com/mholt/acmez v1.0.4 // indirect
 	github.com/miekg/dns v1.1.50 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/sys/user v0.3.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
-	github.com/opencontainers/runc v1.1.14 // indirect
+	github.com/opencontainers/runc v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
@@ -169,10 +171,9 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rogpeppe/fastuuid v1.2.0 // indirect
 	github.com/rs/cors v1.7.0 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.9.2 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
@@ -205,9 +206,9 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -217,12 +218,9 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.50.9 // indirect
+	modernc.org/libc v1.55.3 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
-	modernc.org/strutil v1.2.0 // indirect
-	modernc.org/token v1.1.0 // indirect
 	nhooyr.io/websocket v1.8.7 // indirect
 	pgregory.net/rapid v1.1.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect