Skip to content

feat(minter): re-arm the automatic deposits of a dropped sweep - #284

Merged
mbjorkqvist merged 114 commits into
mainfrom
DEFI-2780-09-rearm-dropped-sweeps
Nov 9, 2026
Merged

mbjorkqvist merged 114 commits into
mainfrom
DEFI-2780-09-rearm-dropped-sweeps

Conversation

@gregorydemay

@gregorydemay gregorydemay commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

When the sweep of a deposit detected by the automatic deposit flow of #272 fails or expires, the account is put back on the watchlist for a fresh window, if the watchlist has room, so that the funds still on the deposit address are swept again without the user's intervention. Covered by unit tests of the re-arm and of the replay of the event log.

🤖 Generated with Claude Code

gregorydemay and others added 22 commits October 14, 2026 06:41
Replace the outdated section 3.1.1, which described per-transaction
crediting with getSignaturesForAddress and quotas replenished by the
removed process_deposit endpoint, with a design that builds on the
balance sweep of deposit_sol: a free registration endpoint, a scan
timer reading watched deposit addresses in batches with
getMultipleAccounts, a schedule adapted from the ckETH minter, a fixed
fee in SOL deducted from the minted amount, and a watchlist persisted
only as a bounded snapshot at pre_upgrade. Every change to the
interface, the arguments and the event log is additive, since the
minter is deployed on mainnet.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
State that a re-armed account is reported as watching again, that the
main account receives the sweepable amount minus the fee share, correct
the worst-case cost arithmetic and state its success assumption, and
distinguish a failed upgrade from a reinstallation.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…ring

Move the sequence diagram of the automatic flow ahead of its
explanation, remove the semicolon that broke the mermaid parser on
GitHub, and define the deposit id where it is first used in the section.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…he constraint

State that scan ticks are guarded like the other timers so that they
never overlap, and base the automatic deposit fee constraint on the
single-signature fee share that a pending mint actually bears.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Drop the separate status query: calling the registration endpoint again
returns the stored registration or the id of the deposit in flight, as
deposit_eth does in the ckETH minter.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
… signature lookup

Spell out that scan ticks never overlap, that the fee derivation is a
single-attempt estimate with re-arm costs absorbed by the minter, and
that only manual deposits are retried by the caller. Remove
getSignaturesForAddress from the RPC inventory and cost tables, since
the minter no longer uses it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
A re-armed entry restarts its schedule from the first gap, bounded by
the remaining window, and a re-arm only ever follows a detection.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Record the watchlist snapshot on every upgrade so that an older one
cannot be replayed after the watchlist emptied, and let the transaction
submission section account for deposits queued by the balance scan.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
The window ends with the last scan, and the next registration call
starts a new window rather than reporting a registration without a
next scan.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…it ids

Follow the ckETH minter: a registration freezes neither the minimum
deposit amount nor the automatic deposit fee, both are quoted and the
values in force at detection apply, the fee being recorded with the
queued deposit. deposit_sol compares the latest deposit id of the
account before and after its balance read, and a registration is
allowed while a deposit_sol call is in progress.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…edule

Measure gaps from the previous scan as before, but end the window at a
fixed 24 hours after registration, as the ckETH minter does, so that
the accumulated tick and call delays have slack and clients and the
re-arm share one unambiguous boundary.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…ence

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…owner rationale

The fee recorded at detection matters for deposits an upgrade finds not
yet credited; a credited deposit has its mint amount in CreditedSweep.
The minter's principal is excluded as a deposit owner because its
default account is the ledger's minting account, not because of an
address collision.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…xample with the automatic flow

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…er a concurrent scan

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…n delay and the fee worst case

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…or to new registrations

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…vents the automatic flow adds

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@gregorydemay
gregorydemay added this pull request to stack #288 October 14, 2026 08:50
Copilot AI balanced review requested due to automatic review settings October 14, 2026 09:04
@gregorydemay
gregorydemay force-pushed the DEFI-2780-09-rearm-dropped-sweeps branch from cbcba4e to 0df76d9 Compare October 14, 2026 09:04

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

Re-arm outcomes depend on transient watchlist capacity and therefore diverge during event replay.

1 open finding
What changed in this PR

Re-arms automatic deposits after failed or expired sweeps.

Changes:

  • Adds watchlist re-arm logic and failure handling.
  • Returns dropped deposits for re-registration.
  • Adds tests and updates design documentation.
File Description
minter/​src/​state/​watchlist/​tests.rs Tests re-arm behavior.
minter/​src/​state/​watchlist/​mod.rs Implements watchlist re-arming.
minter/​src/​state/​tests.rs Tests sweep failure and replay.
minter/​src/​state/​mod.rs Re-arms deposits when sweeps are dropped.
minter/​src/​state/​deposits/​tests.rs Tests returned dropped deposits.
minter/​src/​state/​deposits/​mod.rs Returns deposits from dropped sweeps.
minter/​src/​state/​audit.rs Passes event timestamps during replay.
docs/​src/​development/​design.md Documents restored watch windows.

🧠 Review effort: Balanced


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread minter/src/state/mod.rs Resolved
@gregorydemay
gregorydemay force-pushed the DEFI-2780-09-rearm-dropped-sweeps branch from 0df76d9 to b76a77e Compare October 14, 2026 09:18
Copilot AI balanced review requested due to automatic review settings October 14, 2026 09:18

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔵 Needs a closer look

Event replay can change re-arm decisions and reset scan progress because the live watchlist is not restored.

2 open findings

🧠 Review effort: Balanced

Comment thread minter/src/state/mod.rs Resolved
Comment thread minter/src/state/deposits/mod.rs Resolved
Comment thread minter/src/state/watchlist/mod.rs Resolved
Comment thread minter/src/state/watchlist/mod.rs Resolved
Comment thread minter/src/state/watchlist/mod.rs Resolved
Comment thread minter/src/state/mod.rs Resolved
mbjorkqvist and others added 17 commits October 27, 2026 10:16
…t per address

The balances are paired with the addresses by position, and the SOL RPC
canister does not guarantee one account per requested address in the
pinned version, so a short response would leave the addresses past its
end unread. A response with the wrong number of accounts is now an error.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Pins the parameters, the response size estimate and the cycles the minter
chooses for 1 and 100 addresses, which the tests of the response alone
leave unchecked.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e to the SOL RPC canister

As for every other call, the SOL RPC canister prices the call with its own
default estimate, which allows 192 bytes per account without data in its
upcoming release, close to what the minter estimated, so the minter no
longer mirrors the canister's internal sizes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Recording it when the responses arrive skipped a slot that passed while
the reads were in flight. The registration the reads were made for must
still be live when they arrive.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… a failed read

A tick that finds the previous one still waiting for its calls makes no
call, and a failed read of a registration that was replaced or expired
meanwhile leaves the current registration untouched.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…balance read of deposit_sol

Pins why deposit_sol compares the latest deposit id of the account rather
than the one in flight: a deposit queued by a scan and minted before the
balance read returns must not free the account for a second deposit from
the stale balance.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…d one

Since a balance scan of the automatic flow can queue the deposit an account's
deposit_sol call returns, its mint may be reduced by the automatic deposit fee.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Follows the minter, which no longer passes a response size estimate with
getMultipleAccounts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…d-sweeps

Keeps the version of Watchlist::register of the base branch, without the
Expired arm that the base removed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… the state transition

The re-arm ran in the state transition of FailedTransaction and
ExpiredTransaction, so post_upgrade replayed it against a watchlist without the
transient registrations it was made against, and replayed its log line at
every upgrade. The live caller now records the drop and then re-arms through
process_dropped_sweep, which logs the outcome once, with a refused re-arm at
Info. The state transition only drops the deposits again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The docs of the swept deposits and of the Dropped status still said that only
deposit_sol follows a dropped sweep. The re-arm no longer claims to keep an
existing registration, since the account of a deposit in flight is never
watched, and the test of that impossible case goes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… event log

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e live one

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Approval recommended

No active review issues remain for the automatic sweep retry changes.

2 open issues

Review effort: Balanced

mbjorkqvist and others added 3 commits November 3, 2026 12:17
Replace the pins to the dfinity/sol-rpc-canister#394 commit with the released
sol_rpc_client 7.0.0 and sol_rpc_types 4.0.0, and run the integration tests
against the SOL RPC canister v1.4.0 release wasm.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Approval recommended

No active review issues are reported for the automatic-deposit retry changes.

2 open issues

Review effort: Balanced

@zeropath-ai

zeropath-ai Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

✅ No security or compliance issues detected. Reviewed everything up to 6d9b24f.

Security Overview
Detected Code Changes
Change Type Relevant files
Enhancement ► minter/src/monitor/mod.rs
    Refactor to use process_dropped_sweep instead of process_event for certain swept transactions
Enhancement ► minter/src/monitor/mod.rs
    Include process_dropped_sweep import and adjust event handling for FailedTransaction/ExpiredTransaction
Enhancement ► minter/src/state/audit.rs
    Add process_dropped_sweep function to re-arm automatic deposits after a sweep is dropped or expired
Enhancement ► minter/src/state/audit.rs
    Extend process_event usage with new dropped sweep handling
Enhancement ► minter/src/state/event.rs
    Update EventType with documentation notes for dropped transactions and link to process_dropped_sweep
Enhancement ► minter/src/state/watchlist/mod.rs
    Add RearmError enum and rearm method on Watchlist to re-arm dropped deposits
Enhancement ► minter/src/state/watchlist/mod.rs
    Expose rearm to return WatchedAddress or RearmError
Enhancement ► minter/src/state/watchlist/tests.rs
    Add tests around rearm behavior and state replay implications for dropped sweeps
Enhancement ► minter/src/state/deposits/mod.rs
    Update documentation to mention re-arm of automatic deposits after drop
Bug Fix ► libs/types/src/lib.rs
    Clarify Dropped variant description to reflect automatic re-arm behavior after drop
Bug Fix ► minter/src/monitor/tests.rs
    Extend tests to cover should_rearm_the_automatic_deposit_of_a_failed_or_expired_sweep and related flows

Comment thread minter/src/state/watchlist/mod.rs Resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants