Skip to content

tapchannel: support HTLC revocation sweeps #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GeorgeTsagk wants to merge 12 commits into
base: main
Choose a base branch
from
Open

tapchannel: support HTLC revocation sweeps #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4025da0
(wip) build: bump lnd
GeorgeTsagk Apr 19, 2026
52c272f
tapchannel: add revocation sweep descriptors
GeorgeTsagk Apr 19, 2026
999c022
tapchannel+server: pass through NotifyBroadcast skip flag
GeorgeTsagk Apr 19, 2026
6c851ab
tapchannel: add revocation sweep descriptor sign+verify tests
GeorgeTsagk Apr 19, 2026
60d0575
tapfeatures+tapchannelmsg: add DeterministicHTLCs feature bit and com…
GeorgeTsagk Apr 19, 2026
5c3611c
tapchannel+server: implement HtlcSigHashType and thread Deterministic…
GeorgeTsagk Apr 19, 2026
a33e3d3
tapchannel: sweep second-level revoked HTLC outputs
GeorgeTsagk Apr 19, 2026
89a6266
tapchannel+server: use AuxNotifyOpts for NotifyBroadcast
GeorgeTsagk Apr 19, 2026
6ef1622
tapchannel: import and sweep second-level HTLCs for non-breach force …
GeorgeTsagk Apr 19, 2026
0043f98
tapd-integrated: increase lndclient RPC timeout to 2 minutes
GeorgeTsagk Apr 19, 2026
aeb05d5
itest: test second-level HTLC revocation and adapt assertions for Det…
GeorgeTsagk Apr 19, 2026
9d1397d
tapchannel+server: adapt call sites to lnd revocation API
GeorgeTsagk Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/tapd-integrated/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"os"
"path/filepath"
"sync"
"time"

"github.com/btcsuite/btclog/v2"
"github.com/jessevdk/go-flags"
Expand Down Expand Up @@ -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.
Expand Down
24 changes: 23 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ require (
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
Expand Down Expand Up @@ -232,3 +232,25 @@ replace github.com/prometheus/common => github.com/prometheus/common v0.66.1

// Note this is a temporary replace and will be removed when taprpc is tagged.
replace github.com/lightninglabs/taproot-assets/taprpc => ./taprpc

replace github.com/lightningnetwork/lnd => github.com/GeorgeTsagk/lnd v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/sqldb => github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/tlv => github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/cert => github.com/GeorgeTsagk/lnd/cert v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/clock => github.com/GeorgeTsagk/lnd/clock v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/healthcheck => github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/kvdb => github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/queue => github.com/GeorgeTsagk/lnd/queue v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/tor => github.com/GeorgeTsagk/lnd/tor v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/actor => github.com/GeorgeTsagk/lnd/actor v0.0.0-20260715182120-7952e88f04e7

replace github.com/lightningnetwork/lnd/fn/v2 => github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260715182120-7952e88f04e7
48 changes: 24 additions & 24 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,28 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/GeorgeTsagk/lnd v0.0.0-20260715182120-7952e88f04e7 h1:lzUisZGESOGj5ZSMPXBZxu5jZ7ZY9oJBomqCmnaTRPc=
github.com/GeorgeTsagk/lnd v0.0.0-20260715182120-7952e88f04e7/go.mod h1:LWfQaNNXlZghUJqIIh+JsgfxiVtC+ecZkrIe5bm9o4U=
github.com/GeorgeTsagk/lnd/actor v0.0.0-20260715182120-7952e88f04e7 h1:LTtVT77sawnENVNbYVJcK1OyXWXcxK1bUIOv2zal3cw=
github.com/GeorgeTsagk/lnd/actor v0.0.0-20260715182120-7952e88f04e7/go.mod h1:zDsfxxOoxaSTKlKk4LqNXiVqY8wMJr4J/DXD1nzWgI4=
github.com/GeorgeTsagk/lnd/cert v0.0.0-20260715182120-7952e88f04e7 h1:8PXB9DqzWLLeAHOwGpy4s5QuQypE4Vyf9w5jQUZQU7U=
github.com/GeorgeTsagk/lnd/cert v0.0.0-20260715182120-7952e88f04e7/go.mod h1:Z02Qn4t+oCfcTYBRsPPhJCWvgVdE9NHXG4bLA6EY5o8=
github.com/GeorgeTsagk/lnd/clock v0.0.0-20260715182120-7952e88f04e7 h1:VRys/X/6xpu9TX7Tcaz34fJDsfaOFuwg+oLBnTFrjco=
github.com/GeorgeTsagk/lnd/clock v0.0.0-20260715182120-7952e88f04e7/go.mod h1:g97d8D+mK/wofv+w6aXs5PQNh9sMMrvLAXesJ0gk3GU=
github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260715182120-7952e88f04e7 h1:02XA1AucmYoLq0fb9Ii+5xI3hEvNGNLP9nhhCn3YXqM=
github.com/GeorgeTsagk/lnd/fn/v2 v2.0.0-20260715182120-7952e88f04e7/go.mod h1:/bnTomDB8DVnFYorlSgc9sYPX3jsi5TcfSeA+RKUBTk=
github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260715182120-7952e88f04e7 h1:bqg2Efk/Dh+ZuSZZ5lIP4oBy1yaCC12sh3cpW8gbP6w=
github.com/GeorgeTsagk/lnd/healthcheck v0.0.0-20260715182120-7952e88f04e7/go.mod h1:3vTBB3XFaacbyqs0MYr/tea3j6z0CLfuPJBPDBGx/2M=
github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260715182120-7952e88f04e7 h1:oA68GJHkwQTYI2kclPgFfL0ZfNUBTBcw7VHNljKhAQo=
github.com/GeorgeTsagk/lnd/kvdb v0.0.0-20260715182120-7952e88f04e7/go.mod h1:/ilWYw94DrsM3K45kwHGpYUZWnNK6xSLhWgUrP0TEgw=
github.com/GeorgeTsagk/lnd/queue v0.0.0-20260715182120-7952e88f04e7 h1:BVPRuveJAWNr90fyV/m/fTIpRKAjFv6jHMqV+SlAX7E=
github.com/GeorgeTsagk/lnd/queue v0.0.0-20260715182120-7952e88f04e7/go.mod h1:cTWJDbpO/qOoUwLnsiaxsvmqhs3+d/Kn1I5qBd+pnNQ=
github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260715182120-7952e88f04e7 h1:fY71sTtTnOMtjiuKUMDfVKPwoduDa4iEcGWY7uYwh/w=
github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20260715182120-7952e88f04e7/go.mod h1:M37k0s2UmVHg8/IzAOMJBuVa/FRhJF4U9Wy4WIF2OeQ=
github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260715182120-7952e88f04e7 h1:E0nB75qsU1fQVQ+gnPHk5S94FxUP5NRAXboAs+fhTBo=
github.com/GeorgeTsagk/lnd/tlv v0.0.0-20260715182120-7952e88f04e7/go.mod h1:oL5WIFd3ZoEwh3oH1xzizeUl6pq3DIhx9ljDvRdvI3Q=
github.com/GeorgeTsagk/lnd/tor v0.0.0-20260715182120-7952e88f04e7 h1:Bzj+f2am3zj44yCrmAa31b3Fsyc51t2c7xv7GmTNFb0=
github.com/GeorgeTsagk/lnd/tor v0.0.0-20260715182120-7952e88f04e7/go.mod h1:tB6/Hsk5nIm6xkOPaidd4q1at4x4gF6Bpu/t2UQxYgM=
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
Expand Down Expand Up @@ -1082,30 +1104,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
github.com/lightningnetwork/lightning-onion v1.4.0 h1:qWE1icOH4AKXRcq1KCzt6P/TesqptgBTP++V7wowTc0=
github.com/lightningnetwork/lightning-onion v1.4.0/go.mod h1:YDPkvVTVQ6FBBE6Yj93tDd7zA3iTSrryi9xq46i7bKE=
github.com/lightningnetwork/lnd v0.21.0-beta.rc2.0.20260630214209-40c64f9db30d h1:mDcB9mwuwJXRbDmxps6mBgGs318Iz5ZbOrt0ieEx0os=
github.com/lightningnetwork/lnd v0.21.0-beta.rc2.0.20260630214209-40c64f9db30d/go.mod h1:LWfQaNNXlZghUJqIIh+JsgfxiVtC+ecZkrIe5bm9o4U=
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.5.1 h1:OG5cDbqggxiCFKAJbSPw0PfQovi+0odCZAAU5r5b+ho=
github.com/lightningnetwork/lnd/kvdb v1.5.1/go.mod h1:5lubXYoXHDBWBYKmC+2we7qgkjjz0cEZ/5QSQkxQSec=
github.com/lightningnetwork/lnd/queue v1.2.0 h1:sSrn+u84OLuOT/F+xGxgg8VfknXeIZEAFQoMH6BL60s=
github.com/lightningnetwork/lnd/queue v1.2.0/go.mod h1:qLNP0L3B7piRGvDyhAyJKic4xTt+Mw4D7mWrQeuAwxY=
github.com/lightningnetwork/lnd/sqldb v1.0.13 h1:CcG9mrHNW/hIuZnqgosdiNmS7QhjSyfR/XkSFJB7EC8=
github.com/lightningnetwork/lnd/sqldb v1.0.13/go.mod h1:ew3kMfknA0B4djTtrQSAkxvro+8+c++L8LuNaoT7GQA=
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.4.0 h1:qNGymEkOZsHbp4h8VjnkRGgLfmh+eJP1JQtz2/mJX2M=
github.com/lightningnetwork/lnd/tlv v1.4.0/go.mod h1:oL5WIFd3ZoEwh3oH1xzizeUl6pq3DIhx9ljDvRdvI3Q=
github.com/lightningnetwork/lnd/tor v1.2.0 h1:Xled9KE+rdTPEMDVJE5VrSoMNkJq6EfH3NCF6pLP4h4=
github.com/lightningnetwork/lnd/tor v1.2.0/go.mod h1:tB6/Hsk5nIm6xkOPaidd4q1at4x4gF6Bpu/t2UQxYgM=
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=
Expand Down Expand Up @@ -1298,8 +1298,8 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E=
Expand Down
17 changes: 13 additions & 4 deletions itest/custom_channels/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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) {

Expand All @@ -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]
Expand All @@ -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,
Expand Down
Loading
Loading