chore: update dashcore deps to 88eacdf1 (mempool + EventHandler + manager feature)

shumkov · claude · shumkov · commit b435010ab1ac · 2026-03-26T21:53:30.000+07:00
- Update rust-dashcore rev to 88eacdf1 (latest v0.42-dev)
- DMNState.service stays as SocketAddr (revert of Optional was merged in dashcore)
- key-wallet-manager merged into key-wallet::manager
- Manager module gated behind feature flag
- Remove "std" feature from dashcore dep (removed upstream)
- TransactionContext restructured: InBlock(BlockInfo)
- WalletInterface expanded: mempool support, watched_outpoints, monitor_revision
- DashSpvClient gains EventHandler generic
- FFI: dash_spv_ffi_client_new takes FFIEventCallbacks

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,12 +47,11 @@ members = [
 ]
 
 [workspace.dependencies]
-dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
-dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
-dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
-key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
-key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae416458565faac21d3452fbc6d80b324f6d3" }
+dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "88eacdf19d984c34a4bd8a586ede2c4acf055c54" }
+dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "88eacdf19d984c34a4bd8a586ede2c4acf055c54" }
+dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "88eacdf19d984c34a4bd8a586ede2c4acf055c54" }
+key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "88eacdf19d984c34a4bd8a586ede2c4acf055c54" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "88eacdf19d984c34a4bd8a586ede2c4acf055c54" }
 
 # Optimize heavy crypto crates even in dev/test builds so that
 # Halo 2 proof generation and verification run at near-release speed.
diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml
@@ -25,15 +25,13 @@ chrono = { version = "0.4.35", default-features = false, features = [
 chrono-tz = { version = "0.8", optional = true }
 ciborium = { version = "0.2.2", optional = true }
 dashcore = { workspace = true, features = [
-  "std",
   "secp-recovery",
   "rand",
   "signer",
   "serde",
   "eddsa",
 ], default-features = false }
 key-wallet = { workspace = true, optional = true }
-key-wallet-manager = { workspace = true, optional = true }
 dash-spv = { workspace = true, optional = true }
 dashcore-rpc = { workspace = true, optional = true }
 
@@ -94,7 +92,7 @@ core_quorum_validation = ["dashcore/quorum_validation"]
 core_key_wallet = ["dep:key-wallet"]
 core_key_wallet_bincode = ["dep:key-wallet", "key-wallet/bincode"]
 core_key_wallet_bip_38 = ["dep:key-wallet", "key-wallet/bip38"]
-core_key_wallet_manager = ["dep:key-wallet-manager"]
+core_key_wallet_manager = ["dep:key-wallet", "key-wallet/manager"]
 core_key_wallet_serde = ["dep:key-wallet", "key-wallet/serde"]
 core_spv = ["dep:dash-spv"]
 core_rpc_client = ["dep:dashcore-rpc"]
diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs
@@ -13,7 +13,7 @@ pub use dashcore;
 pub use key_wallet;
 
 #[cfg(feature = "core_key_wallet_manager")]
-pub use key_wallet_manager;
+pub use key_wallet::manager;
 
 #[cfg(feature = "core_spv")]
 pub use dash_spv;
diff --git a/packages/rs-platform-wallet/Cargo.toml b/packages/rs-platform-wallet/Cargo.toml
@@ -14,7 +14,6 @@ platform-encryption = { path = "../rs-platform-encryption" }
 
 # Key wallet dependencies (from rust-dashcore)
 key-wallet = { workspace = true }
-key-wallet-manager = { workspace = true, optional = true }
 
 # Core dependencies
 dashcore = { workspace = true }
@@ -34,4 +33,4 @@ rand = "0.8"
 default = ["bls", "eddsa", "manager"]
 bls = ["key-wallet/bls"]
 eddsa = ["key-wallet/eddsa"]
-manager = ["key-wallet-manager"]
+manager = []
diff --git a/packages/rs-platform-wallet/examples/basic_usage.rs b/packages/rs-platform-wallet/examples/basic_usage.rs
diff --git a/packages/rs-platform-wallet/src/lib.rs b/packages/rs-platform-wallet/src/lib.rs
@@ -22,4 +22,4 @@ pub use managed_identity::ManagedIdentity;
 pub use platform_wallet_info::PlatformWalletInfo;
 
 #[cfg(feature = "manager")]
-pub use key_wallet_manager;
+pub use key_wallet::manager;
diff --git a/packages/rs-platform-wallet/src/platform_wallet_info/wallet_info_interface.rs b/packages/rs-platform-wallet/src/platform_wallet_info/wallet_info_interface.rs
@@ -1,6 +1,6 @@
 use crate::platform_wallet_info::PlatformWalletInfo;
 use crate::IdentityManager;
-use dashcore::{Address as DashAddress, Network, Transaction};
+use dashcore::{Address as DashAddress, Network, Transaction, Txid};
 use dpp::prelude::CoreBlockHeight;
 use key_wallet::account::{ManagedAccountCollection, TransactionRecord};
 use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface;
@@ -111,4 +111,12 @@ impl WalletInfoInterface for PlatformWalletInfo {
     fn update_synced_height(&mut self, current_height: u32) {
         self.wallet_info.update_synced_height(current_height)
     }
+
+    fn mark_instant_send_utxos(&mut self, txid: &Txid) -> bool {
+        self.wallet_info.mark_instant_send_utxos(txid)
+    }
+
+    fn monitor_revision(&self) -> u64 {
+        self.wallet_info.monitor_revision()
+    }
 }
diff --git a/packages/rs-platform-wallet/src/platform_wallet_info/wallet_transaction_checker.rs b/packages/rs-platform-wallet/src/platform_wallet_info/wallet_transaction_checker.rs
@@ -13,13 +13,14 @@ impl WalletTransactionChecker for PlatformWalletInfo {
         &mut self,
         tx: &Transaction,
         context: TransactionContext,
-        wallet: &Wallet,
+        wallet: &mut Wallet,
         update_state: bool,
+        update_balance: bool,
     ) -> TransactionCheckResult {
         // Check transaction with underlying wallet info
         let result = self
             .wallet_info
-            .check_core_transaction(tx, context, wallet, update_state)
+            .check_core_transaction(tx, context, wallet, update_state, update_balance)
             .await;
 
         // If the transaction is relevant, and it's an asset lock, automatically fetch identities
diff --git a/packages/rs-sdk-ffi/build.rs b/packages/rs-sdk-ffi/build.rs
@@ -23,7 +23,16 @@ fn main() {
                 "/* This file is auto-generated. Do not modify manually. */\n/* Unified Dash SDK - includes both Core (SPV) and Platform functionality */".to_string(),
             ),
             after_includes: Some(
-                "/* Forward declarations for opaque types */\nstruct ShieldedPoolClient;\n".to_string(),
+                concat!(
+                    "/* Forward declarations for opaque types */\n",
+                    "struct ShieldedPoolClient;\n",
+                    "\n",
+                    "/* Forward declarations for dash-spv-ffi types used by the unified SDK.\n",
+                    " * These allow the header to compile standalone. The full iOS build\n",
+                    " * merges the complete dash_spv_ffi.h definitions via build_ios.sh. */\n",
+                    "typedef struct FFIClientConfig FFIClientConfig;\n",
+                    "typedef struct FFIDashSpvClient FFIDashSpvClient;\n",
+                ).to_string(),
             ),
             includes: vec![],
             sys_includes: vec!["stdint.h".to_string(), "stdbool.h".to_string()],
diff --git a/packages/rs-sdk-ffi/build_ios.sh b/packages/rs-sdk-ffi/build_ios.sh
@@ -78,7 +78,7 @@ fi
 RUST_DASHCORE_DIR="$PROJECT_ROOT/../rust-dashcore"
 HASHFILE="$PROJECT_ROOT/target/.rust_dashcore_ios_hash"
 if [[ -d "$RUST_DASHCORE_DIR" ]] && grep -q 'path.*rust-dashcore' "$PROJECT_ROOT/packages/rs-sdk-ffi/Cargo.toml" "$PROJECT_ROOT/packages/rs-dpp/Cargo.toml" 2>/dev/null; then
-    CURRENT_HASH=$(find "$RUST_DASHCORE_DIR/dash/src" "$RUST_DASHCORE_DIR/key-wallet/src" "$RUST_DASHCORE_DIR/dash-spv/src" "$RUST_DASHCORE_DIR/dash-spv-ffi/src" "$RUST_DASHCORE_DIR/key-wallet-manager/src" -name '*.rs' 2>/dev/null | sort | xargs cat 2>/dev/null | shasum -a 256 | cut -d' ' -f1)
+    CURRENT_HASH=$(find "$RUST_DASHCORE_DIR/dash/src" "$RUST_DASHCORE_DIR/key-wallet/src" "$RUST_DASHCORE_DIR/dash-spv/src" "$RUST_DASHCORE_DIR/dash-spv-ffi/src" -name '*.rs' 2>/dev/null | sort | xargs cat 2>/dev/null | shasum -a 256 | cut -d' ' -f1)
     PREV_HASH=""
     if [[ -f "$HASHFILE" ]]; then
         PREV_HASH=$(cat "$HASHFILE")
@@ -95,7 +95,7 @@ if [[ "$CLEAN_BUILD" -eq 1 ]]; then
     cargo clean --release --target aarch64-apple-ios-sim -p rs-sdk-ffi 2>/dev/null || true
     cargo clean --release --target x86_64-apple-ios -p rs-sdk-ffi 2>/dev/null || true
     # Also clean path-dependency crates that cargo may cache
-    for pkg in dashcore key-wallet key-wallet-manager dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
+    for pkg in dashcore key-wallet dash-spv dash-spv-ffi rs-platform-wallet rs-platform-wallet-ffi; do
         cargo clean --release --target aarch64-apple-ios -p "$pkg" 2>/dev/null || true
         cargo clean --release --target aarch64-apple-ios-sim -p "$pkg" 2>/dev/null || true
         cargo clean --release --target x86_64-apple-ios -p "$pkg" 2>/dev/null || true
@@ -186,6 +186,38 @@ RUST_DASHCORE_PATH="$PROJECT_ROOT/../rust-dashcore"
 KEY_WALLET_HEADER_PATH="$RUST_DASHCORE_PATH/key-wallet-ffi/include/key_wallet_ffi.h"
 SPV_HEADER_PATH="$RUST_DASHCORE_PATH/dash-spv-ffi/include/dash_spv_ffi.h"
 
+# Generate missing FFI headers from rust-dashcore via a host build
+# The build.rs in each crate runs cbindgen to produce the header under include/
+if [ -d "$RUST_DASHCORE_PATH" ]; then
+    if [ ! -f "$KEY_WALLET_HEADER_PATH" ] || [ ! -f "$SPV_HEADER_PATH" ]; then
+        echo -e "${GREEN}Generating FFI headers from rust-dashcore (host build)...${NC}"
+        pushd "$RUST_DASHCORE_PATH" >/dev/null
+        DASHCORE_CARGO_CMD="cargo"
+        if [ -n "${RUST_DASHCORE_TOOLCHAIN:-}" ]; then
+            DASHCORE_CARGO_CMD="cargo +${RUST_DASHCORE_TOOLCHAIN}"
+        fi
+        if [ ! -f "$KEY_WALLET_HEADER_PATH" ]; then
+            echo -ne "  Generating key_wallet_ffi.h..."
+            if $DASHCORE_CARGO_CMD build --release -p key-wallet-ffi > /tmp/cargo_build_kwffi_host.log 2>&1; then
+                echo -e " ${GREEN}done${NC}"
+            else
+                echo -e " ${RED}failed${NC}"
+                cat /tmp/cargo_build_kwffi_host.log
+            fi
+        fi
+        if [ ! -f "$SPV_HEADER_PATH" ]; then
+            echo -ne "  Generating dash_spv_ffi.h..."
+            if $DASHCORE_CARGO_CMD build --release -p dash-spv-ffi > /tmp/cargo_build_spvffi_host.log 2>&1; then
+                echo -e " ${GREEN}done${NC}"
+            else
+                echo -e " ${RED}failed${NC}"
+                cat /tmp/cargo_build_spvffi_host.log
+            fi
+        fi
+        popd >/dev/null
+    fi
+fi
+
 if [ -f "$KEY_WALLET_HEADER_PATH" ] && [ -f "$SPV_HEADER_PATH" ]; then
     # Create merged header with unified include guard
     MERGED_HEADER="$OUTPUT_DIR/dash_unified_ffi.h"
@@ -210,8 +242,8 @@ extern "C" {
 
 // Forward declarations to ensure cross-refs compile regardless of merge order
 typedef struct FFIClientConfig FFIClientConfig;
-// Provide explicit opaque definitions so Swift can import the type names
-typedef struct FFIDashSpvClient { unsigned char _private[0]; } FFIDashSpvClient;
+// Forward declarations so Swift can import the type names
+struct FFIDashSpvClient; typedef struct FFIDashSpvClient FFIDashSpvClient;
 typedef struct FFIWallet { unsigned char _private[0]; } FFIWallet;
 typedef struct FFIAccount { unsigned char _private[0]; } FFIAccount;
 typedef struct FFIAccountCollection { unsigned char _private[0]; } FFIAccountCollection;
@@ -348,9 +380,24 @@ EOF
     echo -e "${GREEN}✓ Headers merged successfully${NC}"
 else
     echo -e "${YELLOW}⚠ Key Wallet FFI or SPV FFI headers not found${NC}"
-    echo -e "${YELLOW}  Please build key-wallet-ffi and dash-spv-ffi first:${NC}"
-    echo -e "${YELLOW}  cd ../../../rust-dashcore/key-wallet-ffi && cargo build --release${NC}"
-    echo -e "${YELLOW}  cd ../../../rust-dashcore/dash-spv-ffi && cargo build --release${NC}"
+    echo -e "${YELLOW}  Patching dash_sdk_ffi.h with forward declarations as fallback...${NC}"
+    # Replace the #include "dash_spv_ffi.h" with forward declarations for the
+    # types that rs-sdk-ffi references from dash-spv-ffi, so the header compiles
+    # even without the external header file.
+    if [ -f "$OUTPUT_DIR/dash_sdk_ffi.h" ]; then
+        TEMP_HEADER=$(mktemp)
+        awk '
+        /^#include "dash_spv_ffi\.h"/ {
+            print "/* dash_spv_ffi.h not available; forward declarations injected */"
+            print "struct FFIClientConfig; typedef struct FFIClientConfig FFIClientConfig;"
+            print "struct FFIDashSpvClient; typedef struct FFIDashSpvClient FFIDashSpvClient;"
+            next
+        }
+        { print }
+        ' "$OUTPUT_DIR/dash_sdk_ffi.h" > "$TEMP_HEADER"
+        mv "$TEMP_HEADER" "$OUTPUT_DIR/dash_sdk_ffi.h"
+        echo -e "${YELLOW}  ⚠ Header patched with minimal forward declarations${NC}"
+    fi
 fi
 
 # Build dash-spv-ffi from local rust-dashcore for device and simulator
diff --git a/packages/rs-sdk-ffi/include/dash_sdk_ffi.h b/packages/rs-sdk-ffi/include/dash_sdk_ffi.h
@@ -11,9 +11,14 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include "dash_spv_ffi.h"
+
+/* Forward declarations for types from dash-spv-ffi.
+ * When building the full unified SDK, the merge step in build_ios.sh replaces
+ * this header with one that includes the complete dash_spv_ffi.h definitions.
+ * These forward declarations keep the header self-contained for local use. */
+#ifndef DASH_SPV_FFI_H
+typedef struct FFIClientConfig FFIClientConfig;
+#endif
 
 // Authorized action takers for token operations
 typedef enum DashSDKAuthorizedActionTakers {
diff --git a/packages/rs-sdk-ffi/src/unified.rs b/packages/rs-sdk-ffi/src/unified.rs
@@ -9,7 +9,7 @@ use std::ffi::c_char;
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use crate::types::{DashSDKConfig, SDKHandle};
-use dash_spv_ffi::{FFIClientConfig, FFIDashSpvClient};
+use dash_spv_ffi::{FFIClientConfig, FFIDashSpvClient, FFIEventCallbacks};
 
 /// Static flag to track unified initialization
 static UNIFIED_INITIALIZED: AtomicBool = AtomicBool::new(false);
@@ -19,6 +19,8 @@ static UNIFIED_INITIALIZED: AtomicBool = AtomicBool::new(false);
 pub struct UnifiedSDKConfig {
     /// Core SDK configuration (ignored if core feature disabled)
     pub core_config: *const FFIClientConfig,
+    /// Event callbacks for core SPV client
+    pub core_callbacks: FFIEventCallbacks,
     /// Platform SDK configuration
     pub platform_config: DashSDKConfig,
     /// Whether to enable cross-layer integration
@@ -72,7 +74,8 @@ pub unsafe extern "C" fn dash_unified_sdk_create(
     let config = &*config;
 
     // Create Core SDK client (always enabled in unified SDK)
-    let core_client = dash_spv_ffi::dash_spv_ffi_client_new(config.core_config);
+    let core_client =
+        dash_spv_ffi::dash_spv_ffi_client_new(config.core_config, config.core_callbacks.clone());
 
     // Create Platform SDK
     let platform_sdk_result = crate::dash_sdk_create(&config.platform_config);
@@ -364,6 +367,7 @@ mod tests {
 
         // Step 2: Create the UnifiedSDKConfig using the pointer
         let unified_config = UnifiedSDKConfig {
+            core_callbacks: FFIEventCallbacks::default(),
             core_config: core_config_ptr,
             platform_config,
             enable_integration: true,
diff --git a/packages/swift-sdk/Sources/SwiftDashSDK/Core/SPV/SPVClient.swift b/packages/swift-sdk/Sources/SwiftDashSDK/Core/SPV/SPVClient.swift
diff --git a/packages/swift-sdk/Sources/SwiftDashSDK/Core/SPV/SPVEventHandler.swift b/packages/swift-sdk/Sources/SwiftDashSDK/Core/SPV/SPVEventHandler.swift
diff --git a/packages/swift-sdk/Sources/SwiftDashSDK/Core/Services/WalletService.swift b/packages/swift-sdk/Sources/SwiftDashSDK/Core/Services/WalletService.swift
