dashpay · Claudius-Maginificent · May 5, 2026 · May 5, 2026 · May 5, 2026 · May 5, 2026
@@ -49,14 +49,14 @@ members = [
 ]
 
 [workspace.dependencies]
-dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "eb889af13f667ed39c35e8e8a0830eeedf523476" }
+dashcore = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+dash-spv = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+key-wallet = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+dash-network = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", branch = "fix/sml-extnetinfo-v3-decode" }
 
 # Optimize heavy crypto crates even in dev/test builds so that
 # Halo 2 proof generation and verification run at near-release speed.

@@ -36,6 +36,9 @@ bincode = { version = "=2.0.1" }
 # Hex used for error diagnostics that include a wallet_id.
 hex = "0.4"
 
+# `IndexMap` mirrors `platform-wallet`'s insertion-ordered outputs API.
+indexmap = "2.7"
+
 # Persistence loader emits structured warnings for skipped /
 # corrupt rows so operators can detect snapshot drift without a
 # native debugger attached.

@@ -58,7 +58,7 @@ pub unsafe extern "C" fn platform_wallet_manager_create(
     // return and leaves the spawned task running on that runtime.
     let _runtime_guard = runtime().enter();
 
-    let manager = PlatformWalletManager::new(sdk, persister, handler);
+    let manager = PlatformWalletManager::new(sdk, persister, vec![handler]);
     let handle = PLATFORM_WALLET_MANAGER_STORAGE.insert(manager);
     *out_handle = handle;
 

@@ -27,6 +27,11 @@ arc-swap = "1"
 
 # Collections
 bimap = "0.6"
+# `IndexMap` powers the insertion-ordered public outputs map on
+# `PlatformAddressWallet::transfer` / `transfer_with_change_address`.
+# Same crate that dpp and rs-sdk already vendor; pin a workspace-aligned
+# minor that satisfies all in-tree requirements.
+indexmap = "2.7"
 
 # Async runtime
 tokio = { version = "1", features = ["sync", "rt", "time", "macros"] }
@@ -100,17 +105,57 @@ tokio = { version = "1", features = ["sync", "rt", "time", "macros", "test-util"
 # Re-enable the SDK with mocks feature for test-only mock builders;
 # the non-test build keeps the leaner default-feature SDK above.
 dash-sdk = { path = "../rs-sdk", default-features = false, features = ["dashpay-contract", "dpns-contract", "wallet", "mocks"] }
-# Used by `examples/shielded_sync_paloma.rs` to build the SDK against
-# a remote devnet that doesn't have Core RPC reachable — supplies
-# proof verification via a separate HTTP quorum-list service.
-rs-sdk-trusted-context-provider = { path = "../rs-sdk-trusted-context-provider" }
 
+# E2E test framework — see `tests/e2e/` for the integration harness
+# that exercises the wallet → SDK → broadcast pipeline against a
+# live testnet bank wallet. Pinned to the canonical published crate
+# names; cargo normalizes dash/underscore in keys but the published
+# name is the source of truth (e.g. `tokio-shared-rt`).
+tokio-shared-rt = "0.1"
+tempfile = "3"
+dotenvy = "0.15"
+bip39 = "2"
+fs2 = "0.4"
+serde = { version = "1", features = ["derive"] }
+simple-signer = { path = "../simple-signer", features = ["derive"] }
+parking_lot = "0.12"
+# `dash-async::block_on` is the runtime-flavor-agnostic bridge used by
+# `framework/context_provider.rs` to call `SpvRuntime`'s async API
+# from the synchronous `ContextProvider` trait. Handles all three
+# tokio runtime scenarios (no runtime, current-thread, multi-thread)
+# without the `block_in_place` panic that `tokio::task::block_in_place`
+# triggers on a current-thread runtime.
+dash-async = { path = "../rs-dash-async" }
+# `rt` feature gives us `CancellationToken` for the panic-hook +
+# graceful-shutdown wiring described in the e2e plan.
+tokio-util = { version = "0.7", features = ["rt"] }
+# `TrustedHttpContextProvider` is the e2e harness's current default
+# context provider. It backs `Sdk::set_context_provider` with the
+# operator-trusted Quorum HTTP endpoint built into the crate (per
+# network) so testnet / mainnet runs work without spinning up an
+# SPV client. The SPV-backed provider lives in `framework/spv.rs`
+# and `framework/context_provider.rs` and is currently disabled
+# (see harness.rs) — re-enable when SPV cold-start is stable
+# (Task #15). Also used by `examples/shielded_sync_paloma.rs` to run
+# against a remote devnet without a reachable Core RPC.
+rs-sdk-trusted-context-provider = { path = "../rs-sdk-trusted-context-provider", features = ["dpns-contract"] }
+# In-memory test runs (NoPlatformPersistence) need finalized txs retained in RAM.
+# Re-declaring here enables the feature for the test target only; production
+# builds pay no memory overhead. Per upstream rust-dashcore maintainer guidance.
+key-wallet = { workspace = true, features = ["keep-finalized-transactions"] }
+key-wallet-manager = { workspace = true, features = ["keep-finalized-transactions"] }
 
 [features]
 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:rusqlite", "dep:zip32", "dep:futures", "dash-sdk/shielded", "dpp/shielded-client"]
+# Opt-in gate for the live integration suite under `tests/e2e/`. Off by
+# default so a stock `cargo test` (and workspace CI) never compiles or
+# runs the network-dependent harness. Pulls in `shielded` so an e2e run
+# exercises the shielded-pool cases too. Run with:
+# `cargo test -p platform-wallet --test e2e --features e2e`.
+e2e = ["shielded"]
 # Opt-in serde derives on the changeset types. Activates `key-wallet/serde`,
 # `key-wallet-manager/serde`, and `dash-sdk/serde`. `dpp` derives serde unconditionally.
 serde = [
@@ -131,3 +176,11 @@ keep-finalized-transactions = [
     "key-wallet/keep-finalized-transactions",
     "key-wallet-manager/keep-finalized-transactions",
 ]
+
+# Live integration suite. `required-features` keeps the harness out of a
+# stock `cargo test` build entirely — it compiles and runs only under
+# `--features e2e`. This replaces the former per-test `#[ignore]` gating.
+[[test]]
+name = "e2e"
+path = "tests/e2e.rs"
+required-features = ["e2e"]
@@ -51,7 +51,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let event_handler: Arc<dyn PlatformEventHandler> = Arc::new(NoopEventHandler);
 
     // Create a manager
-    let manager = PlatformWalletManager::new(sdk.clone(), persister, event_handler);
+    let manager = PlatformWalletManager::new(sdk.clone(), persister, vec![event_handler]);
 
     // Create a wallet from seed bytes
     let seed_bytes = [0u8; 64]; // dummy seed for example

@@ -1,3 +1,4 @@
+use dashcore::OutPoint;
 use dpp::address_funds::PlatformAddress;
 use dpp::fee::Credits;
 use dpp::identifier::Identifier;
@@ -28,6 +29,16 @@ pub enum PlatformWalletError {
     #[error("Invalid identity data: {0}")]
     InvalidIdentityData(String),
 
+    #[error(
+        "on-chain {op} succeeded for identity {identity} but local persistence failed: {source}"
+    )]
+    PersistedAfterOnChainSuccess {
+        identity: Identifier,
+        op: &'static str,
+        #[source]
+        source: crate::changeset::PersistenceError,
+    },
+
     #[error("Contact request not found: {0}")]
     ContactRequestNotFound(Identifier),
 
@@ -63,6 +74,12 @@ pub enum PlatformWalletError {
     #[error("Transaction building failed: {0}")]
     TransactionBuild(String),
 
+    #[error(
+        "Transaction builder selected an unavailable UTXO (concurrent spend); retry. \
+         Selected outpoints: {selected:?}"
+    )]
+    ConcurrentSpendConflict { selected: Vec<OutPoint> },
+
     #[error("no spendable inputs available on {account_type} account {account_index}: {context}")]
     NoSpendableInputs {
         account_type: StandardAccountType,

@@ -4,15 +4,13 @@
 //! platform-specific events. Applications implement this trait to receive
 //! all events by reference (no cloning).
 //!
-//! [`PlatformEventManager`] dispatches events to registered handlers.
-//! It implements [`EventHandler`] so it can be passed directly to
-//! `DashSpvClient`, and supports dynamic handler registration via
-//! lock-free `ArcSwap`.
+//! [`PlatformEventManager`] dispatches events to a fixed handler set
+//! provided at construction. It implements [`EventHandler`] so it can
+//! be passed directly to `DashSpvClient`, mirroring dash-spv's own
+//! immutable `event_handlers` model.
 
 use std::sync::Arc;
 
-use arc_swap::ArcSwap;
-
 pub use dash_spv::EventHandler;
 pub use key_wallet_manager::WalletEvent;
 
@@ -92,40 +90,29 @@ pub trait PlatformEventHandler: EventHandler {
     fn on_shielded_tree_progress(&self, _leaves_committed: u64, _total_target: u64) {}
 }
 
-/// Dispatches events to all registered [`PlatformEventHandler`]s.
+/// Dispatches events to a fixed set of [`PlatformEventHandler`]s.
 ///
 /// Passed to `DashSpvClient` as the `EventHandler` (via `Arc<Self>`).
-/// Supports dynamic handler registration via [`add_handler`](Self::add_handler).
-///
-/// Read path (every event): one atomic pointer load, then iterate.
-/// Write path (add_handler): clone Vec + atomic swap — rare, not on SPV hot path.
+/// The handler set is supplied once at construction and never mutated,
+/// matching the immutable `event_handlers` the wrapped dash-spv layer
+/// consumes. Read path (every event): iterate the boxed slice.
 pub struct PlatformEventManager {
-    handlers: ArcSwap<Vec<Arc<dyn PlatformEventHandler>>>,
+    handlers: Arc<[Arc<dyn PlatformEventHandler>]>,
 }
 
 impl PlatformEventManager {
-    /// Create a new event manager with initial handlers.
+    /// Create a new event manager with the full handler set.
     pub fn new(handlers: Vec<Arc<dyn PlatformEventHandler>>) -> Self {
         Self {
-            handlers: ArcSwap::from_pointee(handlers),
+            handlers: handlers.into(),
         }
     }
 
-    /// Register an additional handler. Lock-free for readers.
-    pub fn add_handler(&self, handler: Arc<dyn PlatformEventHandler>) {
-        self.handlers.rcu(|current| {
-            let mut new = (**current).clone();
-            new.push(handler.clone());
-            new
-        });
-    }
-
     /// Dispatch a platform-address sync completion to every handler.
     ///
     /// Not on the SPV hot path — called once per sync pass (~15s).
     pub fn on_platform_address_sync_completed(&self, summary: &PlatformAddressSyncSummary) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_platform_address_sync_completed(summary);
         }
     }
@@ -136,8 +123,7 @@ impl PlatformEventManager {
     /// (~60s by default).
     #[cfg(feature = "shielded")]
     pub fn on_shielded_sync_completed(&self, summary: &ShieldedSyncPassSummary) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_shielded_sync_completed(summary);
         }
     }
@@ -149,8 +135,7 @@ impl PlatformEventManager {
     /// path during a cold sync.
     #[cfg(feature = "shielded")]
     pub fn on_shielded_sync_progress(&self, cumulative_scanned: u64, block_height: u64) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_shielded_sync_progress(cumulative_scanned, block_height);
         }
     }
@@ -165,45 +150,39 @@ impl PlatformEventManager {
     /// frequent path during a cold sync.
     #[cfg(feature = "shielded")]
     pub fn on_shielded_tree_progress(&self, leaves_committed: u64, total_target: u64) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_shielded_tree_progress(leaves_committed, total_target);
         }
     }
 }
 
 impl EventHandler for PlatformEventManager {
     fn on_sync_event(&self, event: &dash_spv::sync::SyncEvent) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_sync_event(event);
         }
     }
 
     fn on_network_event(&self, event: &dash_spv::network::NetworkEvent) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_network_event(event);
         }
     }
 
     fn on_progress(&self, progress: &dash_spv::sync::SyncProgress) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_progress(progress);
         }
     }
 
     fn on_wallet_event(&self, event: &WalletEvent) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_wallet_event(event);
         }
     }
 
     fn on_error(&self, error: &str) {
-        let handlers = self.handlers.load();
-        for h in handlers.iter() {
+        for h in self.handlers.iter() {
             h.on_error(error);
         }
     }