Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 160 additions & 147 deletions Cargo.lock

Large diffs are not rendered by default.

27 changes: 8 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,16 @@ grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f5
grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
grovedb-commitment-tree = { git = "https://github.com/dashpay/grovedb", rev = "9b19035f51905b156e8a628c10b71b85797ffa21" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "7329126edf27fb0356c444888ad1207bdfa2e39a" }
dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
dashcore-crypto = { git = "https://github.com/dashpay/rust-dashcore", rev = "c9aeac0d0dcbd4b91d780a70d61b9bb693199ca4" }
tokio-metrics = "0.5"

# rust-dashcore's bitcoin-crypto takes these crates from this rust-bitcoin rev,
# while other dependencies take the same versions from crates.io. Cargo cannot
# vendor one name and version from two sources, so use the git copies for both.
# Keep the rev equal to bitcoin-crypto's rev in rust-dashcore. A bump past
# dashpay/rust-dashcore#1224 needs only bitcoin-internals; see #5648.
[patch.crates-io]
base58ck = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" }
bitcoin_hashes = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" }
bitcoin-internals = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" }
bitcoin-units = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "7ba35c7c1dd63892bfb9c9395bbd80e2ab5df516" }

# Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which
# otherwise ships huge. Inherits `release` and is ONLY used by the iOS
# build (`build_ios.sh --profile release`)
Expand Down
3 changes: 2 additions & 1 deletion packages/rs-dapi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ once_cell = "1.19"

# Dash Core RPC client
dashcore-rpc = { workspace = true }
dash-spv = { workspace = true }
# The Docker image builds rs-dapi on its own, so X11 block hashes must be enabled here.
dashcore = { workspace = true, features = ["core-block-hash-use-x11"] }

rs-dash-event-bus = { path = "../rs-dash-event-bus" }
Comment on lines 89 to 94

@thepastaclaw thepastaclaw Nov 5, 2026 •

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Resolved at 70abc134; see the replies below.

🔴 Blocking: Preserve X11 block hashing when removing dash-spv

Removing dash-spv also removes the dependency that enabled dashcore's core-block-hash-use-x11 feature. The remaining standalone rs-dapi dependency closure does not enable it: dashcore defaults to bincode, rpc-json enables rand-std/signer/serde, and neither DPP's selected features nor key-wallet enables X11. The production Dockerfile builds only --package rs-dapi --locked, so upstream dash/src/hash_types.rs now selects SHA256d for BlockHash instead of X11. Consequently, block_hash_from_block_bytes computes incorrect Dash block IDs. Historical streaming records the actual RPC block hash, while live streaming records this SHA256d hash, defeating historical/live duplicate suppression in both block-header and transaction-with-proofs streams. Explicitly enable X11 through a directly used dashcore dependency in rs-dapi. Add a test against an independently pinned Core block hash: the existing vector test compares two calls to the same feature-dependent hashing implementation and passes with either algorithm.

source: gpt-6.1-sol (phase2-reviewer: general)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved (re-reviewed at 70abc134): Your direct rs-dapi dependency now explicitly enables dashcore/core-block-hash-use-x11, preserving X11 block hashing when rs-dapi builds independently of dash-spv. The updated regression test computes its expected X11 digest directly from the header bytes, and the standalone RS-DAPI image check passes.


Expand Down
1 change: 0 additions & 1 deletion packages/rs-dapi/src/services/core_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use dapi_grpc::core::v0::{
use dapi_grpc::tonic::{Request, Response, Status};
use dashcore_rpc::dashcore::Transaction;
use dashcore_rpc::dashcore::consensus::encode::deserialize as deserialize_tx;
use dashcore_rpc::dashcore::hashes::Hash;
use dashcore_rpc::dashcore::policy::MAX_STANDARD_TX_WEIGHT;
use std::any::type_name_of_val;
use std::sync::Arc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use dapi_grpc::tonic::{Request, Response, Status};
use dashcore_rpc::dashcore::consensus::encode::{
deserialize as deserialize_consensus, serialize as serialize_consensus,
};
use dashcore_rpc::dashcore::hashes::Hash;
use tokio::sync::{Mutex as AsyncMutex, OwnedSemaphorePermit, mpsc, watch};
use tokio::task::JoinSet;
use tokio::time::{Duration, sleep};
Expand Down
3 changes: 0 additions & 3 deletions packages/rs-dapi/src/services/streaming_service/bloom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ fn script_matches(filter: &CoreBloomFilter, script: &ScriptBuf) -> bool {

#[inline]
fn txid_to_internal_bytes(txid: &Txid) -> Vec<u8> {
use dashcore_rpc::dashcore::hashes::Hash;
txid.to_byte_array().to_vec()
}

Expand Down Expand Up @@ -112,7 +111,6 @@ pub(crate) fn bloom_flags_from_int<I: TryInto<u8>>(flags: I) -> BloomFlags {
mod tests {
use super::*;
use dashcore_rpc::dashcore::bloom::BloomFilter as CoreBloomFilter;
use dashcore_rpc::dashcore::hashes::Hash;
use dashcore_rpc::dashcore::{OutPoint, PubkeyHash};
use std::str::FromStr;
use std::sync::RwLock;
Expand Down Expand Up @@ -423,7 +421,6 @@ mod tests {
/// This is the correct, consistent path.
#[test]
fn test_client_filter_with_consensus_byte_order_matches_server_side() {
use dashcore_rpc::dashcore::hashes::Hash as _;
use dashcore_rpc::dashcore::{ScriptBuf, TxOut};

// 1. A transaction that the server will see on the network.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::sync::Arc;

use ciborium::ser::into_writer;
use dashcore_rpc::dashcore::BlockHash;
use dashcore_rpc::dashcore::hashes::Hash as HashTrait;
use tokio::sync::{Mutex, Notify, RwLock};
use tracing::{debug, trace};

Expand Down
18 changes: 7 additions & 11 deletions packages/rs-dapi/src/services/streaming_service/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ use crate::DapiError;
use crate::clients::{CoreClient, TenderdashClient};
use crate::config::Config;
use crate::sync::Workers;
use dash_spv::Hash;
use dashcore::Block as CoreBlock;
use dashcore::consensus::encode::deserialize;
use std::sync::Arc;
use tokio::sync::broadcast::error::RecvError;
use tokio::sync::{Semaphore, broadcast};
Expand Down Expand Up @@ -378,16 +379,13 @@ pub(crate) fn txid_hex_from_bytes(bytes: &[u8]) -> Option<String> {
pub(crate) fn txid_bytes_from_bytes(bytes: &[u8]) -> Option<Vec<u8>> {
use dashcore_rpc::dashcore::Transaction as CoreTx;
use dashcore_rpc::dashcore::consensus::encode::deserialize;
use dashcore_rpc::dashcore::hashes::Hash as DashHash;

deserialize::<CoreTx>(bytes)
.ok()
.map(|tx| tx.txid().to_byte_array().to_vec())
}
/// Decode block bytes and return the block hash in hex and as printable string.
pub(crate) fn block_hash_from_block_bytes(bytes: &[u8]) -> Option<([u8; 32], String)> {
use dashcore_rpc::dashcore::Block as CoreBlock;
use dashcore_rpc::dashcore::consensus::encode::deserialize;
deserialize::<CoreBlock>(bytes)
.inspect_err(
|error| tracing::debug!(%error, block=hex::encode(bytes), "cannot parse block data"),
Expand Down Expand Up @@ -514,6 +512,7 @@ pub(crate) fn summarize_zmq_event(event: &ZmqEvent) -> String {
#[cfg(test)]
mod tests {
use super::*;
use dashcore::hashes::hash_x11;

#[test]
fn core_block_hash_must_be_exact_width() {
Expand All @@ -527,21 +526,18 @@ mod tests {
}

/// A block Core v24 mined (its coinbase is a version 4 CbTx) yields its
/// hash, so the live header stream delivers it.
/// X11 hash, so the live header stream delivers it.
#[test]
fn block_hash_from_block_bytes_reads_a_core_v24_block() {
use dashcore_rpc::dashcore::block::Header;
use dashcore_rpc::dashcore::consensus::encode::deserialize;

let bytes = hex::decode(
include_str!("../../../tests/vectors/core_v24_devnet/block_15146.hex").trim(),
)
.expect("vector is hex");
let header: Header = deserialize(&bytes[..80]).expect("header");
let x11 = hash_x11::Hash::hash(&bytes[..80]);

let (hash, hash_string) =
block_hash_from_block_bytes(&bytes).expect("a Core v24 block decodes");
assert_eq!(hash, header.block_hash().to_byte_array());
assert_eq!(hash_string, header.block_hash().to_string());
assert_eq!(hash, x11.to_byte_array());
assert_eq!(hash_string, x11.to_string());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ mod tests {
use super::*;
use dashcore_rpc::dashcore::bloom::BloomFlags;
use dashcore_rpc::dashcore::consensus::encode::serialize;
use dashcore_rpc::dashcore::hashes::Hash;
use dashcore_rpc::dashcore::{OutPoint, PubkeyHash, ScriptBuf, TxIn, TxOut};
use tokio::time::{Duration, timeout};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use dapi_grpc::core::v0::{
};
use dapi_grpc::tonic::{Request, Response, Status};
use dashcore_rpc::dashcore::consensus::Decodable as _;
use dashcore_rpc::dashcore::{Block, InstantLock, Transaction, hashes::Hash};
use dashcore_rpc::dashcore::{Block, InstantLock, Transaction};
use futures::TryFutureExt;
use tokio::sync::{Mutex as AsyncMutex, OwnedSemaphorePermit, mpsc, watch};
use tokio::task::JoinSet;
Expand Down
3 changes: 1 addition & 2 deletions packages/rs-dpp/src/address_funds/platform_address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use bech32::{Bech32m, Hrp};
use bincode::{Decode, DecodeUntrusted, Encode};
use dashcore::address::Payload;
use dashcore::blockdata::script::ScriptBuf;
use dashcore::hashes::{sha256d, Hash};
use dashcore::hashes::sha256d;
use dashcore::{
sign_message, signer, Address, Network, PrivateKey, PubkeyHash, PublicKey, ScriptHash,
};
Expand Down Expand Up @@ -785,7 +785,6 @@ impl FromStr for PlatformAddress {
mod tests {
use super::*;
use dashcore::blockdata::opcodes::all::*;
use dashcore::hashes::Hash;
use dashcore::PublicKey;
use platform_value::BinaryData;
use secp256k1::{PublicKey as RawPublicKey, SecretKey as RawSecretKey};
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/src/core_types/validator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ impl ValidatorV0Setters for Validator {
mod json_convertible_tests {
use super::*;
use crate::core_types::validator::v0::ValidatorV0;
use dashcore::hashes::Hash;
use dashcore::{ProTxHash, PubkeyHash};
use platform_value::platform_value;
use serde_json::json;
Expand Down
2 changes: 0 additions & 2 deletions packages/rs-dpp/src/core_types/validator/v0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ use bincode::enc::Encoder;
use bincode::error::{DecodeError, EncodeError};
#[cfg(feature = "core-types-serialization")]
use bincode::Encode;
#[cfg(feature = "core-types-serialization")]
use dashcore::hashes::Hash;

/// A validator in the context of a quorum
#[derive(Clone, Eq, PartialEq)]
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/src/core_types/validator_set/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ mod json_convertible_tests {
use crate::bls::SecretKey;
use crate::core_types::validator::v0::ValidatorV0;
use crate::core_types::validator_set::v0::ValidatorSetV0;
use dashcore::hashes::Hash;
use dashcore::{ProTxHash, PubkeyHash, QuorumHash};
use platform_value::{platform_value, Value};
use rand::rngs::StdRng;
Expand Down
2 changes: 0 additions & 2 deletions packages/rs-dpp/src/core_types/validator_set/v0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ use bincode::enc::Encoder;
use bincode::error::EncodeError;
#[cfg(feature = "core-types-serialization")]
use bincode::{BorrowDecode, Decode, Encode};
#[cfg(feature = "core-types-serialization")]
use dashcore::hashes::Hash;
use dashcore::{ProTxHash, QuorumHash};
use itertools::Itertools;
#[cfg(feature = "serde-conversion")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use crate::identity::KeyType;
use crate::util::hash::ripemd160_sha256;
use crate::ProtocolError;
use anyhow::anyhow;
use dashcore::hashes::Hash;
use dashcore::{Network, PublicKey as ECDSAPublicKey};
use platform_value::{BinaryData, Bytes20};
use secp256k1::SecretKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ mod tests {
))]
mod json_convertible_tests {
use super::*;
use dashcore::hashes::Hash;
use dashcore::{OutPoint, Txid};
use platform_value::platform_value;
use serde_json::json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

use std::collections::{BTreeMap, HashMap};

use dashcore::hashes::Hash;
use dashcore::{OutPoint, PublicKey};
use platform_value::BinaryData;
use platform_version::version::PlatformVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use std::collections::{BTreeMap, HashMap};

use dashcore::blockdata::opcodes::all::*;
use dashcore::blockdata::script::ScriptBuf;
use dashcore::hashes::Hash;
use dashcore::PublicKey;
use platform_value::BinaryData;
use secp256k1::{PublicKey as RawPublicKey, SecretKey as RawSecretKey};
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/src/tests/utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use anyhow::Result;
use dashcore::block::Version;
use dashcore::hashes::Hash;
use dashcore::{Block, BlockHash, CompactTarget, Header, TxMerkleNode};
use platform_value::Value;
#[cfg(test)]
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-dpp/src/util/hash.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use dashcore::hashes::{ripemd160, sha256, Hash};
use dashcore::hashes::{ripemd160, sha256};
use sha2::{Digest, Sha256};

pub fn hash_double_to_vec(payload: impl AsRef<[u8]>) -> Vec<u8> {
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-dpp/tests/ecdsa_compatibility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mod vectors;
use dpp::address_funds::{AddressWitness, AddressWitnessVerificationOperations, PlatformAddress};
use dpp::consensus::codes::ErrorWithCode;
use dpp::dashcore::crypto::ecdsa::EcdsaError;
use dpp::dashcore::hashes::{hash160, Hash};
use dpp::dashcore::hashes::hash160;
use dpp::dashcore::key::Error as KeyError;
use dpp::dashcore::sign_message::MessageSignatureError;
use dpp::dashcore::signer::{sign, verify_hash_signature};
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/tests/historical_hash_compatibility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ mod vectors;

use dpp::dashcore::consensus::{deserialize, serialize};
use dpp::dashcore::ephemerealdata::chain_lock::ChainLock;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::sml::llmq_type::LLMQType;
use dpp::dashcore::{InstantLock, QuorumHash, Transaction};
use dpp::identity::KeyType;
Expand Down
1 change: 0 additions & 1 deletion packages/rs-dpp/tests/untrusted_decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ fn should_preserve_asset_lock_serde_wire_format_and_reject_missing_payloads() {
#[test]
fn should_preserve_foreign_txid_serde_encoding_in_consensus_errors() {
use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::Txid;

let value = IdentityAssetLockProofLockedTransactionMismatchError::new(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use crate::platform_types::block_proposal::v0::BlockProposal;
use crate::platform_types::platform_state::PlatformStateV0Methods;
use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult;
use crate::rpc::core::CoreRPCLike;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::Network;
use dpp::version::TryIntoPlatformVersioned;
use tenderdash_abci::proto::abci as proto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike;
use itertools::Itertools;

use crate::platform_types::validator_set::ValidatorSetExt;
use dpp::dashcore::hashes::Hash;
use tenderdash_abci::proto::abci::ValidatorSetUpdate;

impl<C> Platform<C>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike;
use itertools::Itertools;

use crate::platform_types::validator_set::ValidatorSetExt;
use dpp::dashcore::hashes::Hash;
use tenderdash_abci::proto::abci::ValidatorSetUpdate;

impl<C> Platform<C>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::rpc::core::CoreRPCLike;
use itertools::Itertools;

use crate::platform_types::validator_set::ValidatorSetExt;
use dpp::dashcore::hashes::Hash;
use tenderdash_abci::proto::abci::ValidatorSetUpdate;

impl<C> Platform<C>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::error::Error;
use crate::platform_types::platform::Platform;
use crate::rpc::core::CoreRPCLike;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::{PubkeyHash, ScriptBuf};
use dpp::dashcore_rpc::dashcore_rpc_json::{DMNState, MasternodeListItem};
use dpp::identity::accessors::IdentityGettersV0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::error::Error;
use crate::platform_types::platform::Platform;
use crate::rpc::core::CoreRPCLike;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore_rpc::dashcore_rpc_json::MasternodeListItem;
use dpp::identifier::MasternodeIdentifiers;
use dpp::identity::accessors::IdentityGettersV0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use drive::util::batch::IdentityOperationType::AddNewIdentity;

use crate::platform_types::platform_state::PlatformStateV0Methods;

use dpp::dashcore::hashes::Hash;
use drive::grovedb::Transaction;
use std::collections::BTreeMap;
use tracing::Level;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ use drive::util::batch::IdentityOperationType::{

use crate::platform_types::platform_state::PlatformStateV0Methods;

use dpp::dashcore::hashes::Hash;
use drive::grovedb::Transaction;
use std::collections::BTreeMap;
use tracing::Level;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::rpc::core::CoreRPCLike;

use dpp::dashcore::ProTxHash;

use dpp::dashcore::hashes::Hash;
use dpp::identifier::{Identifier, MasternodeIdentifiers};
use dpp::identity::accessors::IdentityGettersV0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use crate::platform_types::platform::Platform;
use crate::platform_types::platform_state::PlatformState;
use crate::platform_types::platform_state::PlatformStateV0Methods;
use crate::rpc::core::CoreRPCLike;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::ProTxHash;

use dpp::block::block_info::BlockInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use crate::platform_types::platform::Platform;
use crate::platform_types::platform_state::PlatformState;
use crate::platform_types::platform_state::PlatformStateV0Methods;
use crate::rpc::core::CoreRPCLike;
use dpp::dashcore::hashes::Hash;
use dpp::dashcore::ProTxHash;

use dpp::block::block_info::BlockInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use dpp::bls::PublicKey as BlsPublicKey;
use dpp::dashcore::hashes::{sha256d, Hash, HashEngine};
use dpp::dashcore::hashes::{sha256d, HashEngine};
use dpp::dashcore::QuorumHash;
use dpp::dashcore_rpc::dashcore_rpc_json::QuorumType;
use std::collections::BTreeMap;
Expand Down
Loading
Loading