chore(platform-wallet): merge platform-wallet-rehydration (PR #3692) into dash-evo-tool#4039
Merged
Merged
Conversation
… branch Points the 8 rust-dashcore workspace deps at dashpay/rust-dashcore#850 (feat/key-wallet-asset-lock-explicit-utxo-override @ d42081e7), which adds an explicit-UTXO-override escape hatch for asset-lock funding. Updates the one build_asset_lock_with_signer call site in this branch for the new optional override parameter (passed as None — this branch doesn't use the override). TODO(pin) left in Cargo.toml: bump again once #850 merges to dev. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
PR #850 (asset-lock explicit UTXO override) and PR #851 (key-wallet out-of-order UTXO spend fix, #649) are disjoint branches off `dev`. Re-point the pin at #851's head, which this crate's watch-only rehydration work actually needs. The only call site depending on #850's API (`build_asset_lock_with_signer`'s `override_utxo` param) was passing `None` — a no-op default — so dropping the argument to match #851's 5-arg signature is a pure mechanical revert, no behavior change. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
…' into merge-pr3692-into-dash-evo-tool
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Claudius-Maginificent
changed the title
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
2 participants
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 this PR exists
dash-evo-toolapp depends on this repo'sdash-evo-toolintegration branch, which was pinned to an older rust-dashcore rev (647fa982) than PR feat(platform-wallet): load watch-only wallet state from local storage at startup #3692's branch (feat/platform-wallet-rehydration).dash-evo-toolapp doesn't get the rust-dashcore feat(rs-dpp): migrate fees from js-dpp v0.24 #851 fix (key-wallet out-of-order UTXO spend / feat(wasm-dpp): implement asset lock proof bindings #649) that feat(platform-wallet): load watch-only wallet state from local storage at startup #3692 now depends on, nor feat(platform-wallet): load watch-only wallet state from local storage at startup #3692's own watch-only rehydration work.dash-evo-toolbranch up to date with PR feat(platform-wallet): load watch-only wallet state from local storage at startup #3692 (feat(platform-wallet): load watch-only wallet state from local storage at startup #3692).What was done
Merge commit bringing
feat/platform-wallet-rehydration(PR #3692) intodash-evo-tool. Only diff beyond history reconciliation: the rust-dashcore workspace pin bump (647fa982→48a07d3f, tracking rust-dashcore#851) already present on #3692's branch. No conflicts —dash-evo-toolhad never diverged on those Cargo.toml lines.Testing
cargo check -p platform-wallet -p platform-wallet-storage -p platform-wallet-ffi— clean compile against the merged tree.ortmerge strategy; no manual resolution needed.Breaking changes
None.
Checklist
Attribution
🤖 Co-authored by Claudius the Magnificent AI Agent