From 1e8f252802c3935b81839c6d9c4fb93822faedf1 Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 8 Sep 2026 12:59:27 -0500 Subject: [PATCH] build: make the workspace lockfile vendorable with --locked cargo vendor --locked refused the workspace with two dual-source packages: serde-wasm-bindgen came from the QuantumExplorer fork (wasm-dpp) and the dashpay fork (wasm-sdk, wasm-dpp2) at once, and versioned-feature-core 1.0.0 came from crates.io (via grovedb-version) and from git (rs-platform-version). Offline build systems that vendor the workspace, such as Dash Core's depends packaging of the C++ embedding crate, cannot proceed past that error. Point wasm-dpp at the dashpay fork, which is the QuantumExplorer branch plus the uint8array fix and the current wasm-bindgen pin, and point rs-platform-version at the crates.io release of versioned-feature-core, which is the same commit the git pin held (the repo's only substantive commit, published as 1.0.0 two days after the pin was written; src/lib.rs is byte-identical). The lockfile loses the two duplicate entries and nothing else changes. Validated: cargo check for platform-version, dash-platform-queries, dash-sdk, rs-sdk-ffi and drive-abci on the host; wasm-dpp, wasm-sdk and wasm-dpp2 check for wasm32-unknown-unknown; the tests-rs-workspace transport-free guards still pass; cargo vendor --locked now succeeds (829 crates). --- Cargo.lock | 25 +++++-------------------- packages/rs-platform-version/Cargo.toml | 2 +- packages/wasm-dpp/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfcf96c827e..0f726d3c274 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3199,7 +3199,7 @@ version = "5.0.1" source = "git+https://github.com/dashpay/grovedb?rev=6fc7e1e82de27a56c3428c0d5dd15b5f6a0ea23e#6fc7e1e82de27a56c3428c0d5dd15b5f6a0ea23e" dependencies = [ "thiserror 2.0.18", - "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "versioned-feature-core", ] [[package]] @@ -5219,7 +5219,7 @@ dependencies = [ "bincode", "grovedb-version", "thiserror 2.0.18", - "versioned-feature-core 1.0.0 (git+https://github.com/dashpay/versioned-feature-core)", + "versioned-feature-core", ] [[package]] @@ -6890,16 +6890,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "git+https://github.com/QuantumExplorer/serde-wasm-bindgen?branch=feat%2Fnot_human_readable#121d1f7fbf62cb97f74b91626a1b23851098cc82" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde-wasm-bindgen" version = "0.5.0" @@ -8538,11 +8528,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "898c0ad500fdb1914df465a2c729fce33646ef65dfbbbd16a6d8050e0d2404df" -[[package]] -name = "versioned-feature-core" -version = "1.0.0" -source = "git+https://github.com/dashpay/versioned-feature-core#560157096c8405a46ce0f21a2e7e1bd11d6625b4" - [[package]] name = "virtue" version = "0.0.17" @@ -8761,7 +8746,7 @@ dependencies = [ "num_enum 0.7.6", "pastey", "serde", - "serde-wasm-bindgen 0.5.0 (git+https://github.com/QuantumExplorer/serde-wasm-bindgen?branch=feat%2Fnot_human_readable)", + "serde-wasm-bindgen 0.5.0", "serde_json", "thiserror 2.0.18", "wasm-bindgen", @@ -8782,7 +8767,7 @@ dependencies = [ "hex", "js-sys", "serde", - "serde-wasm-bindgen 0.5.0 (git+https://github.com/dashpay/serde-wasm-bindgen?branch=fix%2Fuint8array-to-bytes)", + "serde-wasm-bindgen 0.5.0", "serde_json", "sha2", "thiserror 1.0.69", @@ -8867,7 +8852,7 @@ dependencies = [ "rs-dapi-client", "rs-sdk-trusted-context-provider", "serde", - "serde-wasm-bindgen 0.5.0 (git+https://github.com/dashpay/serde-wasm-bindgen?branch=fix%2Fuint8array-to-bytes)", + "serde-wasm-bindgen 0.5.0", "serde_json", "sha2", "thiserror 2.0.18", diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 20a03a62f27..363b9490c19 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" [dependencies] thiserror = { version = "2.0.12" } bincode = { version = "=2.0.1" } -versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" } +versioned-feature-core = "1.0.0" grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "6fc7e1e82de27a56c3428c0d5dd15b5f6a0ea23e" } [features] diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml index b05083e6a5d..859c8474525 100644 --- a/packages/wasm-dpp/Cargo.toml +++ b/packages/wasm-dpp/Cargo.toml @@ -22,7 +22,7 @@ wasm-bindgen = { version = "=0.2.108" } js-sys = "0.3.64" web-sys = { version = "0.3.64", features = ["console"] } thiserror = { version = "2.0.17" } -serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" } +serde-wasm-bindgen = { git = "https://github.com/dashpay/serde-wasm-bindgen", branch = "fix/uint8array-to-bytes" } dpp = { path = "../rs-dpp", default-features = false, features = [ "json-conversion", "state-transitions",