Test commitment broadcast during different stages of a splice #4068
Conversation
|
👋 Thanks for assigning @TheBlueMatt as a reviewer! |
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
While we did consider the pending HTLCs when generating the signatures, we did not include them in the resulting `commitment_signed` message sent because we assumed it was only used within a dual-funding context where there are no pending HTLCs.
This ensures a valid commitment transaction is broadcast according to the different stages of a splice: 1. Negotiated but unconfirmed 2. Confirmed but not locked 3. Locked
When adding support for emitting these events in the channel monitor, we only covered the case where one of the splice transaction candidates confirmed. We also need to emit an event when none of them can confirm due to a commitment transaction confirming (and no longer under reorg risk) for the pre-splice funding.
wpaulino
force-pushed
the
test-splice-commitment-broadcast
branch
from
527c78a to
7456483
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4068 +/- ##
==========================================
+ Coverage 88.63% 88.66% +0.03%
==========================================
Files 176 176
Lines 131920 132078 +158
Branches 131920 132078 +158
==========================================
+ Hits 116927 117110 +183
+ Misses 12325 12305 -20
+ Partials 2668 2663 -5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
| @@ -5591,6 +5591,17 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> { | |||
| OnchainEvent::FundingSpendConfirmation { commitment_tx_to_counterparty_output, .. } => { | |||
| self.funding_spend_confirmed = Some(entry.txid); | |||
| self.confirmed_commitment_tx_counterparty_output = commitment_tx_to_counterparty_output; | |||
| if self.alternative_funding_confirmed.is_none() && !self.pending_funding.is_empty() { | |||
| for funding in self.pending_funding.drain(..) { | |||
There was a problem hiding this comment.
Don't we need to look at alternative_funding_confirmed and possibly skip one of the pending fundings?
There was a problem hiding this comment.
I think that's only relevant with RBF and it should be covered already by OnchainEvent::AlternativeFundingConfirmation maturing and us calling promote_funding.
This also caught a bug where we weren't including signatures for pending HTLCs in the initial
commitment_signedfor the splice.Depends on #4054.