feat: recovery actions for network-dropped unconfirmed transactions - #982
Merged
Merged
Conversation
A wallet with stalled sends (e.g. CoinJoin sweep chunks stuck at "Sending") had no way out: dash-spv only rebroadcasts unconfirmed self-sent txs in the session that broadcast them, and the tx-detail recovery section was gated to stuck asset locks. - Tx detail: offer "Remove if not on Blockchain" for ANY transaction still in mempool context (never IS-locked or mined), not just parked asset locks. The existing rails stay: explorer check first, refusal when the tx is on-chain, filter-rescan safety net after. - Core Sync Status: new "Unconfirmed Transactions" card with a live count and a confirmed, destructive "Drop Unconfirmed & Rescan" action that drops every mempool-context tx of the active wallet in one pass, frees the TXOs they tried to spend, reloads the runtime, and rescans filters back past the oldest dropped tx. The bulk path deliberately skips the per-tx explorer check - the rescan restores anything that was actually mined. - UnconfirmedTransactionRemover: single-tx and bulk paths share one surgery (un-spend inputs, delete rows, asset-lock bookmark + metadata cleanup, runtime reload, rescan arm). - SwiftDashSDKWalletSource.isWalletMember promoted to internal for the wallet-scoped bulk fetch instead of duplicating it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Warning Review limit reached
Next review available in: 46 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughAdds single and bulk removal for active-wallet unconfirmed transactions. Shared helpers clean local state and rescan filters. The SPV status screen and transaction details expose recovery actions and rescan results. ChangesUnconfirmed Transaction Recovery
Estimated code review effort: 4 (Complex) | ~45 minutes Sequence Diagram(s)sequenceDiagram
participant User
participant SwiftDashSDKSPVStatusScreen
participant UnconfirmedTransactionRemover
participant WalletRuntime
User->>SwiftDashSDKSPVStatusScreen: Confirm removal
SwiftDashSDKSPVStatusScreen->>UnconfirmedTransactionRemover: Remove active-wallet unconfirmed transactions
UnconfirmedTransactionRemover->>WalletRuntime: Reload state and rescan filters
WalletRuntime-->>UnconfirmedTransactionRemover: Return rescan status
UnconfirmedTransactionRemover-->>SwiftDashSDKSPVStatusScreen: Return removed count and rescan status
SwiftDashSDKSPVStatusScreen-->>User: Show progress or result
Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
QuantumExplorer
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swift (1)
91-130: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winRe-fetch and revalidate the transaction after the explorer await.
explorerKnowsTransactionsuspends whilerowandwalletIdare captured. During that suspension, main-actor work can change the row or active wallet. Immediately beforeexcise, re-fetch the transaction and require wallet membership,context == 0,blockHeight == 0, and the same active wallet. Abort without deleting if any check fails.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swift` around lines 91 - 130, The remove flow in remove(txidWire:) must re-fetch and revalidate state immediately after explorerKnowsTransaction returns and before excise. Re-read the active wallet and transaction using the existing context, require wallet membership, unchanged active wallet, context == 0, blockHeight == 0, and the same transaction identity; abort with the appropriate existing error without deleting if any check fails.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swift`:
- Around line 5-14: Update remove(txidWire:) and dropAllUnconfirmedAndRescan()
so every successful removal arms a recovery rescan extending past the oldest
removed transaction, without maxRescanBlocks truncating fromHeight. Persist the
rescan request and retry or propagate arm failures instead of swallowing them;
non-running-SPV and catch paths must not report success unless a full recovery
path is guaranteed.
In `@DashWallet/Sources/UI/Menu/SyncInfo/SwiftDashSDKSPVStatusScreen.swift`:
- Around line 780-807: Move the recovery state and business logic out of the
SwiftUI view into an `@MainActor` ObservableObject ViewModel: in
SwiftDashSDKSPVStatusScreen.swift lines 69-76, relocate the recovery state; in
lines 780-807, move dropUnconfirmedAndRescan() and its service calls/result
handling into that ViewModel; in lines 471-529, render ViewModel state and
invoke its intent. In TxDetailViewController.swift lines 505-511, implement the
recovery UI as SwiftUI backed by a ViewModel rather than extending UIKit UI
logic.
---
Outside diff comments:
In
`@DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swift`:
- Around line 91-130: The remove flow in remove(txidWire:) must re-fetch and
revalidate state immediately after explorerKnowsTransaction returns and before
excise. Re-read the active wallet and transaction using the existing context,
require wallet membership, unchanged active wallet, context == 0, blockHeight ==
0, and the same transaction identity; abort with the appropriate existing error
without deleting if any check fails.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 424a3c7d-164f-4519-8f12-6fe0ba43fc40
📒 Files selected for processing (6)
DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swiftDashWallet/Sources/UI/Home/Views/HomeViewModel.swiftDashWallet/Sources/UI/Menu/SyncInfo/SwiftDashSDKSPVStatusScreen.swiftDashWallet/Sources/UI/Tx/Details/Model/TxDetailModel.swiftDashWallet/Sources/UI/Tx/Details/TxDetailViewController.swiftDashWallet/en.lproj/Localizable.strings
- remove(txidWire:): the explorer check suspends the main actor, so re-fetch and re-validate everything before surgery (row still mempool-context, wallet membership, active wallet unchanged). - The recovery rescan depth is no longer capped at ~5 weeks: it always reaches back past the oldest removed transaction's first appearance (the SDK floors at birth height / stored chain data), and a row with no usable first-seen rescans from the floor. - A rescan that fails to arm is surfaced instead of swallowed: both removal paths return the arm outcome and the tx-detail HUD / Core Sync result banner direct the user to run Rescan Filters manually. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swift`:
- Around line 273-285: Update the rescan-bound comment near the rescan logic in
UnconfirmedTransactionRemover to remove the obsolete five-week maximum and
describe the implemented minimum rescan window with uncapped recovery depth.
Keep the comment consistent with blocksBack and the wallet
birth-height/chain-data floors.
- Line 173: Update the zero-row guard in the unconfirmed transaction removal
method to return rescanArmed: false, since no recovery rescan runs when rows is
empty. Preserve the existing dropped count and rescanArmed: true result for
paths that perform the recovery rescan.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 9654ddb4-4067-474e-a447-54aad1093eb8
📒 Files selected for processing (4)
DashWallet/Sources/Infrastructure/SwiftDashSDK/UnconfirmedTransactionRemover.swiftDashWallet/Sources/UI/Menu/SyncInfo/SwiftDashSDKSPVStatusScreen.swiftDashWallet/Sources/UI/Tx/Details/TxDetailViewController.swiftDashWallet/en.lproj/Localizable.strings
🚧 Files skipped from review as they are similar to previous changes (2)
- DashWallet/Sources/UI/Menu/SyncInfo/SwiftDashSDKSPVStatusScreen.swift
- DashWallet/en.lproj/Localizable.strings
- Zero-row bulk drop returns rescanArmed: false (no rescan ran). - minRescanBlocks doc no longer claims a ~5-week maximum; depth is uncapped, floored only by birth height / stored chain data. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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
1 participant
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.
What
Two user-facing recovery paths for transactions stuck in mempool state ("Sending" forever — never InstantSend-locked, never mined), e.g. CoinJoin sweep chunks whose broadcasts the network dropped:
Tx detail — "Remove if not on Blockchain" for any stuck transaction. Previously the recovery section only appeared for parked asset-lock transfers; a plain classic send stuck at mempool context had no action at all. Now any transaction in
.processingstate gets the removal action, with the existing rails unchanged: the local row must still be unconfirmed, a block explorer is consulted first (on-chain ⇒ removal refused), and a compact-filter rescan afterward restores the tx if the explorer was wrong. Since the CoinJoin Withdrawals group sheet already navigates into tx detail, each stuck sweep chunk is now individually recoverable.Core Sync Status — "Drop Unconfirmed & Rescan". A new "Unconfirmed Transactions" card shows a live count of the active wallet's mempool-context transactions and offers a confirmed, destructive bulk action: drop them all in one pass, free the TXOs they tried to spend, do the full runtime reload, and arm a filter rescan reaching back past the oldest dropped transaction. The bulk path deliberately skips the per-tx explorer check — the rescan is the safety net that restores anything actually mined — and the confirmation dialog says exactly that. Nothing is ever sent to the network.
Why
dash-spv rebroadcasts unconfirmed self-sent transactions every 10 minutes, but only in-memory for the session that broadcast them — after an app restart nothing resends them, so a dropped tx is permanently stalled and the coins it tried to spend stay locked. This shipped state was observed in the field: 10 CoinJoin sweep chunks (82 UTXOs, ~36.8 DASH) stuck at "Sending" with no recovery affordance.
Implementation notes
UnconfirmedTransactionRemoverrefactored so the single-tx and bulk paths share one surgery: un-spend inputs (explicitisSpentflip — the.nullifyinverse alone isn't enough), delete rows, drop asset-lock bookmarks, metadata cleanup, runtime reload, rescan arm.SwiftDashSDKWalletSource.isWalletMemberpromoted fromprivateto internal and reused for the wallet-scoped bulk fetch (no copy-then-adapt).DashWallet/en.lproj/Localizable.strings.Verification
dashpayscheme build (ARCHS=arm64, iphonesimulator). Unit-test target is pre-existing-broken per CLAUDE.md.Follow-up (not in this PR)
The durable upstream fix is for dash-spv to repopulate its rebroadcast set from persisted unconfirmed self-authored transactions on wallet load, so stalls of this class stop happening.
🤖 Generated with Claude Code
Summary by CodeRabbit
New Features
Bug Fixes
Documentation