From b3cc5f2c6a63f9230cf117b5485ff08fd4c2534e Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Mar 2025 12:16:14 +0700 Subject: [PATCH 1/4] fix: non-reversed quorum hash --- Cargo.lock | 10 ++-- packages/rs-dpp/Cargo.toml | 2 +- packages/rs-drive-abci/Cargo.toml | 2 +- .../update_quorum_info/v0/mod.rs | 2 +- packages/rs-drive-abci/src/rpc/core.rs | 53 +++++++++++++++---- packages/rs-sdk/Cargo.toml | 4 +- packages/simple-signer/Cargo.toml | 2 +- 7 files changed, 54 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d0210c3f81..4b460165ce9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.37.0#9cb1184f7a4e84b42c800006398520af1d559cf1" +source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" dependencies = [ "anyhow", "base64-compat", @@ -1267,12 +1267,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.37.0#9cb1184f7a4e84b42c800006398520af1d559cf1" +source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" [[package]] name = "dashcore-rpc" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.37.0#9cb1184f7a4e84b42c800006398520af1d559cf1" +source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" dependencies = [ "dashcore-rpc-json", "hex", @@ -1285,7 +1285,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.37.0#9cb1184f7a4e84b42c800006398520af1d559cf1" +source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" dependencies = [ "bincode", "dashcore", @@ -1299,7 +1299,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.37.0#9cb1184f7a4e84b42c800006398520af1d559cf1" +source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" dependencies = [ "dashcore-private", "secp256k1", diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 09a509111da..1f5bcae44d1 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -29,7 +29,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "rand", "signer", "serde", -], default-features = false, tag = "v0.37.0" } +], default-features = false, rev = "217197c796ff296f428593b391a00f9200beceac" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 3b9bd54a61f..c1ea04b140a 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8.5" tempfile = "3.3.0" hex = "0.4.3" indexmap = { version = "2.2.6", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.37.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs index 14320ad1d25..23c9238b796 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs @@ -290,7 +290,7 @@ where ( *quorum_hash, VerificationQuorum { - public_key: validator_set.threshold_public_key().clone(), + public_key: *validator_set.threshold_public_key(), index: validator_set.quorum_index(), }, ) diff --git a/packages/rs-drive-abci/src/rpc/core.rs b/packages/rs-drive-abci/src/rpc/core.rs index 633132a489c..021c43f9db7 100644 --- a/packages/rs-drive-abci/src/rpc/core.rs +++ b/packages/rs-drive-abci/src/rpc/core.rs @@ -5,6 +5,7 @@ use dashcore_rpc::dashcore_rpc_json::{ use dashcore_rpc::json::GetRawTransactionResult; use dashcore_rpc::{Auth, Client, Error, RpcApi}; use dpp::dashcore::ephemerealdata::chain_lock::ChainLock; +use dpp::dashcore::hashes::Hash; use dpp::dashcore::{Block, BlockHash, QuorumHash, Transaction, Txid}; use dpp::dashcore::{Header, InstantLock}; use dpp::prelude::TimestampMillis; @@ -168,9 +169,9 @@ macro_rules! retry { } let mut last_err = None; - for i in 0..MAX_RETRIES { + let result = (0..MAX_RETRIES).find_map(|i| { match $action { - Ok(result) => return Ok(result), + Ok(result) => Some(Ok(result)), Err(e) => { match e { dashcore_rpc::Error::JsonRpc( @@ -187,16 +188,19 @@ macro_rules! retry { }, ), ) => { + // Delay before next try last_err = Some(e); let delay = fibonacci(i + 2) * FIB_MULTIPLIER; std::thread::sleep(Duration::from_secs(delay)); + None } - _ => return Err(e), - }; + _ => Some(Err(e)), + } } } - } - Err(last_err.unwrap()) // Return the last error if all attempts fail + }); + + result.unwrap_or_else(|| Err(last_err.unwrap())) }}; } @@ -267,7 +271,24 @@ impl CoreRPCLike for DefaultCoreRPC { &self, height: Option, ) -> Result { - retry!(self.inner.get_quorum_listextended(height)) + tracing::info!("fetch list quorum hash"); + + let list: ExtendedQuorumListResult = + retry!(self.inner.get_quorum_listextended_reversed(height))?; + + tracing::info!(?list, "fetch list quorum hash"); + + for (_, quorums) in &list.quorums_by_type { + for (quorum_hash, _) in quorums { + tracing::info!( + %quorum_hash, + quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), + "fetch list quorum hash" + ); + } + } + + Ok(list) } fn get_quorum_info( @@ -276,9 +297,21 @@ impl CoreRPCLike for DefaultCoreRPC { hash: &QuorumHash, include_secret_key_share: Option, ) -> Result { - retry!(self - .inner - .get_quorum_info(quorum_type, hash, include_secret_key_share)) + tracing::info!("fetch info quorum hash"); + + let info: QuorumInfoResult = retry!(self.inner.get_quorum_info_reversed( + quorum_type, + hash, + include_secret_key_share + ))?; + + tracing::info!( + %info.quorum_hash, + quorum_hash_bytes = hex::encode(info.quorum_hash.to_byte_array()), + "fetch info quorum hash" + ); + + Ok(info) } fn get_protx_diff_with_masternodes( diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index 1008a9b35ca..e15645df444 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -38,7 +38,7 @@ envy = { version = "0.4.2", optional = true } futures = { version = "0.3.30" } derive_more = { version = "1.0", features = ["from"] } # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.37.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } lru = { version = "0.12.5", optional = true } bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" } zeroize = { version = "1.8", features = ["derive"] } @@ -95,7 +95,7 @@ offline-testing = ["mocks"] # Requires configuration of Dash Platform connectivity. # See [README.md] for more details. # -# Without this feature enabled, tests will use test vectors from `tests/vectors/` instead of connecting to live +# Without this feature enabled, tests will use test vectors from `tests/vectors/` instead of connecting to live # Dash Platform. # # If both `offline-testing` and `network-testing` are enabled, "offline-testing" will take precedence. diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 97ad29d953a..961cb953370 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -8,6 +8,6 @@ rust-version.workspace = true [dependencies] bincode = { version = "2.0.0-rc.3", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.37.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } From aa0d63008d511477dd690eb58fcf3fcbc6fa8358 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Mar 2025 12:16:53 +0700 Subject: [PATCH 2/4] chore: add debug output --- .../platform_types/validator_set/v0/mod.rs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs index 44fb1dad933..12d280bbb26 100644 --- a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs @@ -149,6 +149,12 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { }) .collect::, Error>>()?; + tracing::trace!( + %self.quorum_hash, + quorum_hash_bytes = hex::encode(self.quorum_hash.to_byte_array()), + "update difference quorum hash" + ); + Ok(ValidatorSetUpdate { validator_updates, threshold_public_key: Some(crypto::PublicKey { @@ -167,6 +173,13 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { threshold_public_key, .. } = self; + + tracing::trace!( + %quorum_hash, + quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), + "update quorum hash" + ); + ValidatorSetUpdate { validator_updates: validator_set .iter() @@ -214,6 +227,13 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { threshold_public_key, .. } = self; + + tracing::trace!( + %quorum_hash, + quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), + "owned update quorum hash" + ); + ValidatorSetUpdate { validator_updates: validator_set .into_values() From 85b95c5e9a1673dd5044a46551d6cc0231e843bd Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Mar 2025 15:01:58 +0700 Subject: [PATCH 3/4] revert: remove debug output --- Cargo.lock | 10 ++--- packages/rs-dpp/Cargo.toml | 2 +- packages/rs-drive-abci/Cargo.toml | 2 +- .../platform_types/validator_set/v0/mod.rs | 20 ---------- packages/rs-drive-abci/src/rpc/core.rs | 38 ++----------------- packages/rs-sdk/Cargo.toml | 2 +- packages/simple-signer/Cargo.toml | 2 +- 7 files changed, 13 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b460165ce9..a0e8ea6737b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" +source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" dependencies = [ "anyhow", "base64-compat", @@ -1267,12 +1267,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" +source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" [[package]] name = "dashcore-rpc" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" +source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" dependencies = [ "dashcore-rpc-json", "hex", @@ -1285,7 +1285,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" +source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" dependencies = [ "bincode", "dashcore", @@ -1299,7 +1299,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=217197c796ff296f428593b391a00f9200beceac#217197c796ff296f428593b391a00f9200beceac" +source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" dependencies = [ "dashcore-private", "secp256k1", diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 1f5bcae44d1..1e8162987c5 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -29,7 +29,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "rand", "signer", "serde", -], default-features = false, rev = "217197c796ff296f428593b391a00f9200beceac" } +], default-features = false, rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index c1ea04b140a..18239c948cf 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8.5" tempfile = "3.3.0" hex = "0.4.3" indexmap = { version = "2.2.6", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" diff --git a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs index 12d280bbb26..44fb1dad933 100644 --- a/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/validator_set/v0/mod.rs @@ -149,12 +149,6 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { }) .collect::, Error>>()?; - tracing::trace!( - %self.quorum_hash, - quorum_hash_bytes = hex::encode(self.quorum_hash.to_byte_array()), - "update difference quorum hash" - ); - Ok(ValidatorSetUpdate { validator_updates, threshold_public_key: Some(crypto::PublicKey { @@ -173,13 +167,6 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { threshold_public_key, .. } = self; - - tracing::trace!( - %quorum_hash, - quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), - "update quorum hash" - ); - ValidatorSetUpdate { validator_updates: validator_set .iter() @@ -227,13 +214,6 @@ impl ValidatorSetMethodsV0 for ValidatorSetV0 { threshold_public_key, .. } = self; - - tracing::trace!( - %quorum_hash, - quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), - "owned update quorum hash" - ); - ValidatorSetUpdate { validator_updates: validator_set .into_values() diff --git a/packages/rs-drive-abci/src/rpc/core.rs b/packages/rs-drive-abci/src/rpc/core.rs index 021c43f9db7..8a91bc11a86 100644 --- a/packages/rs-drive-abci/src/rpc/core.rs +++ b/packages/rs-drive-abci/src/rpc/core.rs @@ -5,7 +5,6 @@ use dashcore_rpc::dashcore_rpc_json::{ use dashcore_rpc::json::GetRawTransactionResult; use dashcore_rpc::{Auth, Client, Error, RpcApi}; use dpp::dashcore::ephemerealdata::chain_lock::ChainLock; -use dpp::dashcore::hashes::Hash; use dpp::dashcore::{Block, BlockHash, QuorumHash, Transaction, Txid}; use dpp::dashcore::{Header, InstantLock}; use dpp::prelude::TimestampMillis; @@ -271,24 +270,7 @@ impl CoreRPCLike for DefaultCoreRPC { &self, height: Option, ) -> Result { - tracing::info!("fetch list quorum hash"); - - let list: ExtendedQuorumListResult = - retry!(self.inner.get_quorum_listextended_reversed(height))?; - - tracing::info!(?list, "fetch list quorum hash"); - - for (_, quorums) in &list.quorums_by_type { - for (quorum_hash, _) in quorums { - tracing::info!( - %quorum_hash, - quorum_hash_bytes = hex::encode(quorum_hash.to_byte_array()), - "fetch list quorum hash" - ); - } - } - - Ok(list) + retry!(self.inner.get_quorum_listextended_reversed(height)) } fn get_quorum_info( @@ -297,21 +279,9 @@ impl CoreRPCLike for DefaultCoreRPC { hash: &QuorumHash, include_secret_key_share: Option, ) -> Result { - tracing::info!("fetch info quorum hash"); - - let info: QuorumInfoResult = retry!(self.inner.get_quorum_info_reversed( - quorum_type, - hash, - include_secret_key_share - ))?; - - tracing::info!( - %info.quorum_hash, - quorum_hash_bytes = hex::encode(info.quorum_hash.to_byte_array()), - "fetch info quorum hash" - ); - - Ok(info) + retry!(self + .inner + .get_quorum_info_reversed(quorum_type, hash, include_secret_key_share)) } fn get_protx_diff_with_masternodes( diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index e15645df444..e1d5aa79380 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -38,7 +38,7 @@ envy = { version = "0.4.2", optional = true } futures = { version = "0.3.30" } derive_more = { version = "1.0", features = ["from"] } # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } lru = { version = "0.12.5", optional = true } bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" } zeroize = { version = "1.8", features = ["derive"] } diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 961cb953370..bb04b588c19 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -8,6 +8,6 @@ rust-version.workspace = true [dependencies] bincode = { version = "2.0.0-rc.3", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "217197c796ff296f428593b391a00f9200beceac" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } From e130fe18902ae10f353b9f00097c708a49724ab9 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 11 Mar 2025 16:30:15 +0700 Subject: [PATCH 4/4] chore: updated dashcore --- Cargo.lock | 20 ++++++++++---------- packages/rs-dpp/Cargo.toml | 2 +- packages/rs-drive-abci/Cargo.toml | 2 +- packages/rs-sdk/Cargo.toml | 2 +- packages/simple-signer/Cargo.toml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0e8ea6737b..608b5f80466 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1240,8 +1240,8 @@ dependencies = [ [[package]] name = "dashcore" -version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" +version = "0.38.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" dependencies = [ "anyhow", "base64-compat", @@ -1266,13 +1266,13 @@ dependencies = [ [[package]] name = "dashcore-private" -version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" +version = "0.38.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" [[package]] name = "dashcore-rpc" -version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" +version = "0.38.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" dependencies = [ "dashcore-rpc-json", "hex", @@ -1284,8 +1284,8 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" -version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" +version = "0.38.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" dependencies = [ "bincode", "dashcore", @@ -1298,8 +1298,8 @@ dependencies = [ [[package]] name = "dashcore_hashes" -version = "0.37.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=f602f6a62ef346d54f8b69900a23b72491e982b8#f602f6a62ef346d54f8b69900a23b72491e982b8" +version = "0.38.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" dependencies = [ "dashcore-private", "secp256k1", diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 1e8162987c5..01657841cc1 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -29,7 +29,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "rand", "signer", "serde", -], default-features = false, rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } +], default-features = false, tag = "v0.38.0" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 18239c948cf..942e127ecf9 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8.5" tempfile = "3.3.0" hex = "0.4.3" indexmap = { version = "2.2.6", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index e1d5aa79380..1bae8d268fa 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -38,7 +38,7 @@ envy = { version = "0.4.2", optional = true } futures = { version = "0.3.30" } derive_more = { version = "1.0", features = ["from"] } # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } lru = { version = "0.12.5", optional = true } bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" } zeroize = { version = "1.8", features = ["derive"] } diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index bb04b588c19..08818166a8b 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -8,6 +8,6 @@ rust-version.workspace = true [dependencies] bincode = { version = "2.0.0-rc.3", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "f602f6a62ef346d54f8b69900a23b72491e982b8" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" }