tapchannel: support HTLC revocation sweeps

cmd/tapd-integrated/main.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
 
 	"github.com/btcsuite/btclog/v2"
 	"github.com/jessevdk/go-flags"
@@ -257,6 +258,7 @@ func run() error {
 		BlockUntilChainSynced: true,
 		BlockUntilUnlocked:    true,
 		CallerCtx:             ctx,
+		RPCTimeout:            2 * time.Minute,
 	}
 	if cfg.Lnd.NoMacaroons {
 		// Use a dummy macaroon that lndclient can deserialize.

go.mod

@@ -115,10 +115,7 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgtype v1.14.4 // indirect
-	github.com/jackc/pgx/v4 v4.18.3 // indirect
 	github.com/jackc/pgx/v5 v5.9.2 // indirect
-	github.com/jackc/puddle v1.3.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jackpal/gateway v1.0.5 // indirect
 	github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
@@ -133,7 +130,7 @@ require (
 	github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
 	github.com/lightninglabs/lightning-node-connect/gbn v1.0.2-0.20250610182311-2f1d46ef18b7 // indirect
 	github.com/lightninglabs/lightning-node-connect/mailbox v1.0.2-0.20250610182311-2f1d46ef18b7 // indirect
-	github.com/lightninglabs/neutrino v0.16.2 // indirect
+	github.com/lightninglabs/neutrino v0.16.3-0.20260508212153-0f87fa7c4b36 // indirect
 	github.com/lightningnetwork/lightning-onion v1.3.0 // indirect
 	github.com/lightningnetwork/lnd/actor v0.0.6 // indirect
 	github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
@@ -229,6 +226,28 @@ replace github.com/lightninglabs/taproot-assets/taprpc => ./taprpc
 // Needed for healthcheck import.
 replace github.com/prometheus/common => github.com/prometheus/common v0.26.0
 
+replace github.com/lightningnetwork/lnd => github.com/GeorgeTsagk/lnd v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/sqldb => github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/tlv => github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/fn/v2 => github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/cert => github.com/GeorgeTsagk/lnd/cert v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/clock => github.com/GeorgeTsagk/lnd/clock v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/healthcheck => github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/kvdb => github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/queue => github.com/GeorgeTsagk/lnd/queue v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/tor => github.com/GeorgeTsagk/lnd/tor v0.0.0-20260515101220-c025901edf46
+
+replace github.com/lightningnetwork/lnd/actor => github.com/GeorgeTsagk/lnd/actor v0.0.0-20260515101220-c025901edf46
+
 // Needed because lnd master requires a btcwallet version with neutrino
 // v0.16.2 context.Context support, but this pseudo-version is treated as a
 // pre-release by Go modules and would be overridden by the tagged v0.16.17

itest/custom_channels/assertions.go

@@ -367,8 +367,8 @@ func waitForNTxsInMempool(m *miner.HarnessMiner, n int,
 	}
 }
 
-// waitForAtLeastNTxsInMempool polls until finding at least n transactions
-// in the miner's mempool, returning all txids present.
+// waitForAtLeastNTxsInMempool polls until finding at least n
+// transactions in the miner's mempool, returning all txids present.
 func waitForAtLeastNTxsInMempool(m *miner.HarnessMiner, n int,
 	timeout time.Duration) ([]*chainhash.Hash, error) {
 
@@ -388,7 +388,8 @@ func waitForAtLeastNTxsInMempool(m *miner.HarnessMiner, n int,
 
 			if len(mempool) >= n {
 				result := make(
-					[]*chainhash.Hash, len(mempool),
+					[]*chainhash.Hash,
+					len(mempool),
 				)
 				for i := range mempool {
 					result[i] = &mempool[i]
@@ -399,6 +400,14 @@ func waitForAtLeastNTxsInMempool(m *miner.HarnessMiner, n int,
 	}
 }
 
+// waitForNonEmptyMempool polls until the mempool is non-empty, then
+// returns a snapshot of its current contents.
+func waitForNonEmptyMempool(m *miner.HarnessMiner,
+	timeout time.Duration) ([]*chainhash.Hash, error) {
+
+	return waitForAtLeastNTxsInMempool(m, 1, timeout)
+}
+
 // assertTxInBlock asserts that a transaction with the given hash is included
 // in the block.
 func assertTxInBlock(t *ccHarnessTest, block *wire.MsgBlock,