feat(cketh): act on a sweep's outcome - #11331
Closed
gregorydemay wants to merge 1 commit into
Closed
Conversation
gregorydemay
force-pushed
the
greg/DEFI-2926-sweep-queue-lifecycle
branch
3 times, most recently
from
August 26, 2026 13:58
1dc38bb to
d411b16
Compare
gregorydemay
changed the title
gregorydemay
changed the title
A sweep now owns the deposits it takes: they are marked taken when the request is accepted, dropped if its transaction fails (funds stay at the deposit addresses; retrying is DEFI-2981), and released once it moved them, so the pair can be armed again. A gauge reports where the queue's entries stand.
gregorydemay
force-pushed
the
greg/DEFI-2926-sweep-queue-lifecycle
branch
from
August 26, 2026 17:03
a99a713 to
f4a9467
Compare
gregorydemay
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Adds lifecycle tracking for ckERC20 sweep-queue deposits.
Changes:
- Marks deposits as in flight when assigned to a sweep.
- Removes deposits after successful or failed finalization.
- Exposes sweepable and in-flight queue metrics with tests.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
state/tests.rs |
Adds sweep lifecycle and nonce tests. |
state/automatic_deposits/tests.rs |
Tests queue ownership and outcomes. |
state/automatic_deposits/mod.rs |
Implements sweep tracking and queue depth. |
state/audit.rs |
Applies sweep lifecycle events. |
state.rs |
Handles finalized sweep outcomes. |
main.rs |
Exports sweep queue metrics. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
✅ No security or compliance issues detected. Reviewed everything up to f4a9467. Security Overview
Detected Code Changes
|
mbjorkqvist
reviewed
Aug 27, 2026
mbjorkqvist
left a comment
mbjorkqvist
left a comment
Contributor
There was a problem hiding this comment.
Thanks @gregorydemay!
Comment on lines
+344
to
+347
| assert_eq!( | ||
| entry.swept_by, None, | ||
| "BUG: {request:?} was already taken by another sweep" | ||
| ); |
Contributor
There was a problem hiding this comment.
IIUC, this could also occur if the deposits vec named the same pair twice. Adding some validation to SweepRequest::deposits (at construction and deserialization), which is currently missing, would help. Perhaps changing the type to pub deposits: BTreeMap<(Account, Address), DepositAddress> would be enough?
Comment on lines
+877
to
+897
| #[test] | ||
| fn should_report_a_dropped_deposit_as_unknown_rather_than_awaiting_a_sweep() { | ||
| let mut deposits = queued(); | ||
| assert_matches!(status(&deposits), Some(DepositStatus::AwaitingSweep(_))); | ||
| deposits.record_sweep_scheduled(SweepId(0), &[swept(usdc())]); | ||
|
|
||
| deposits.record_sweep_failed(SweepId(0), &[swept(usdc())]); | ||
|
|
||
| assert_eq!(status(&deposits), None); | ||
| } | ||
|
|
||
| #[test] | ||
| fn should_let_a_pair_whose_sweep_failed_be_armed_again() { | ||
| let mut deposits = queued(); | ||
| deposits.record_sweep_scheduled(SweepId(0), &[swept(usdc())]); | ||
| deposits.record_sweep_failed(SweepId(0), &[swept(usdc())]); | ||
|
|
||
| let armed = deposits.watch_deposit(ts(0), account(0), usdc(), deposit_address(&account(0))); | ||
|
|
||
| assert_matches!(armed, Ok(_)); | ||
| } |
Contributor
There was a problem hiding this comment.
This currently happens rather silently, and a user may end up wondering what happened to their deposit. Would it make sense to make this visible in the minter dashboard somehow (probably not in this PR, and maybe it's already tracked somewhere)?
Contributor
Author
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
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.
Why
What