Claim HTLCs with preimage from currently confirmed commitment #2623
Conversation
This file contains 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
TheBlueMatt
reviewed
Sep 29, 2023
|
Please reorder the commits so that we pass tests as of each commit. |
We should always claim HTLCs from the currently confirmed commitment, rather than always claiming from the latest or previous counterparty commitment if we've seen either confirm onchain at a prior point.
This test adds coverage for receiving a preimage after seeing a counterparty commitment confirm, followed by a reorg and the confirmation of a different commitment instead. The first test covers the case where a holder commitment confirms after the counterparty commitment reorg. The second test covers the case where a previous counterparty commitment confirms after the latest counterparty commitment reorg.
wpaulino
force-pushed
the
htlc-claim-receive-preimage-after-close
branch
from
308affa
to
d82e6ba
Compare
Codecov ReportAttention:
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2623 +/- ##
==========================================
- Coverage 89.03% 88.98% -0.05%
==========================================
Files 112 112
Lines 86351 86497 +146
Branches 86351 86497 +146
==========================================
+ Hits 76879 76970 +91
- Misses 7235 7288 +53
- Partials 2237 2239 +2
☔ View full report in Codecov by Sentry. |
arik-so
approved these changes
Sep 29, 2023
TheBlueMatt
approved these changes
Sep 29, 2023
ariard
reviewed
Oct 2, 2023
| if let Some(commitment_number) = self.counterparty_commitment_txn_on_chain.get(&txid) { | ||
| claim_htlcs!(*commitment_number, txid); | ||
| if txid == confirmed_spend_txid { | ||
| if let Some(commitment_number) = self.counterparty_commitment_txn_on_chain.get(&txid) { |
There was a problem hiding this comment.
Sounds counterparty_commitment_txn_on_chain and FundingSpendConfirmation could be merged in a single data struct, as there is a redundancy we might store the same txid both as a FundingSpendConfirmation { commitment_tx_to_counterparty_output and hashmap entry.
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.
This PR ensures that we produce HTLC preimage claims from the intended commitment when we see a counterparty commitment confirm onchain and another commitment (either another counterparty one or a holder) confirms instead via a reorg. Previously, in such a case, we'd always claim from the latest or previous counterparty commitment, even when the currently confirmed commitment is a different one.