diff --git a/Cargo.lock b/Cargo.lock index 57764d230b1..802fb5b6f2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1389,8 +1389,8 @@ dependencies = [ [[package]] name = "dash-network" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "bincode 2.0.0-rc.3", "bincode_derive", @@ -1467,8 +1467,8 @@ dependencies = [ [[package]] name = "dash-spv" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "anyhow", "async-trait", @@ -1498,8 +1498,8 @@ dependencies = [ [[package]] name = "dash-spv-ffi" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "cbindgen 0.29.2", "clap", @@ -1524,8 +1524,8 @@ dependencies = [ [[package]] name = "dashcore" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "anyhow", "base64-compat", @@ -1550,13 +1550,13 @@ dependencies = [ [[package]] name = "dashcore-private" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" [[package]] name = "dashcore-rpc" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "dashcore-rpc-json", "hex", @@ -1568,8 +1568,8 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "bincode 2.0.0-rc.3", "dashcore", @@ -1583,8 +1583,8 @@ dependencies = [ [[package]] name = "dashcore_hashes" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "bincode 2.0.0-rc.3", "dashcore-private", @@ -3402,8 +3402,8 @@ dependencies = [ [[package]] name = "key-wallet" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "aes", "async-trait", @@ -3432,8 +3432,8 @@ dependencies = [ [[package]] name = "key-wallet-ffi" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "cbindgen 0.29.2", "dash-network", @@ -3448,8 +3448,8 @@ dependencies = [ [[package]] name = "key-wallet-manager" -version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=e7792c431c55c0d28efb0344b3a1948f576be5ce#e7792c431c55c0d28efb0344b3a1948f576be5ce" +version = "0.41.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=c0da3509c695351e6dc300723ded35b4f0df16a3#c0da3509c695351e6dc300723ded35b4f0df16a3" dependencies = [ "async-trait", "bincode 2.0.0-rc.3", diff --git a/packages/rs-dapi/Cargo.toml b/packages/rs-dapi/Cargo.toml index b9e69520106..7d2eda0320d 100644 --- a/packages/rs-dapi/Cargo.toml +++ b/packages/rs-dapi/Cargo.toml @@ -87,8 +87,8 @@ prometheus = "0.14" once_cell = "1.19" # Dash Core RPC client -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce" } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3" } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3" } rs-dash-event-bus = { path = "../rs-dash-event-bus" } diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 4805c7aa63f..5d6e4fc58e5 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -24,7 +24,7 @@ chrono = { version = "0.4.35", default-features = false, features = [ ] } chrono-tz = { version = "0.8", optional = true } ciborium = { version = "0.2.2", optional = true } -dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", features = [ +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", features = [ "std", "secp-recovery", "rand", @@ -32,10 +32,10 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c "serde", "eddsa", ], default-features = false } -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } diff --git a/packages/rs-platform-wallet/Cargo.toml b/packages/rs-platform-wallet/Cargo.toml index 67d52b22e2c..81bb4f86d6a 100644 --- a/packages/rs-platform-wallet/Cargo.toml +++ b/packages/rs-platform-wallet/Cargo.toml @@ -11,11 +11,11 @@ description = "Platform wallet with identity management support" dpp = { path = "../rs-dpp" } # Key wallet dependencies (from rust-dashcore) -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce" } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3" } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } # Core dependencies -dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3" } # Standard dependencies thiserror = "1.0" diff --git a/packages/rs-platform-wallet/examples/basic_usage.rs b/packages/rs-platform-wallet/examples/basic_usage.rs index 04a7e0d6ef4..f3a4f8bf6fe 100644 --- a/packages/rs-platform-wallet/examples/basic_usage.rs +++ b/packages/rs-platform-wallet/examples/basic_usage.rs @@ -25,7 +25,7 @@ fn main() -> Result<(), PlatformWalletError> { { use key_wallet_manager::wallet_manager::WalletManager; - let _wallet_manager = WalletManager::::new(); + let _wallet_manager = WalletManager::::new(network); println!("Platform wallet successfully integrated with wallet managers!"); } diff --git a/packages/rs-platform-wallet/src/lib.rs b/packages/rs-platform-wallet/src/lib.rs index b911f515e35..ad2bf0931ac 100644 --- a/packages/rs-platform-wallet/src/lib.rs +++ b/packages/rs-platform-wallet/src/lib.rs @@ -241,11 +241,11 @@ impl WalletInfoInterface for PlatformWalletInfo { self.wallet_info.set_description(description) } - fn birth_height(&self) -> Option { + fn birth_height(&self) -> u32 { self.wallet_info.birth_height() } - fn set_birth_height(&mut self, height: Option) { + fn set_birth_height(&mut self, height: u32) { self.wallet_info.set_birth_height(height) } diff --git a/packages/rs-sdk-ffi/Cargo.toml b/packages/rs-sdk-ffi/Cargo.toml index 815cb5b0887..f7813bb9d4f 100644 --- a/packages/rs-sdk-ffi/Cargo.toml +++ b/packages/rs-sdk-ffi/Cargo.toml @@ -22,7 +22,7 @@ rs-sdk-trusted-context-provider = { path = "../rs-sdk-trusted-context-provider", simple-signer = { path = "../simple-signer" } # Core SDK integration (always included for unified SDK) -dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "e7792c431c55c0d28efb0344b3a1948f576be5ce", optional = true } +dash-spv-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "c0da3509c695351e6dc300723ded35b4f0df16a3", optional = true } # FFI and serialization serde = { version = "1.0", features = ["derive"] }