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

@@ -22,8 +22,8 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
-	github.com/jackc/pgconn v1.14.3
 	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
+	github.com/jackc/pgx/v5 v5.9.2
 	github.com/jessevdk/go-flags v1.6.1
 	github.com/lib/pq v1.10.9
 	github.com/lightninglabs/aperture v0.4.0
@@ -111,13 +111,13 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.14.3 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	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
@@ -133,7 +133,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 +229,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-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/sqldb => github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/tlv => github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/fn/v2 => github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/cert => github.com/GeorgeTsagk/lnd/cert v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/clock => github.com/GeorgeTsagk/lnd/clock v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/healthcheck => github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/kvdb => github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/queue => github.com/GeorgeTsagk/lnd/queue v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/tor => github.com/GeorgeTsagk/lnd/tor v0.0.0-20260520182409-c26a2151a875
+
+replace github.com/lightningnetwork/lnd/actor => github.com/GeorgeTsagk/lnd/actor v0.0.0-20260520182409-c26a2151a875
+
 // 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

go.sum

@@ -603,6 +603,28 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/GeorgeTsagk/lnd v0.0.0-20260520182409-c26a2151a875 h1:hC+LEe3g+UfNLYOM6u/BRRiRqCrhMvVhZ+nhwNH49rk=
+github.com/GeorgeTsagk/lnd v0.0.0-20260520182409-c26a2151a875/go.mod h1:hrJPOxkleTu3y3K32ehBziq8y/zqQqCPQKfwktS35aw=
+github.com/GeorgeTsagk/lnd/actor v0.0.0-20260520182409-c26a2151a875 h1:bz0h6IN1EKcv54yazC5AyextdaNbfC9x0RdHCvvvGoE=
+github.com/GeorgeTsagk/lnd/actor v0.0.0-20260520182409-c26a2151a875/go.mod h1:YAsoniSbY/cAM9HTVNfZLvt7RI6swDxy6wzPspTcMZg=
+github.com/GeorgeTsagk/lnd/cert v0.0.0-20260520182409-c26a2151a875 h1:RWveqoGnoySZjZpzpf73TUWBJohn0ijsn+bFQ5w3Ezs=
+github.com/GeorgeTsagk/lnd/cert v0.0.0-20260520182409-c26a2151a875/go.mod h1:g0Vq5mXKRTVAWOyhJLNNMe8byqlUPXmIC5wzahbQzTQ=
+github.com/GeorgeTsagk/lnd/clock v0.0.0-20260520182409-c26a2151a875 h1:GUmrzUIxexU+mpuahiSyyFm+2v731zdunuFRIjB4EJU=
+github.com/GeorgeTsagk/lnd/clock v0.0.0-20260520182409-c26a2151a875/go.mod h1:0sOYW0SNSFGX5tDIb+axdeu83gccfhl5WvC1+bZFCwc=
+github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260520182409-c26a2151a875 h1:dsaE1sIg4CHMtnvcfnPUcmqxV7Q/VZYHnmRbSEwXm1A=
+github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260520182409-c26a2151a875/go.mod h1:hTqCE3YivAweJUguzTSco+ygOQ8m6NeFeLDdC57AZEs=
+github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260520182409-c26a2151a875 h1:+rDRoOdpe7mVJcP1CHq4XyxvHMS2f9WxxDzOLpTFb+A=
+github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260520182409-c26a2151a875/go.mod h1:Tc9vHY5edyLPwR6us7wu1lKuZ8tCRGMvvlNHKkqxI8s=
+github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260520182409-c26a2151a875 h1:C3H4zY2kD9LBXoTkXaOzw97d4EXiZPfv2x7wNWPLZg8=
+github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260520182409-c26a2151a875/go.mod h1:NPS4edR7ud/XcKX6Rqfyql3KMHHLg3ZxPydFP9flTJY=
+github.com/GeorgeTsagk/lnd/queue v0.0.0-20260520182409-c26a2151a875 h1:kT6C9KGuNkG69DYbaX3Y/GjdA/KK+AJbDfCk8JNs4F8=
+github.com/GeorgeTsagk/lnd/queue v0.0.0-20260520182409-c26a2151a875/go.mod h1:WGDUw3XZ+ttVtcrkaEYq+hSTfKna9if/vTdgyTkA+QE=
+github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260520182409-c26a2151a875 h1:wrsaWAY8TFw+WJhsjWKjPDxcVJOpFPfd0BZlWZMl7eY=
+github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260520182409-c26a2151a875/go.mod h1:XaG3d8AR7/e6+HUw5jvNvm+gs6MowB+iE9myFH8Rc14=
+github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260520182409-c26a2151a875 h1:Dn8eV086Alc9xp0fn1crBal6JQ8a0zmyictfH3cQGRo=
+github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260520182409-c26a2151a875/go.mod h1:kPIYfi7ZGxilkM2LjODBKTb0oexX49OZIIB1ufX7sfA=
+github.com/GeorgeTsagk/lnd/tor v0.0.0-20260520182409-c26a2151a875 h1:Hap4o0HJHHrkNils6T8PKt1INVExIt4J1zmPYfxzFTQ=
+github.com/GeorgeTsagk/lnd/tor v0.0.0-20260520182409-c26a2151a875/go.mod h1:DANQ6QCQBiR+CqrM+mKudgkMy6CR/RS4ALDbjb2W4FU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
@@ -1117,38 +1139,16 @@ github.com/lightninglabs/lndclient v0.20.0-6 h1:sh23eZkOpHxe39c4QRYwhsM7qbnJlS++
 github.com/lightninglabs/lndclient v0.20.0-6/go.mod h1:gBtIFPGmC2xIspGIv/G5+HiPSGJsFD8uIow7Oke1HFI=
 github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2.0.20251211093704-71c1eef09789 h1:7kX7vUgHUazAHcCJ6uzBDa4/2MEGEbMEfa01GtfqmTQ=
 github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2.0.20251211093704-71c1eef09789/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=
-github.com/lightninglabs/neutrino v0.16.2 h1:jHMMDLPX8asfwgN0/C4BY8uVaYupFzZYuWQkX8Go3fk=
-github.com/lightninglabs/neutrino v0.16.2/go.mod h1:fNjnbuSPw4lRsVAzvjC1JG7IE7rqae/mbek2tNkN/Dw=
+github.com/lightninglabs/neutrino v0.16.3-0.20260508212153-0f87fa7c4b36 h1:d6FuJQ6YjWqBdMJ3fmk9BgjyMFyRKecKxoGq//PHdh0=
+github.com/lightninglabs/neutrino v0.16.3-0.20260508212153-0f87fa7c4b36/go.mod h1:fNjnbuSPw4lRsVAzvjC1JG7IE7rqae/mbek2tNkN/Dw=
 github.com/lightninglabs/neutrino/cache v1.1.3 h1:rgnabC41W+XaPuBTQrdeFjFCCAVKh1yctAgmb3Se9zA=
 github.com/lightninglabs/neutrino/cache v1.1.3/go.mod h1:qxkJb+pUxR5p84jl5uIGFCR4dGdFkhNUwMSxw3EUWls=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 github.com/lightningnetwork/lightning-onion v1.3.0 h1:FqILgHjD6euc/Muo1VOzZ4+XDPuFnw6EYROBq0rR/5c=
 github.com/lightningnetwork/lightning-onion v1.3.0/go.mod h1:nP85zMHG7c0si/eHBbSQpuDCtnIXfSvFrK3tW6YWzmU=
-github.com/lightningnetwork/lnd v0.20.0-beta.rc4.0.20260421084739-a8a3e13120eb h1:qhzjbUJau0bZCUAGlJwjxKLHI0337Z0KR+37aFoLhbg=
-github.com/lightningnetwork/lnd v0.20.0-beta.rc4.0.20260421084739-a8a3e13120eb/go.mod h1:hrJPOxkleTu3y3K32ehBziq8y/zqQqCPQKfwktS35aw=
-github.com/lightningnetwork/lnd/actor v0.0.6 h1:Ge8N2wivARG+27qJBwTlB0vwsypStZYZy8vk4Zl38sU=
-github.com/lightningnetwork/lnd/actor v0.0.6/go.mod h1:YAsoniSbY/cAM9HTVNfZLvt7RI6swDxy6wzPspTcMZg=
-github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
-github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
-github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
-github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
-github.com/lightningnetwork/lnd/fn/v2 v2.0.9 h1:ZytG4ltPac/sCyg1EJDn10RGzPIDJeyennUMRdOw7Y8=
-github.com/lightningnetwork/lnd/fn/v2 v2.0.9/go.mod h1:aPUJHJ31S+Lgoo8I5SxDIjnmeCifqujaiTXKZqpav3w=
-github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
-github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
-github.com/lightningnetwork/lnd/kvdb v1.4.16 h1:9BZgWdDfjmHRHLS97cz39bVuBAqMc4/p3HX1xtUdbDI=
-github.com/lightningnetwork/lnd/kvdb v1.4.16/go.mod h1:HW+bvwkxNaopkz3oIgBV6NEnV4jCEZCACFUcNg4xSjM=
-github.com/lightningnetwork/lnd/queue v1.1.2-0.20260328114253-ea8a6657729e h1:DTDPwSfhAi6HYmk4oAMRyvJy5bfwWwxzbsDWYvolQFQ=
-github.com/lightningnetwork/lnd/queue v1.1.2-0.20260328114253-ea8a6657729e/go.mod h1:WGDUw3XZ+ttVtcrkaEYq+hSTfKna9if/vTdgyTkA+QE=
-github.com/lightningnetwork/lnd/sqldb v1.0.13-0.20260410061304-0b82a89fdae1 h1:wlzpC1pDoeNs1kqBQ7Dqv9LXz6krsqfqPZLGHdTeAIo=
-github.com/lightningnetwork/lnd/sqldb v1.0.13-0.20260410061304-0b82a89fdae1/go.mod h1:XaG3d8AR7/e6+HUw5jvNvm+gs6MowB+iE9myFH8Rc14=
 github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
 github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
-github.com/lightningnetwork/lnd/tlv v1.3.2 h1:MO4FCk7F4k5xPMqVZF6Nb/kOpxlwPrUQpYjmyKny5s0=
-github.com/lightningnetwork/lnd/tlv v1.3.2/go.mod h1:pJuiBj1ecr1WWLOtcZ+2+hu9Ey25aJWFIsjmAoPPnmc=
-github.com/lightningnetwork/lnd/tor v1.1.6 h1:WHUumk7WgU6BUFsqHuqszI9P6nfhMeIG+rjJBlVE6OE=
-github.com/lightningnetwork/lnd/tor v1.1.6/go.mod h1:qSRB8llhAK+a6kaTPWOLLXSZc6Hg8ZC0mq1sUQ/8JfI=
 github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=
 github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796/go.mod h1:3p7ZTf9V1sNPI5H8P3NkTFF4LuwMdPl2DodF60qAKqY=
 github.com/ltcsuite/ltcutil v0.0.0-20181217130922-17f3b04680b6/go.mod h1:8Vg/LTOO0KYa/vlHWJ6XZAevPQThGH5sufO0Hrou/lA=

itest/custom_channels/assertions.go

@@ -305,7 +305,7 @@ func mineBlocksSlow(t *ccHarnessTest, net *itest.IntegratedNetworkHarness,
 	var txids []*chainhash.Hash
 	var err error
 	if numTxs > 0 {
-		txids, err = waitForNTxsInMempool(
+		txids, err = waitForAtLeastNTxsInMempool(
 			net.Miner, numTxs,
 			wait.MinerMempoolTimeout,
 		)
@@ -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,