Skip to content

#3259 followups #3275

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.

Sign up for GitHub

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
merged 5 commits into from
Aug 29, 2024
Merged

#3259 followups #3275

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e285cb
Only generate an `Event::DiscardFunding` when we need to
TheBlueMatt Aug 27, 2024
3b70bd2
Add missing pending changelog for downgrade on unsafe funding
TheBlueMatt Aug 27, 2024
6a81d5d
Add additional documentation on `Channel::unbroadcasted_funding`
TheBlueMatt Aug 28, 2024
683aa83
Correct manual shutdown detection on channel closure
TheBlueMatt Aug 28, 2024
ea646ae
Test manual funding transaction `Event::DiscardFunding` generation
TheBlueMatt Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3457,6 +3457,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {

/// Returns the transaction if there is a pending funding transaction that is yet to be
/// broadcast.
///
/// Note that if [`Self::is_manual_broadcast`] is true the transaction will be a dummy
/// transaction.
Comment on lines +3462 to +3463
Copy link
Contributor

@jkczyz jkczyz Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we have used an enum indicating the manual case? Or does that affect the serialization logic / format?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could swap this, yea. We didn't bother in the initial PR cause we forgot about this issue until it was basically ready.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this method is only actually used in batch funding, which never has a non-transaction, so...

pub fn unbroadcasted_funding(&self) -> Option<Transaction> {
self.if_unbroadcasted_funding(|| self.funding_transaction.clone())
}
Expand Down