Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 480
Introduce RenegotiatedFundingLocked monitor update variant#3894
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
TheBlueMatt
merged 2 commits into
lightningdevkit:main
from
wpaulino:renegotiated-funding-locked-monitor-updateJul 22, 2025
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -676,6 +676,9 @@ pub(crate) enum ChannelMonitorUpdateStep { | ||
| holder_commitment_tx: HolderCommitmentTransaction, | ||
| counterparty_commitment_tx: CommitmentTransaction, | ||
| }, | ||
| RenegotiatedFundingLocked { | ||
| funding_txid: Txid, | ||
| }, | ||
| } | ||
| impl ChannelMonitorUpdateStep { | ||
| @@ -690,6 +693,7 @@ impl ChannelMonitorUpdateStep { | ||
| ChannelMonitorUpdateStep::ChannelForceClosed { .. } => "ChannelForceClosed", | ||
| ChannelMonitorUpdateStep::ShutdownScript { .. } => "ShutdownScript", | ||
| ChannelMonitorUpdateStep::RenegotiatedFunding { .. } => "RenegotiatedFunding", | ||
| ChannelMonitorUpdateStep::RenegotiatedFundingLocked { .. } => "RenegotiatedFundingLocked", | ||
| } | ||
| } | ||
| } | ||
| @@ -733,6 +737,9 @@ impl_writeable_tlv_based_enum_upgradable!(ChannelMonitorUpdateStep, | ||
| (3, holder_commitment_tx, required), | ||
| (5, counterparty_commitment_tx, required), | ||
| }, | ||
| (12, RenegotiatedFundingLocked) => { | ||
| (1, funding_txid, required), | ||
| }, | ||
| ); | ||
| /// Indicates whether the balance is derived from a cooperative close, a force-close | ||
| @@ -1075,6 +1082,10 @@ impl FundingScope { | ||
| fn funding_txid(&self) -> Txid { | ||
| self.funding_outpoint().txid | ||
| } | ||
| fn is_splice(&self) -> bool { | ||
| self.channel_parameters.splice_parent_funding_txid.is_some() | ||
| } | ||
| } | ||
| impl Writeable for FundingScope { | ||
| @@ -1141,7 +1152,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> { | ||
| channel_keys_id: [u8; 32], | ||
| holder_revocation_basepoint: RevocationBasepoint, | ||
| channel_id: ChannelId, | ||
| first_confirmed_funding_txo: OutPoint, | ||
| first_negotiated_funding_txo: OutPoint, | ||
| counterparty_commitment_params: CounterpartyCommitmentParameters, | ||
| @@ -1209,8 +1220,6 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> { | ||
| // interface knows about the TXOs that we want to be notified of spends of. We could probably | ||
| // be smart and derive them from the above storage fields, but its much simpler and more | ||
| // Obviously Correct (tm) if we just keep track of them explicitly. | ||
| // | ||
| // TODO: Remove entries for stale funding transactions on `splice_locked`. | ||
| outputs_to_watch: HashMap<Txid, Vec<(u32, ScriptBuf)>>, | ||
| #[cfg(any(test, feature = "_test_utils"))] | ||
| @@ -1566,7 +1575,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> { | ||
| (21, self.balances_empty_height, option), | ||
| (23, self.holder_pays_commitment_tx_fee, option), | ||
| (25, self.payment_preimages, required), | ||
| (27, self.first_confirmed_funding_txo, required), | ||
| (27, self.first_negotiated_funding_txo, required), | ||
| (29, self.initial_counterparty_commitment_tx, option), | ||
| (31, self.funding.channel_parameters, required), | ||
| (32, self.pending_funding, optional_vec), | ||
| @@ -1752,7 +1761,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> { | ||
| channel_keys_id, | ||
| holder_revocation_basepoint, | ||
| channel_id, | ||
| first_confirmed_funding_txo: funding_outpoint, | ||
| first_negotiated_funding_txo: funding_outpoint, | ||
| counterparty_commitment_params, | ||
| their_cur_per_commitment_points: None, | ||
| @@ -1811,7 +1820,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> { | ||
| /// [`Persist`]: crate::chain::chainmonitor::Persist | ||
| pub fn persistence_key(&self) -> MonitorName { | ||
| let inner = self.inner.lock().unwrap(); | ||
| let funding_outpoint = inner.first_confirmed_funding_txo; | ||
| let funding_outpoint = inner.first_negotiated_funding_txo; | ||
| let channel_id = inner.channel_id; | ||
| if ChannelId::v1_from_funding_outpoint(funding_outpoint) == channel_id { | ||
| MonitorName::V1Channel(funding_outpoint) | ||
| @@ -3670,6 +3679,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> { | ||
| ); | ||
| return Err(()); | ||
| } | ||
| } else if self.funding.is_splice() { | ||
| // If we've already spliced at least once, we're no longer able to RBF the original | ||
| // funding transaction. | ||
| return Err(()); | ||
| } | ||
| self.outputs_to_watch.insert( | ||
| @@ -3681,6 +3694,30 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> { | ||
| Ok(()) | ||
| } | ||
| fn promote_funding(&mut self, new_funding_txid: Txid) -> Result<(), ()> { | ||
| let new_funding = self | ||
| .pending_funding | ||
| .iter_mut() | ||
| .find(|funding| funding.funding_txid() == new_funding_txid); | ||
| if new_funding.is_none() { | ||
| return Err(()); | ||
| } | ||
| let mut new_funding = new_funding.unwrap(); | ||
| mem::swap(&mut self.funding, &mut new_funding); | ||
| self.onchain_tx_handler.update_after_renegotiated_funding_locked( | ||
| self.funding.current_holder_commitment_tx.clone(), | ||
| self.funding.prev_holder_commitment_tx.clone(), | ||
| ); | ||
| // The swap above places the previous `FundingScope` into `pending_funding`. | ||
| for funding in self.pending_funding.drain(..) { | ||
wpaulino marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| self.outputs_to_watch.remove(&funding.funding_txid()); | ||
| } | ||
| Ok(()) | ||
| } | ||
| #[rustfmt::skip] | ||
| fn update_monitor<B: Deref, F: Deref, L: Deref>( | ||
| &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L> | ||
| @@ -3771,6 +3808,13 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> { | ||
| ret = Err(()); | ||
| } | ||
| }, | ||
| ChannelMonitorUpdateStep::RenegotiatedFundingLocked { funding_txid } => { | ||
| log_trace!(logger, "Updating ChannelMonitor with locked renegotiated funding txid {}", funding_txid); | ||
| if let Err(_) = self.promote_funding(*funding_txid) { | ||
| log_error!(logger, "Unknown funding with txid {} became locked", funding_txid); | ||
| ret = Err(()); | ||
| } | ||
| }, | ||
| ChannelMonitorUpdateStep::ChannelForceClosed { should_broadcast } => { | ||
| log_trace!(logger, "Updating ChannelMonitor: channel force closed, should broadcast: {}", should_broadcast); | ||
| self.lockdown_from_offchain = true; | ||
| @@ -3823,7 +3867,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> { | ||
| |ChannelMonitorUpdateStep::LatestCounterpartyCommitmentTX { .. } | ||
| |ChannelMonitorUpdateStep::ShutdownScript { .. } | ||
| |ChannelMonitorUpdateStep::CommitmentSecret { .. } | ||
| |ChannelMonitorUpdateStep::RenegotiatedFunding { .. } => | ||
| |ChannelMonitorUpdateStep::RenegotiatedFunding { .. } | ||
| |ChannelMonitorUpdateStep::RenegotiatedFundingLocked { .. } => | ||
| is_pre_close_update = true, | ||
| // After a channel is closed, we don't communicate with our peer about it, so the | ||
| // only things we will update is getting a new preimage (from a different channel) | ||
| @@ -5679,7 +5724,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP | ||
| let mut channel_id = None; | ||
| let mut holder_pays_commitment_tx_fee = None; | ||
| let mut payment_preimages_with_info: Option<HashMap<_, _>> = None; | ||
| let mut first_confirmed_funding_txo = RequiredWrapper(None); | ||
| let mut first_negotiated_funding_txo = RequiredWrapper(None); | ||
| let mut channel_parameters = None; | ||
| let mut pending_funding = None; | ||
| read_tlv_fields!(reader, { | ||
| @@ -5696,7 +5741,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP | ||
| (21, balances_empty_height, option), | ||
| (23, holder_pays_commitment_tx_fee, option), | ||
| (25, payment_preimages_with_info, option), | ||
| (27, first_confirmed_funding_txo, (default_value, outpoint)), | ||
| (27, first_negotiated_funding_txo, (default_value, outpoint)), | ||
| (29, initial_counterparty_commitment_tx, option), | ||
| (31, channel_parameters, (option: ReadableArgs, None)), | ||
| (32, pending_funding, optional_vec), | ||
| @@ -5828,7 +5873,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP | ||
| channel_keys_id, | ||
| holder_revocation_basepoint, | ||
| channel_id, | ||
| first_confirmed_funding_txo: first_confirmed_funding_txo.0.unwrap(), | ||
| first_negotiated_funding_txo: first_negotiated_funding_txo.0.unwrap(), | ||
| counterparty_commitment_params, | ||
| their_cur_per_commitment_points, | ||
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.