feat(swift-sdk): add ZK sync, local Docker support, and account management (part 1)

Cargo.toml

@@ -51,7 +51,6 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "8cbae41645
 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" }
 
 # Optimize heavy crypto crates even in dev/test builds so that

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"]
 core_key_wallet_serde = ["dep:key-wallet", "key-wallet/serde"]
 core_spv = ["dep:dash-spv"]
 core_rpc_client = ["dep:dashcore-rpc"]

packages/rs-dpp/src/lib.rs

@@ -12,8 +12,7 @@ pub use dashcore;
 #[cfg(feature = "core_key_wallet")]
 pub use key_wallet;
 
-#[cfg(feature = "core_key_wallet_manager")]
-pub use key_wallet_manager;
+// key_wallet_manager was merged into key_wallet crate
 
 #[cfg(feature = "core_spv")]
 pub use dash_spv;

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 = []

packages/rs-platform-wallet/examples/basic_usage.rs

@@ -25,7 +25,7 @@ fn main() -> Result<(), PlatformWalletError> {
     // The platform wallet can be used with WalletManager (requires "manager" feature)
     #[cfg(feature = "manager")]
     {
-        use key_wallet_manager::wallet_manager::WalletManager;
+        use key_wallet::manager::wallet_manager::WalletManager;
 
         let _wallet_manager = WalletManager::<PlatformWalletInfo>::new(network);
         println!("Platform wallet successfully integrated with wallet managers!");

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;

packages/rs-platform-wallet/src/platform_wallet_info/wallet_info_interface.rs

@@ -111,4 +111,8 @@ 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: &dashcore::Txid) -> bool {
+        self.wallet_info.mark_instant_send_utxos(txid)
+    }
 }

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,
+        is_from_mempool: 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, is_from_mempool)
             .await;
 
         // If the transaction is relevant, and it's an asset lock, automatically fetch identities

packages/rs-sdk-ffi/src/sdk.rs

@@ -331,21 +331,47 @@ pub unsafe extern "C" fn dash_sdk_create_trusted(config: *const DashSDKConfig) -
     );
 
     // Create trusted context provider
-    let trusted_provider = match rs_sdk_trusted_context_provider::TrustedHttpContextProvider::new(
-        network,
-        None,                                      // Use default quorum lookup endpoints
-        std::num::NonZeroUsize::new(100).unwrap(), // Cache size
-    ) {
-        Ok(provider) => {
-            info!("dash_sdk_create_trusted: trusted context provider created");
-            Arc::new(provider)
+    // For local/regtest, use the quorum sidecar at localhost:22444 (dashmate Docker default)
+    let is_local = matches!(
+        config.network,
+        DashSDKNetwork::SDKLocal | DashSDKNetwork::SDKRegtest
+    );
+    let trusted_provider = if is_local {
+        info!("dash_sdk_create_trusted: using local quorum sidecar for regtest");
+        match rs_sdk_trusted_context_provider::TrustedHttpContextProvider::new_with_url(
+            network,
+            "http://127.0.0.1:22444".to_string(),
+            std::num::NonZeroUsize::new(100).unwrap(),
+        ) {
+            Ok(provider) => {
+                info!("dash_sdk_create_trusted: local trusted context provider created");
+                Arc::new(provider)
+            }
+            Err(e) => {
+                error!(error = %e, "dash_sdk_create_trusted: failed to create local context provider");
+                return DashSDKResult::error(DashSDKError::new(
+                    DashSDKErrorCode::InternalError,
+                    format!("Failed to create local context provider: {}", e),
+                ));
+            }
         }
-        Err(e) => {
-            error!(error = %e, "dash_sdk_create_trusted: failed to create trusted context provider");
-            return DashSDKResult::error(DashSDKError::new(
-                DashSDKErrorCode::InternalError,
-                format!("Failed to create trusted context provider: {}", e),
-            ));
+    } else {
+        match rs_sdk_trusted_context_provider::TrustedHttpContextProvider::new(
+            network,
+            None,                                      // Use default quorum lookup endpoints
+            std::num::NonZeroUsize::new(100).unwrap(), // Cache size
+        ) {
+            Ok(provider) => {
+                info!("dash_sdk_create_trusted: trusted context provider created");
+                Arc::new(provider)
+            }
+            Err(e) => {
+                error!(error = %e, "dash_sdk_create_trusted: failed to create trusted context provider");
+                return DashSDKResult::error(DashSDKError::new(
+                    DashSDKErrorCode::InternalError,
+                    format!("Failed to create trusted context provider: {}", e),
+                ));
+            }
         }
     };
 

packages/swift-sdk/Sources/SwiftDashSDK/Core/Models/HDWalletModels.swift

@@ -21,6 +21,9 @@ public enum AccountCategory: Equatable, Hashable, Sendable {
     case providerOwnerKeys
     case providerOperatorKeys
     case providerPlatformKeys
+    case dashPayReceivingFunds
+    case dashPayExternalAccount
+    case platformPayment
 }
 
 // MARK: - Account Info

packages/swift-sdk/Sources/SwiftDashSDK/Core/SPV/SPVClient.swift

@@ -47,6 +47,9 @@ class SPVClient: @unchecked Sendable {
                 return dash_spv_ffi_config_mainnet()
             case 1:
                 return dash_spv_ffi_config_testnet()
+            case 2:
+                // Regtest (local Docker)
+                return dash_spv_ffi_config_new(FFINetwork(rawValue: 2))
             case 3:
                 // Map devnet to custom FFINetwork value 3
                 return dash_spv_ffi_config_new(FFINetwork(rawValue: 3))
@@ -134,9 +137,9 @@ class SPVClient: @unchecked Sendable {
     }
 
     private static func readLocalCorePeers() -> [String] {
-        // If no override is set, default to 127.0.0.1 and let FFI pick port by network
+        // If no override is set, default to dashmate Docker Core P2P port
         let raw = UserDefaults.standard.string(forKey: "corePeerAddresses")?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let list = (raw?.isEmpty == false ? raw! : "127.0.0.1")
+        let list = (raw?.isEmpty == false ? raw! : "127.0.0.1:20001")
         return list
             .split(separator: ",")
             .map { $0.trimmingCharacters(in: .whitespaces) }