Introduce RenegotiatedFunding monitor update variant #3822
Conversation
|
👋 Thanks for assigning @tankyleo as a reviewer! |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3822 +/- ##
==========================================
- Coverage 89.87% 89.75% -0.12%
==========================================
Files 160 160
Lines 129654 129825 +171
Branches 129654 129825 +171
==========================================
+ Hits 116523 116529 +6
- Misses 10434 10592 +158
- Partials 2697 2704 +7 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
👋 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. |
This is a new `ChannelMonitorUpdateStep` variant intended to be used whenever a new funding transaction for the channel has been negotiated via the `InteractiveTxConstructor`. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs (both for the initial dual funding transaction, and splice transactions). To draw a parallel to channel open, we generally want to have the commitment transactions negotiated for the funding transaction and committed to the respective `ChannelMonitor` before attempting to sign the funding transaction itself. This monitor update fulfills this need for a newly negotiated splice; it includes both the new holder and counterparty commitment transactions, and the new set of applicable `ChannelTransactionParameters`. Once the monitor update has been applied to the monitor and persisted, we allow the release of our `tx_signatures` for the splice transaction to wait for its confirmation.
wpaulino
force-pushed
the
renegotiated-funding-monitor-update
branch
from
6c78591 to
ac8c8c5
Compare
| let mut alternative_htlcs = alternative_counterparty_commitment_tx.nondust_htlcs().iter(); | ||
| while let Some(alternative_htlc) = alternative_htlcs.next() { | ||
| if alternative_htlc.transaction_output_index.is_none() { | ||
| continue; |
There was a problem hiding this comment.
I think we can stop iterating entirely here ?
| .filter(|htlc_with_source| { | ||
| htlc_with_source.0.transaction_output_index.is_some() | ||
| && alternative_htlc.is_data_equal(&htlc_with_source.0) | ||
| }) |
There was a problem hiding this comment.
I think we can use take_while here to stop iterating as soon as the closure returns false on some element; all elements after the first false will return false.
Sorry I suggested using take_while here, but took a second look and realized this iterator starts from the very beginning of htlcs_with_sources, so this won't work.
| }; | ||
| let mut htlcs_with_sources = current_counterparty_commitment_htlcs.clone(); | ||
| let mut alternative_htlcs = alternative_counterparty_commitment_tx.nondust_htlcs().iter(); | ||
| while let Some(alternative_htlc) = alternative_htlcs.next() { |
There was a problem hiding this comment.
Would be simpler if we zipped alternative_htlcs and htlcs_with_sources, and just assigned the index from the alternative_htlcs element into the htlcs_with_sources element on each iteration ? I realize I may be missing something here.
| return Err(()); | ||
| } | ||
|
|
||
| if let Some(parent_funding_txid) = channel_parameters.splice_parent_funding_txid.as_ref() { |
There was a problem hiding this comment.
For now this always matches right ? It will not match for RBFs of the very first dual funding transaction ?
This is a new
ChannelMonitorUpdateStepvariant intended to be used whenever a new funding transaction for the channel has been negotiated via theInteractiveTxConstructor. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs (both for the initial dual funding transaction, and splice transactions).To draw a parallel to channel open, we generally want to have the commitment transactions negotiated for the funding transaction and committed to the respective
ChannelMonitorbefore attempting to sign the funding transaction itself. This monitor update fulfills this need for a newly negotiated splice; it includes both the new holder and counterparty commitment transactions, and the new set of applicableChannelTransactionParameters. Once the monitor update has been applied to the monitor and persisted, we allow the release of ourtx_signaturesfor the splice transaction to wait for its confirmation.Note: This currently doesn't build without some of the work done in #3736.
Depends on #3774.