diff --git a/Cargo.lock b/Cargo.lock index 609dcf222a4..71beda0ae36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1381,6 +1381,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "dash-network" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" +dependencies = [ + "bincode 2.0.0-rc.3", + "bincode_derive", + "hex", + "serde", +] + [[package]] name = "dash-network" version = "0.40.0" @@ -1452,6 +1463,34 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dash-spv" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" +dependencies = [ + "anyhow", + "async-trait", + "bincode 1.3.3", + "blsful", + "clap", + "crossterm", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "hex", + "hickory-resolver", + "indexmap 2.11.3", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tracing", + "tracing-subscriber", +] + [[package]] name = "dash-spv" version = "0.40.0" @@ -1463,13 +1502,13 @@ dependencies = [ "blsful", "clap", "crossterm", - "dashcore", - "dashcore_hashes", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "hex", "hickory-resolver", "indexmap 2.11.3", - "key-wallet", - "key-wallet-manager", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "log", "rand 0.8.5", "serde", @@ -1486,13 +1525,13 @@ version = "0.40.0" source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" dependencies = [ "cbindgen 0.29.0", - "dash-spv", - "dashcore", + "dash-spv 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "env_logger 0.10.2", "hex", - "key-wallet", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "key-wallet-ffi", - "key-wallet-manager", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "libc", "log", "once_cell", @@ -1506,7 +1545,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" dependencies = [ "anyhow", "base64-compat", @@ -1516,9 +1555,34 @@ dependencies = [ "bitvec", "blake3", "blsful", - "dash-network", - "dashcore-private", - "dashcore_hashes", + "dash-network 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "ed25519-dalek", + "hex", + "hex_lit", + "log", + "rustversion", + "secp256k1", + "serde", + "thiserror 2.0.16", +] + +[[package]] +name = "dashcore" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" +dependencies = [ + "anyhow", + "bech32", + "bincode 2.0.0-rc.3", + "bincode_derive", + "bitvec", + "blake3", + "blsful", + "dash-network 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "ed25519-dalek", "hex", "hex_lit", @@ -1529,6 +1593,11 @@ dependencies = [ "thiserror 2.0.16", ] +[[package]] +name = "dashcore-private" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" + [[package]] name = "dashcore-private" version = "0.40.0" @@ -1537,7 +1606,7 @@ source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d10 [[package]] name = "dashcore-rpc" version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" dependencies = [ "dashcore-rpc-json", "hex", @@ -1550,25 +1619,37 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.40.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" dependencies = [ "bincode 2.0.0-rc.3", - "dashcore", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", "hex", - "key-wallet", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", "serde", "serde_json", "serde_repr", "serde_with 2.3.3", ] +[[package]] +name = "dashcore_hashes" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" +dependencies = [ + "bincode 2.0.0-rc.3", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "rs-x11-hash", + "secp256k1", + "serde", +] + [[package]] name = "dashcore_hashes" version = "0.40.0" source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" dependencies = [ "bincode 2.0.0-rc.3", - "dashcore-private", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "rs-x11-hash", "secp256k1", "serde", @@ -1756,8 +1837,8 @@ dependencies = [ "chrono", "chrono-tz", "ciborium", - "dash-spv", - "dashcore", + "dash-spv 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", "dashcore-rpc", "data-contracts", "derive_more 1.0.0", @@ -1770,8 +1851,8 @@ dependencies = [ "itertools 0.13.0", "json-schema-compatibility-validator", "jsonschema", - "key-wallet", - "key-wallet-manager", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", "lazy_static", "log", "nohash-hasher", @@ -3373,6 +3454,35 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "key-wallet" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" +dependencies = [ + "aes", + "base58ck", + "bincode 2.0.0-rc.3", + "bincode_derive", + "bip39", + "bitflags 2.9.4", + "bs58", + "dash-network 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "getrandom 0.2.16", + "hex", + "hkdf", + "rand 0.8.5", + "scrypt", + "secp256k1", + "serde", + "serde_json", + "sha2", + "tracing", + "zeroize", +] + [[package]] name = "key-wallet" version = "0.40.0" @@ -3385,10 +3495,10 @@ dependencies = [ "bip39", "bitflags 2.9.4", "bs58", - "dash-network", - "dashcore", - "dashcore-private", - "dashcore_hashes", + "dash-network 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore-private 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "getrandom 0.2.16", "hex", "hkdf", @@ -3407,16 +3517,30 @@ version = "0.40.0" source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219#befd0356bebfcd0d06d1028d8a03bfa4c78bd219" dependencies = [ "cbindgen 0.29.0", - "dash-network", - "dashcore", + "dash-network 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "hex", - "key-wallet", - "key-wallet-manager", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "libc", "secp256k1", "tokio", ] +[[package]] +name = "key-wallet-manager" +version = "0.40.0" +source = "git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582#8b5ac9170668722ac0bdddb5fae710f167f2e582" +dependencies = [ + "async-trait", + "bincode 2.0.0-rc.3", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=8b5ac9170668722ac0bdddb5fae710f167f2e582)", + "secp256k1", + "zeroize", +] + [[package]] name = "key-wallet-manager" version = "0.40.0" @@ -3424,9 +3548,9 @@ source = "git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d10 dependencies = [ "async-trait", "bincode 2.0.0-rc.3", - "dashcore", - "dashcore_hashes", - "key-wallet", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "dashcore_hashes 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "secp256k1", "zeroize", ] @@ -4363,11 +4487,11 @@ dependencies = [ name = "platform-wallet" version = "2.1.0-dev.6" dependencies = [ - "dashcore", + "dashcore 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "dpp", "indexmap 2.11.3", - "key-wallet", - "key-wallet-manager", + "key-wallet 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", + "key-wallet-manager 0.40.0 (git+https://github.com/dashpay/rust-dashcore?rev=befd0356bebfcd0d06d1028d8a03bfa4c78bd219)", "serde", "thiserror 1.0.69", ] diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 18b0f07fe2b..14e36289c36 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -23,17 +23,17 @@ 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 = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", features = [ +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "8b5ac9170668722ac0bdddb5fae710f167f2e582", features = [ "std", "secp-recovery", "rand", "signer", "serde", ], default-features = false } -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", optional = true } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", optional = true } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", optional = true } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "befd0356bebfcd0d06d1028d8a03bfa4c78bd219", optional = true } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "8b5ac9170668722ac0bdddb5fae710f167f2e582", optional = true } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "8b5ac9170668722ac0bdddb5fae710f167f2e582", optional = true } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "8b5ac9170668722ac0bdddb5fae710f167f2e582", optional = true } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "8b5ac9170668722ac0bdddb5fae710f167f2e582", optional = true } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } diff --git a/packages/rs-sdk/src/error.rs b/packages/rs-sdk/src/error.rs index cb1b79dd7e6..888c904b06f 100644 --- a/packages/rs-sdk/src/error.rs +++ b/packages/rs-sdk/src/error.rs @@ -38,10 +38,9 @@ pub enum Error { /// DAPI client error, for example, connection error #[error("Dapi client error: {0}")] DapiClientError(rs_dapi_client::DapiClientError), - #[cfg(feature = "mocks")] /// DAPI mocks error #[error("Dapi mocks error: {0}")] - DapiMocksError(#[from] rs_dapi_client::mock::MockError), + DapiMocksError(String), /// Dash core error #[error("Dash core error: {0}")] CoreError(#[from] dpp::dashcore::Error), @@ -166,6 +165,13 @@ impl From for Error { } } +#[cfg(feature = "mocks")] +impl From for Error { + fn from(value: rs_dapi_client::mock::MockError) -> Self { + Self::DapiMocksError(value.to_string()) + } +} + impl From for Error { fn from(value: PlatformVersionError) -> Self { Self::Protocol(value.into()) diff --git a/packages/wasm-sdk/src/error.rs b/packages/wasm-sdk/src/error.rs index a2b2e264462..251355f1512 100644 --- a/packages/wasm-sdk/src/error.rs +++ b/packages/wasm-sdk/src/error.rs @@ -111,13 +111,9 @@ impl From for WasmSdkError { None, retriable, ), - #[cfg(feature = "mocks")] - DapiMocksError(e) => Self::new( - WasmSdkErrorKind::DapiMocksError, - e.to_string(), - None, - retriable, - ), + DapiMocksError(msg) => { + Self::new(WasmSdkErrorKind::DapiMocksError, msg, None, retriable) + } CoreError(e) => Self::new(WasmSdkErrorKind::CoreError, e.to_string(), None, retriable), MerkleBlockError(e) => Self::new( WasmSdkErrorKind::MerkleBlockError,