Skip to content

feat(platform-wallet): serde support #3637

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
QuantumExplorer merged 8 commits into from
May 26, 2026
Merged

feat(platform-wallet): serde support #3637

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1eb2d2d
feat(platform-wallet): add optional serde derives behind serde feature
lklimek May 11, 2026
9485e54
refactor(rs-platform-wallet): drop redundant address_funds serde adapter
lklimek May 13, 2026
6d82a99
docs(rs-platform-wallet): tighten comments per coding-best-practices
lklimek May 13, 2026
561ccb4
feat(rs-platform-wallet): consume rust-dashcore#761 via branch pin, d…
lklimek May 13, 2026
6c11ece
fix(rs-platform-wallet-ffi): drop stale ptr arg from integration_tests
lklimek May 13, 2026
f23183c
chore(rs-platform-wallet-ffi): use Result::is_err in group_info tests
lklimek May 13, 2026
5fe906e
Merge remote-tracking branch 'origin/v3.1-dev' into feat/rs-platform-…
lklimek May 14, 2026
083c6cc
Merge remote-tracking branch 'origin/v3.1-dev' into feat/rs-platform-…
lklimek May 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
46 changes: 24 additions & 22 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.

23 changes: 14 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,20 @@ members = [
]

[workspace.dependencies]
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "53130869e5b9343ae59016323e5e5269e717a8fd" }
# Temporary: branch-pinned to dashpay/rust-dashcore#761 (`feat/key-wallet-serde-derives`)
# for serde derives on AssetLockFundingType + DerivedAddress. The branch has been
# rebased onto 53130869 so it carries ONLY the serde additions (no v0.42-dev drift).
# Drop the branch= override and restore rev= once #761 merges to v0.42-dev and a
# subsequent dashcore rev bump flows the new rev in.
dashcore = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/key-wallet-serde-derives" }
Comment thread
Claudius-Maginificent marked this conversation as resolved.
Outdated
Comment thread
Claudius-Maginificent marked this conversation as resolved.
Outdated

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
4 changes: 2 additions & 2 deletions packages/rs-platform-wallet-ffi/src/tokens/group_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ mod tests {
fn test_decode_other_signer_null_action_id() {
unsafe {
let result = decode_group_info(2, 0, std::ptr::null(), false);
assert!(matches!(result, Err(_)), "expected Err(NullPointer)");
assert!(result.is_err(), "expected Err(NullPointer)");
}
}

Expand All @@ -120,7 +120,7 @@ mod tests {
fn test_decode_invalid_kind() {
unsafe {
let result = decode_group_info(99, 0, std::ptr::null(), false);
assert!(matches!(result, Err(_)), "expected Err(InvalidParameter)");
assert!(result.is_err(), "expected Err(InvalidParameter)");
}
}
}
2 changes: 0 additions & 2 deletions packages/rs-platform-wallet-ffi/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ fn test_wallet_from_mnemonic() {
let result = platform_wallet_info_create_from_mnemonic(
Network::Testnet.into(),
mnemonic.as_ptr(),
std::ptr::null(),
&mut handle,
);

Expand Down Expand Up @@ -266,7 +265,6 @@ fn test_full_workflow() {
let result = platform_wallet_info_create_from_mnemonic(
Network::Testnet.into(),
mnemonic.as_ptr(),
std::ptr::null(),
&mut wallet_handle,
);
assert_eq!(result.code, PlatformWalletFFIResultCode::Success);
Expand Down
10 changes: 10 additions & 0 deletions packages/rs-platform-wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ tracing = "0.1"
# Encoding
hex = "0.4"
bs58 = "0.5"
serde = { version = "1", default-features = false, features = ["derive"], optional = true }
serde_json = "1.0"

# Image processing (DIP-15 avatar hash + fingerprint)
Expand Down Expand Up @@ -65,6 +66,15 @@ default = ["bls", "eddsa"]
bls = ["key-wallet/bls", "key-wallet-manager/bls"]
eddsa = ["key-wallet/eddsa", "key-wallet-manager/eddsa"]
shielded = ["dep:grovedb-commitment-tree", "dep:zip32", "dash-sdk/shielded", "dpp/shielded-client"]
# Opt-in serde derives on the changeset types. Activates `key-wallet/serde`,
# `key-wallet-manager/serde` (both via dashpay/rust-dashcore#761, branch-pinned in
# workspace Cargo.toml), and `dash-sdk/serde`. `dpp` derives serde unconditionally.
serde = [
"dep:serde",
"key-wallet/serde",
"key-wallet-manager/serde",
"dash-sdk/serde",
Comment thread
lklimek marked this conversation as resolved.
]
# Forward to the upstream `key-wallet` / `key-wallet-manager`
# `keep-finalized-transactions` feature. With it OFF (the default),
# chainlocked transactions are evicted from the in-memory
Expand Down
Loading
Loading