Skip to content

Randomize order of inputs from OutputSweeper #4033

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 1 commit into from
Sep 4, 2025
Merged

Randomize order of inputs from OutputSweeper #4033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion lightning/src/util/sweep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,13 +574,19 @@ where
let cur_height = sweeper_state.best_block.height;
let cur_hash = sweeper_state.best_block.block_hash;

let respend_descriptors: Vec<&SpendableOutputDescriptor> = sweeper_state
let respend_descriptors_set: HashSet<&SpendableOutputDescriptor> = sweeper_state
.outputs
.iter()
.filter(|o| filter_fn(*o, cur_height))
.map(|o| &o.descriptor)
.collect();

// we first collect into a set to avoid duplicates and to "randomize" the order
// in which outputs are spent. Then we collect into a vec as that is what
// `spend_outputs` requires.
let respend_descriptors: Vec<&SpendableOutputDescriptor> =
respend_descriptors_set.into_iter().collect();

// Generate the spending transaction and broadcast it.
if !respend_descriptors.is_empty() {
let spending_tx = self
Expand Down
Loading