bump rust-dashcore dependency to latest commit

ZocoLini · ZocoLini · commit 3931d0b3b74a · 2026-03-20T16:58:28.000-07:00
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 = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
-dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
-dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
-key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
-key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
-dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "42eb1d698d4f178d3a8a80c72c9c0f9bbeddcc3e" }
+dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "be0f1fa0f794db7852aac54fd67125e5dd197982" }
+dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "be0f1fa0f794db7852aac54fd67125e5dd197982" }
+dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "be0f1fa0f794db7852aac54fd67125e5dd197982" }
+key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "be0f1fa0f794db7852aac54fd67125e5dd197982" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "be0f1fa0f794db7852aac54fd67125e5dd197982" }
 
 # 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,6 @@ 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_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
@@ -12,9 +12,6 @@ pub use dashcore;
 #[cfg(feature = "core_key_wallet")]
 pub use key_wallet;
 
-#[cfg(feature = "core_key_wallet_manager")]
-pub use key_wallet_manager;
-
 #[cfg(feature = "core_spv")]
 pub use dash_spv;
 
diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_list/update_state_masternode_list/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_list/update_state_masternode_list/v0/mod.rs
@@ -65,7 +65,10 @@ where
                         validator.is_banned = maybe_ban_height.is_some();
                     }
                     if let Some(address) = dmn_state_diff.service {
-                        validator.node_ip = address.ip().to_string();
+                        validator.node_ip = address
+                            .expect("TODO: idk what created this")
+                            .ip()
+                            .to_string();
                     }
 
                     if let Some(p2p_port) = dmn_state_diff.platform_p2p_port {
diff --git a/packages/rs-drive-abci/src/platform_types/masternode/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/masternode/v0/mod.rs
@@ -156,7 +156,7 @@ impl From<DMNState> for MasternodeStateV0 {
         } = value;
 
         Self {
-            service,
+            service: service.expect("TODO: idk what created this"),
             registered_height,
             pose_revived_height,
             pose_ban_height,
@@ -192,7 +192,7 @@ impl From<MasternodeStateV0> for DMNState {
         } = value;
 
         Self {
-            service,
+            service: Some(service),
             registered_height,
             pose_revived_height,
             pose_ban_height,
diff --git a/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/validator/v0/mod.rs
@@ -40,9 +40,12 @@ impl NewValidatorIfMasternodeInState for ValidatorV0 {
         Some(ValidatorV0 {
             pro_tx_hash,
             public_key,
-            node_ip: service.ip().to_string(),
+            node_ip: service
+                .expect("TODO: idk what created this")
+                .ip()
+                .to_string(),
             node_id: PubkeyHash::from_byte_array(platform_node_id),
-            core_port: service.port(),
+            core_port: service.expect("TODO: idk what created this").port(),
             platform_http_port: *platform_http_port as u16,
             platform_p2p_port: *platform_p2p_port as u16,
             is_banned: pose_ban_height.is_some(),
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 }
@@ -31,7 +30,6 @@ rand = "0.8"
 
 
 [features]
-default = ["bls", "eddsa", "manager"]
+default = ["bls", "eddsa"]
 bls = ["key-wallet/bls"]
 eddsa = ["key-wallet/eddsa"]
-manager = ["key-wallet-manager"]
diff --git a/packages/rs-platform-wallet/README.md b/packages/rs-platform-wallet/README.md
@@ -105,12 +105,10 @@ The package is structured as follows:
 ### Compatibility
 - Works with `WalletManager<PlatformWalletInfo>` for standard wallet management
 - Works with `SPVWalletManager<PlatformWalletInfo>` for SPV/light client functionality
-- Fully compatible with existing `key-wallet-manager` infrastructure
 
 ## Dependencies
 
-- `key-wallet`: Core wallet functionality
-- `key-wallet-manager`: Wallet management and SPV support
+- `key-wallet`: Core wallet functionality, wallet management and SPV support
 - `dpp`: Dash Platform Protocol types and identity definitions
 - `dashcore`: Core blockchain types
 
diff --git a/packages/rs-platform-wallet/examples/basic_usage.rs b/packages/rs-platform-wallet/examples/basic_usage.rs
@@ -1,5 +1,6 @@
 //! Example demonstrating basic usage of PlatformWalletInfo
 
+use key_wallet::manager::WalletManager;
 use key_wallet::wallet::managed_wallet_info::wallet_info_interface::WalletInfoInterface;
 use key_wallet::Network;
 use platform_wallet::error::PlatformWalletError;
@@ -22,14 +23,8 @@ fn main() -> Result<(), PlatformWalletError> {
         platform_wallet.identities().len()
     );
 
-    // The platform wallet can be used with WalletManager (requires "manager" feature)
-    #[cfg(feature = "manager")]
-    {
-        use key_wallet_manager::wallet_manager::WalletManager;
-
-        let _wallet_manager = WalletManager::<PlatformWalletInfo>::new(network);
-        println!("Platform wallet successfully integrated with wallet managers!");
-    }
+    let _wallet_manager = WalletManager::<PlatformWalletInfo>::new(network);
+    println!("Platform wallet successfully integrated with wallet managers!");
 
     Ok(())
 }
diff --git a/packages/rs-platform-wallet/src/lib.rs b/packages/rs-platform-wallet/src/lib.rs
@@ -20,6 +20,3 @@ pub use established_contact::EstablishedContact;
 pub use identity_manager::IdentityManager;
 pub use managed_identity::ManagedIdentity;
 pub use platform_wallet_info::PlatformWalletInfo;
-
-#[cfg(feature = "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
@@ -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 {
+        todo!()
+    }
 }
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_ios.sh b/packages/rs-sdk-ffi/build_ios.sh
@@ -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
diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml
@@ -75,7 +75,6 @@ default = [
 ]
 spv-client = [
   "core_spv",
-  "core_key_wallet_manager",
   "core_key_wallet",
   "core_bincode",
   "core_key_wallet_bincode",
@@ -146,14 +145,13 @@ core_verification = ["dpp/core_verification"]
 core_key_wallet = ["dpp/core_key_wallet"]
 core_key_wallet_serde = ["dpp/core_key_wallet_serde"]
 core_key_wallet_bincode = ["dpp/core_key_wallet_bincode"]
-core_key_wallet_manager = ["dpp/core_key_wallet_manager"]
 core_key_wallet_bip38 = ["dpp/core_key_wallet_bip_38"]
 core_spv = ["dpp/core_spv"]
 core_rpc_client = ["dpp/core_rpc_client"]
 shielded = ["dep:grovedb-commitment-tree", "dpp/shielded-client"]
 
 # Platform wallet support
-wallet = ["core_key_wallet_manager", "core_key_wallet",]
+wallet = ["core_key_wallet",]
 
 [[example]]
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ where`
`65`	`65`	`validator.is_banned = maybe_ban_height.is_some();`
`66`	`66`	`}`
`67`	`67`	`if let Some(address) = dmn_state_diff.service {`
`68`		`- validator.node_ip = address.ip().to_string();`
	`68`	`+ validator.node_ip = address`
	`69`	`+ .expect("TODO: idk what created this")`
	`70`	`+ .ip()`
	`71`	`+ .to_string();`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`if let Some(p2p_port) = dmn_state_diff.platform_p2p_port {`