-
Notifications
You must be signed in to change notification settings - Fork 463
Splice fixes for chanmon_consistency fuzz target
#4655
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
Open
wpaulino
wants to merge
2
commits into
lightningdevkit:main
Choose a base branch
from
wpaulino:splice-chanmon-consistency-fixes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+17
−5
Open
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
Jump to
Jump to file
Failed to load files.
Loading
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 |
|---|---|---|
|
|
@@ -102,6 +102,7 @@ use std::sync::atomic; | |
| use std::sync::{Arc, Mutex}; | ||
|
|
||
| const MAX_FEE: u32 = 10_000; | ||
| const MAX_SETTLE_ITERATIONS: usize = 256; | ||
| struct FuzzEstimator { | ||
| ret_val: atomic::AtomicU32, | ||
| } | ||
|
|
@@ -2814,9 +2815,20 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> { | |
| .. | ||
| } => { | ||
| let signed_tx = nodes[node_idx].wallet.sign_tx(unsigned_transaction).unwrap(); | ||
| nodes[node_idx] | ||
| .funding_transaction_signed(&channel_id, &counterparty_node_id, signed_tx) | ||
| .unwrap(); | ||
| match nodes[node_idx].funding_transaction_signed( | ||
| &channel_id, | ||
| &counterparty_node_id, | ||
| signed_tx, | ||
| ) { | ||
| Ok(()) => {}, | ||
| Err(APIError::APIMisuseError { ref err }) | ||
| if err.contains("not expecting funding signatures") => | ||
| { | ||
| // A queued signing event can be invalidated by a later `tx_abort` | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Stricter invariant might check if the tx_abort has indeed happened. |
||
| // before the application handles it. | ||
| }, | ||
| Err(e) => panic!("{e:?}"), | ||
| } | ||
| }, | ||
| events::Event::SpliceNegotiated { new_funding_txo, .. } => { | ||
| let mut txs = nodes[node_idx].broadcaster.txn_broadcasted.borrow_mut(); | ||
|
|
@@ -2854,9 +2866,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> { | |
| fn process_all_events(&mut self) { | ||
| let mut last_pass_no_updates = false; | ||
| for i in 0..std::usize::MAX { | ||
| if i == 100 { | ||
| if i == MAX_SETTLE_ITERATIONS { | ||
| panic!( | ||
| "It may take may iterations to settle the state, but it should not take forever" | ||
| "It may take many iterations to settle the state, but it should not take forever" | ||
| ); | ||
| } | ||
| let mut made_progress = self.checkpoint_manager_persistences(); | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Codex's analysis on why it's needed: