Skip to content

fix(swift-sdk): stop born-spent TXO rows at the persistence seam and reconcile the store after a full scan #4638

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

Merged
lklimek merged 13 commits into from
Sep 11, 2026
Merged

fix(swift-sdk): stop born-spent TXO rows at the persistence seam and reconcile the store after a full scan #4638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c098ac1
feat(platform-wallet): carry the engine's credit verdicts through the…
llbartekll Sep 9, 2026
b6197b6
fix(swift-sdk): write born-spent TXO rows spent, and reconcile the st…
llbartekll Sep 9, 2026
d7515ac
test(swift-sdk): verify the credit-verdict seam and the store reconcile
llbartekll Sep 9, 2026
e71f639
fix(platform-wallet, swift-sdk): durable evidence only — merge, class…
llbartekll Sep 10, 2026
d478786
Merge remote-tracking branch 'origin/v4.2-dev' into fix/swift-sdk-txo…
llbartekll Sep 10, 2026
7ce3573
fix(platform-wallet-ffi): report a failing credit-verdict slot throug…
llbartekll Sep 10, 2026
b19989b
fix(platform-wallet, swift-sdk): decide heal eligibility in the engin…
llbartekll Sep 10, 2026
f8e8460
chore: pin rust-dashcore to integration/v4.2-pin-plus-989 (current pi…
llbartekll Sep 10, 2026
a74e78b
fix(platform-wallet-ffi, swift-sdk): degrade unmappable tags to Unkno…
llbartekll Sep 10, 2026
0b77da9
fix(platform-wallet, swift-sdk): judge verdicts on one snapshot, guar…
llbartekll Sep 10, 2026
da84e31
fix(platform-wallet): drop the test-only slices wrapper, copy `Output…
llbartekll Sep 10, 2026
2b61dca
fix(swift-sdk, platform-wallet): fail the heal on an unreadable accou…
llbartekll Sep 11, 2026
0b87b4b
fix(swift-sdk): a failed TXO lookup fails the reconcile step instead …
llbartekll Sep 11, 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
46 changes: 23 additions & 23 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 @@ -53,14 +53,14 @@ members = [
]

[workspace.dependencies]
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "93260bf39bac5d9d09e89bfb45e9ea3ff7fdcbcd" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }

@romchornyi romchornyi Sep 10, 2026

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.

This pins the whole workspace to a throwaway branch that is now behind dev, and rolls four merged fixes back in the process.

All eight dependencies move from 93260bf3 to 697bfb72. I checked that rev against rust-dashcore:

  • It is not on dev — dev...697bfb72 is diverged, ahead=1, behind=5, and the only branch whose head it is is integration/v4.2-pin-plus-989.
  • Its single unique commit is 697bfb72 fix(dash-spv): stop losing derived scripts, and close the loop on wallet state — the pre-merge version of fix(dash-spv): stop losing derived scripts, and close the loop on wallet state rust-dashcore#989. That PR merged into dev today as e4208c90, so the reason this integration branch exists is already gone.
  • Meanwhile the pin is missing four other merged commits: #1000 (ask every account whether a transaction is new), #1005 (build!: adopt GroveDB bincode across the workspace — a breaking build change), #1001 (keep a spend-first coin recognisable) and #1004 (discover DashPay asset unlock receipts).

So merging as-is ties platform to a branch nothing else references and moves the pin backwards relative to dev, including across a build! change. Re-pinning to a dev rev gets #989 and the other four together.

@llbartekll llbartekll Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The rev is behind dev, but it does not roll anything back relative to platform: v4.2-dev pins 93260bf3, which already lacks #1000, #1001, #1004 and #1005; 697bfb72 is exactly that pin plus #989. Pinning to a dev rev is what the PR wants too, and it is blocked: #1005 (GroveDB bincode, build!) landed on dev before #989, so every dev rev that has #989 also has #1005, which platform cannot build until #4635 merges. The PR body states the plan: the integration branch is a stand-in until #4635 lands, then the pin moves to dev and the branch is deleted. If you would rather this PR not touch the pin at all and leave the bump to #4635/#4627, that is a one-commit revert; leaving the decision with @llbartekll.

@llbartekll llbartekll Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Decision: staying on the integration branch. Without #989 this fix does not work end to end on the device (the engine drops the spending blocks), so the PR has to carry it, and no dev rev can be pinned until #4635 lands. Once it does, the pin moves to dev in a follow-up and integration/v4.2-pin-plus-989 is deleted; that step is tracked in the PR body.

key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "697bfb7251123e5ad12848631b819668119ef722" }
tokio-metrics = "0.5"

# Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which
Expand Down
Loading
Loading