Introduce RenegotiatedFunding monitor update variant #3822
Conversation
|
👋 Thanks for assigning @TheBlueMatt as a reviewer! |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3822 +/- ##
==========================================
- Coverage 89.92% 89.83% -0.10%
==========================================
Files 163 163
Lines 131647 131832 +185
Branches 131647 131832 +185
==========================================
+ Hits 118383 118428 +45
- Misses 10571 10716 +145
+ Partials 2693 2688 -5 ☔ 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. |
wpaulino
force-pushed
the
renegotiated-funding-monitor-update
branch
from
6c78591 to
ac8c8c5
Compare
wpaulino
force-pushed
the
renegotiated-funding-monitor-update
branch
from
ac8c8c5 to
5f0709f
Compare
|
🔔 1st Reminder Hey @TheBlueMatt @jkczyz! This PR has been waiting for your review. |
| @@ -1677,7 +1677,33 @@ impl<SP: Deref> Channel<SP> where | |||
| res | |||
| }, | |||
| ChannelPhase::Funded(mut funded_channel) => { | |||
| let res = funded_channel.commitment_signed(msg, logger).map(|monitor_update_opt| (None, monitor_update_opt)); | |||
| #[cfg(splicing)] | |||
There was a problem hiding this comment.
Sheesh, is it too late to make this a new damn message? We now have three totally separate handling logic for commitment_signed, and this one doesn't even make any sense - we're receiving a single commitment_signed but we actually need two if we were in a normal state...
There was a problem hiding this comment.
Sheesh, is it too late to make this a new damn message?
Probably not? Would be a trivial thing to change, but it would basically be a copy of the commitment_signed message.
this one doesn't even make any sense - we're receiving a single commitment_signed but we actually need two if we were in a normal state...
I'm not following, what do you mean by "normal state"? This is handling the case where we haven't finished negotiating a splice transaction. We expect a single commitment_signed to be exchanged for the alternative commitments at the current commitment number. After the negotiation finishes, if we're expecting a batch and they didn't send it, we'll fail the channel. If we're not expecting a batch and they did send it, we'll also fail the channel.
lightning/src/ln/channel.rs
Outdated
| pending_splice_funding, &self.holder_commitment_point, msg, logger, | ||
| )?; | ||
|
|
||
| let counterparty_commitment_tx = self.context.build_commitment_transaction( |
There was a problem hiding this comment.
Bleh, we already build the commitment tx in validate_commitment_signed, lets not do it again.
There was a problem hiding this comment.
We need to build both, validate_commitment_signed builds the holder one, this builds the counterparty one
| // There may be a pending monitor update for a `revoke_and_ack` or preimage we have to | ||
| // handle first. | ||
| } else { | ||
| self.monitor_updating_paused(false, false, false, Vec::new(), Vec::new(), Vec::new()); |
There was a problem hiding this comment.
Note that you can call monitor_updating_paused even if its already paused.
There was a problem hiding this comment.
I figured, just seemed redundant. Do you want it to be called anyway?
wpaulino
force-pushed
the
renegotiated-funding-monitor-update
branch
from
5f0709f to
689d0c1
Compare
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
689d0c1 to
4a38fd2
Compare
|
🔔 2nd Reminder Hey @TheBlueMatt @jkczyz! This PR has been waiting for your review. |
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.Depends on #3774.