sweepbatcher: filter batches by signing mode - #1233
Merged
bhandras merged 1 commit intoSep 18, 2026
Merged
Conversation
Standard clients can leave regular Loop In HTLC sweeps and presigned static-address sweeps pending at the same time. Fee-only selection offers sweeps to incompatible batches, producing warnings before retrying a compatible batch. Filter incompatible signing modes in both greedy selection and its fallback. Keep the admission warnings as safeguards. Add regression coverage for both mismatch directions through both selection paths. All four cases emit the original warnings without the fix. Manual regtest swaps reproduce both warnings on the old server and complete without either warning with this change.
starius
marked this pull request as ready for review
September 18, 2026 06:24
hieblmi
approved these changes
Sep 18, 2026
hieblmi
left a comment
hieblmi
left a comment
Collaborator
There was a problem hiding this comment.
Thank you for the fix, this looks good to me!
|
|
||
| // Admission keeps every sweep in a batch in the same signing mode. | ||
| for _, sweep := range b.sweeps { | ||
| return sweep.presigned == presigned |
Collaborator
There was a problem hiding this comment.
ah ok, this expects every sweep in the sweeps to have the same mode.
bhandras
approved these changes
Sep 18, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Standard clients can leave regular Loop In HTLC sweeps and presigned static-address sweeps pending at the same time. Fee-only selection offers sweeps to incompatible batches, producing warnings before retrying a compatible batch.
Filter incompatible signing modes in both greedy selection and its fallback. Keep the admission warnings as safeguards.
Add regression coverage for both mismatch directions through both selection paths. All four cases emit the original warnings without the fix. Manual regtest swaps reproduce both warnings on the old server and complete without either warning with this change.
Pull Request Checklist
docs/release-notes/release-notes-next.md, or apply theno-changeloglabel (required by CI)