Fix two edge cases in handling of counterparty revoked commitment txn #1486
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wpaulino
reviewed
May 27, 2022
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
19f4f99 to
334c0c4
Compare
|
Reased after merge of #1481. |
tnull
reviewed
May 28, 2022
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
334c0c4 to
032673c
Compare
Codecov Report
@@ Coverage Diff @@
## main #1486 +/- ##
==========================================
+ Coverage 90.96% 91.80% +0.84%
==========================================
Files 80 80
Lines 43533 47809 +4276
Branches 43533 47809 +4276
==========================================
+ Hits 39598 43892 +4294
+ Misses 3935 3917 -18
Continue to review full report at Codecov.
|
tnull
reviewed
Jun 1, 2022
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
032673c to
a9ad6f9
Compare
tnull
reviewed
Jun 13, 2022
|
@TheBlueMatt CI is failing now with |
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
4154c55 to
690817e
Compare
|
Oops, yea, needed to rebase on latest upstream changes. |
|
LGTM, feel free to squash. |
Previously, while processing a confirmed revoked counterparty commitment transaction, we'd populate `OnchainEvent`s for live HTLCs with a `txid` source of the txid of the latest counterparty commitment transactions, not the confirmed revoked one. This meant that, if the user is using `transaction_unconfirmed` to notify us of reorg information, we'd end up not removing the entry if the revoked commitment transaction was reorg'd out. This would ultimately cause us to spuriously resolve the HTLC(s) as the chain advanced, even though we were doing so based on a now-reorged-out transaction. Luckily the fix is simple - set the correct txid in the `OnchainEventEntry`. We also take this opportunity to update logging in a few places with the txid of the transaction causing an event.
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
690817e to
9854c91
Compare
|
Squashed without changes: |
tnull
previously approved these changes
Jun 15, 2022
wpaulino
previously approved these changes
Jun 15, 2022
When we see a counterparty revoked commitment transaction on-chain we shouldn't immediately queue up HTLCs present in it for resolution until we have spent the HTLC outputs in some kind of claim transaction. In order to do so, we first have to change the `fail_unbroadcast_htlcs!()` call to provide it with the HTLCs which are present in the (revoked) commitment transaction which was broadcast. However, this is not sufficient - because all of those HTLCs had their `HTLCSource` removed when the commitment transaction was revoked, we also have to update `fail_unbroadcast_htlcs` to check the payment hash and amount when the `HTLCSource` is `None`. Somewhat surprisingly, several tests actually explicitly tested for the old behavior, which required amending to pass with the new changes. Finally, this adds a debug assertion when writing `ChannelMonitor`s to ensure `HTLCSource`s do not leak.
TheBlueMatt
force-pushed
the
2022-05-revoked-txn-edge-cases
branch
from
7cd9ebf to
70ae45f
Compare
|
Rebased without change: |
tnull
approved these changes
Jun 21, 2022
valentinewallace
approved these changes
Jun 21, 2022
wpaulino
approved these changes
Jun 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #1481 as the tests are only useful with it.Discovered while working on #1466.
This adds two new commits which correct some edge-case handling of revoked counterparty commitment transactions. They're both super duper edge, so not worth rushing too much to fix them, but will be needed for #1466 so would be nice to get them soon-ish.
The first case is only relevant for users disconnecting blocks with
transaction_unconfirmed, when the counterparty broadcasts a revoked commitment transaction, which is then reorg'd out and replaced with a non-revoked commitment transaction.The second case handles resolving HTLCs even though we haven't yet spent them, though we have broadcast the spend transactions and should spend them soon. This, too, is only relevant in case the revoked commitment transaction gets reorg'd out and replaced with a non-revoked one (and then the HTLCs claimed by our counterparty).