Skip to content

fix(platform-wallet-storage): replay persisted spends on wallet restore #4814

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

Closed
Claudius-Maginificent wants to merge 4 commits into from
Closed

fix(platform-wallet-storage): replay persisted spends on wallet restore #4814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0dfa29
fix(platform-wallet-storage): replay persisted spends on wallet restore
lklimek Sep 18, 2026
86b1c4c
chore(deps): bump rust-dashcore to d774dded and drop the local patch
lklimek Sep 18, 2026
aea2ffc
Merge remote-tracking branch 'origin/v4.3-dev' into fix/platform-wall…
lklimek Sep 25, 2026
81f1a1c
chore(deps): repin rust-dashcore to d774dded after merging v4.3-dev
lklimek Sep 25, 2026
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
48 changes: 24 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "74818ceb9
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "74818ceb95805f56f141d24ca41f58b75c031a7f" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "74818ceb95805f56f141d24ca41f58b75c031a7f" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "74818ceb95805f56f141d24ca41f58b75c031a7f" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "e4208c90786a6854bd498315bcb571ef24182c15" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "d774dded51dd45147aa3f46525c4181db5f0b7d2" }
tokio-metrics = "0.5"

# Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which
Expand Down
2 changes: 2 additions & 0 deletions packages/rs-platform-wallet-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ serial_test = "3"
platform-wallet-storage = { path = ".", default-features = false, features = ["sqlite", "cli", "secrets", "kv", "__test-helpers", "test-util"] }
# The adapter is a tokio task; the durability test drives it and awaits its
# join handle. Current-thread runtime only — nothing here needs threads.
# Also drives key-wallet's async `check_core_transaction` in the
# restore-then-redeliver regression tests (`sqlite_core_state_reader.rs`).
tokio = { version = "1", features = ["rt", "macros", "sync"] }
# The adapter's cancellation handle — the test passes a never-fired token, but
# the parameter is part of the public signature.
Expand Down
7 changes: 7 additions & 0 deletions packages/rs-platform-wallet-storage/src/sqlite/persister.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,13 @@ fn load_one_wallet(
hex::encode(wallet_id)
))
})?;
// Spends by a foreign winner leave no record for the rehydration above
// to replay; their stamped sweep holds are the only durable trace. Merge
// them before the wallet is handed to the manager, i.e. before any
// block or mempool event can redeliver the funding transaction.
let spend_holds = schema::core_state::load_observed_spend_holds(conn, &wallet_id)
.map_err(PersistenceError::from)?;
wallet_info.merge_observed_spent_outpoints(spend_holds);
if account_manifest
.provider
.iter()
Expand Down
Loading
Loading