Merge tapd side-branch to master

.golangci.yml

@@ -1,6 +1,6 @@
 run:
   # timeout for analysis
-  timeout: 4m
+  timeout: 10m
 
   build-tags:
     - autopilotrpc

Makefile

@@ -28,7 +28,7 @@ GO_VERSION = 1.24.6
 # installed before running the integration tests which include backward
 # compatibility tests. The list of versions must be in sync with any version
 # used in the backwardCompat map in itest/litd_test_list_on_test.go.
-LITD_COMPAT_VERSIONS = v0.14.1-alpha
+LITD_COMPAT_VERSIONS = v0.14.1-alpha v0.15.0-alpha
 
 LOOP_COMMIT := $(shell cat go.mod | \
 		grep $(LOOP_PKG) | \

accounts/service.go

@@ -10,12 +10,12 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/fn"
 	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"
+	paymentsdb "github.com/lightningnetwork/lnd/payments/db"
 )
 
 // Config holds the configuration options for the accounts service.
@@ -739,7 +739,7 @@ func (s *InterceptorService) TrackPayment(ctx context.Context, id AccountID,
 				// startup, to make sure we don't miss any
 				// payments.
 				if errors.Is(
-					err, channeldb.ErrPaymentNotInitiated,
+					err, paymentsdb.ErrPaymentNotInitiated,
 				) {
 
 					log.Debugf("Payment %v not initiated, "+

accounts/service_test.go

@@ -7,12 +7,12 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/clock"
 	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
+	paymentsdb "github.com/lightningnetwork/lnd/payments/db"
 	"github.com/stretchr/testify/require"
 )
 
@@ -585,7 +585,7 @@ func TestAccountService(t *testing.T) {
 			require.ErrorIs(t, err, ErrAccBalanceInsufficient)
 
 			// Now signal that the payment was non-initiated.
-			r.paymentErrChan <- channeldb.ErrPaymentNotInitiated
+			r.paymentErrChan <- paymentsdb.ErrPaymentNotInitiated
 
 			// Once the error is handled in the service.TrackPayment
 			// goroutine, and therefore free up the 2000 in-flight