diff --git a/Cargo.lock b/Cargo.lock index a5a72ed4e88..f7fa267dd02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -574,7 +574,7 @@ dependencies = [ [[package]] name = "bls-dash-sys" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?tag=1.3.3#4e070243aed142bc458472f8807ab77527dd879a" +source = "git+https://github.com/dashpay/bls-signatures?rev=a0fec2f4da2bdbb753e6287b0546ae0b08e74e02#a0fec2f4da2bdbb753e6287b0546ae0b08e74e02" dependencies = [ "bindgen 0.65.1", "cc", @@ -584,7 +584,7 @@ dependencies = [ [[package]] name = "bls-dash-sys" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab#0bb5c5b03249c463debb5cef5f7e52ee66f3aaab" +source = "git+https://github.com/dashpay/bls-signatures?rev=b840e447227dbe6e9a302c97acdf45b95c4d3b21#b840e447227dbe6e9a302c97acdf45b95c4d3b21" dependencies = [ "bindgen 0.65.1", "cc", @@ -594,9 +594,9 @@ dependencies = [ [[package]] name = "bls-signatures" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?tag=1.3.3#4e070243aed142bc458472f8807ab77527dd879a" +source = "git+https://github.com/dashpay/bls-signatures?rev=a0fec2f4da2bdbb753e6287b0546ae0b08e74e02#a0fec2f4da2bdbb753e6287b0546ae0b08e74e02" dependencies = [ - "bls-dash-sys 1.2.5 (git+https://github.com/dashpay/bls-signatures?tag=1.3.3)", + "bls-dash-sys 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=a0fec2f4da2bdbb753e6287b0546ae0b08e74e02)", "hex", "rand", "serde", @@ -605,9 +605,9 @@ dependencies = [ [[package]] name = "bls-signatures" version = "1.2.5" -source = "git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab#0bb5c5b03249c463debb5cef5f7e52ee66f3aaab" +source = "git+https://github.com/dashpay/bls-signatures?rev=b840e447227dbe6e9a302c97acdf45b95c4d3b21#b840e447227dbe6e9a302c97acdf45b95c4d3b21" dependencies = [ - "bls-dash-sys 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab)", + "bls-dash-sys 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=b840e447227dbe6e9a302c97acdf45b95c4d3b21)", "hex", "rand", "serde", @@ -1254,10 +1254,13 @@ dependencies = [ "drive", "drive-proof-verifier", "envy", + "ferment-macro", "futures", "hex", "http", "lru", + "platform-value", + "platform-version", "rs-dapi-client", "rustls-pemfile", "sanitize-filename", @@ -1276,14 +1279,14 @@ dependencies = [ [[package]] name = "dashcore" version = "0.39.6" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" +source = "git+https://github.com/dashpay/rust-dashcore?branch=feat%2Fferment#6dd37995cc4370beb2903e4956d06fec80cba077" dependencies = [ "anyhow", "base64-compat", "bech32", "bitflags 2.9.0", "blake3", - "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab)", + "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=a0fec2f4da2bdbb753e6287b0546ae0b08e74e02)", "blsful", "dashcore-private", "dashcore_hashes", @@ -1299,12 +1302,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.39.6" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" +source = "git+https://github.com/dashpay/rust-dashcore?branch=feat%2Fferment#6dd37995cc4370beb2903e4956d06fec80cba077" [[package]] name = "dashcore-rpc" version = "0.39.6" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" +source = "git+https://github.com/dashpay/rust-dashcore?branch=feat%2Fferment#6dd37995cc4370beb2903e4956d06fec80cba077" dependencies = [ "dashcore-rpc-json", "hex", @@ -1317,7 +1320,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.39.6" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" +source = "git+https://github.com/dashpay/rust-dashcore?branch=feat%2Fferment#6dd37995cc4370beb2903e4956d06fec80cba077" dependencies = [ "bincode", "dashcore", @@ -1331,7 +1334,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.39.6" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" +source = "git+https://github.com/dashpay/rust-dashcore?branch=feat%2Fferment#6dd37995cc4370beb2903e4956d06fec80cba077" dependencies = [ "dashcore-private", "secp256k1", @@ -1355,6 +1358,7 @@ dependencies = [ "dashpay-contract", "dpns-contract", "feature-flags-contract", + "ferment-macro", "keyword-search-contract", "masternode-reward-shares-contract", "platform-value", @@ -1362,6 +1366,7 @@ dependencies = [ "serde_json", "thiserror 2.0.12", "token-history-contract", + "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "wallet-utils-contract", "withdrawals-contract", ] @@ -1518,6 +1523,8 @@ dependencies = [ "derive_more 1.0.0", "dpp", "env_logger", + "ferment", + "ferment-macro", "getrandom 0.2.15", "hex", "indexmap 2.7.0", @@ -1548,6 +1555,7 @@ dependencies = [ "test-case", "thiserror 2.0.12", "tokio", + "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1581,6 +1589,7 @@ dependencies = [ "nohash-hasher", "once_cell", "parking_lot", + "platform-value", "platform-version", "rand", "serde", @@ -1589,6 +1598,7 @@ dependencies = [ "tempfile", "thiserror 2.0.12", "tracing", + "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1600,7 +1610,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "bincode", - "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?tag=1.3.3)", + "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=b840e447227dbe6e9a302c97acdf45b95c4d3b21)", "bs58", "chrono", "ciborium", @@ -1644,6 +1654,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", + "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1655,10 +1666,13 @@ dependencies = [ "derive_more 1.0.0", "dpp", "drive", + "ferment-macro", "hex", "indexmap 2.7.0", "platform-serialization", "platform-serialization-derive", + "platform-value", + "platform-version", "serde", "serde_json", "tenderdash-abci", @@ -1878,6 +1892,26 @@ dependencies = [ "thiserror 2.0.12", ] +[[package]] +name = "ferment" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fffd7c8fc84e2113ff10c3780579bf6ec4b617faf0065501ca58a2a084d3ab" +dependencies = [ + "indexmap 2.7.0", + "serde_json", +] + +[[package]] +name = "ferment-macro" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee42cf9f88c8efcaedfc11d1a23b91fc025c700614f5d33bc32163c5cd084f3" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "ff" version = "0.13.0" @@ -3805,6 +3839,7 @@ dependencies = [ "bincode", "bs58", "ciborium", + "ferment-macro", "hex", "indexmap 2.7.0", "platform-serialization", @@ -3829,6 +3864,7 @@ name = "platform-version" version = "2.0.0-rc.13" dependencies = [ "bincode", + "ferment-macro", "grovedb-version", "once_cell", "thiserror 2.0.12", @@ -6048,6 +6084,7 @@ dependencies = [ "log", "num_enum 0.7.3", "paste", + "platform-version", "serde", "serde-wasm-bindgen", "serde_json", diff --git a/packages/dashpay-contract/Cargo.toml b/packages/dashpay-contract/Cargo.toml index 361576a261f..75654bc9835 100644 --- a/packages/dashpay-contract/Cargo.toml +++ b/packages/dashpay-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" platform-version = { path = "../rs-platform-version" } thiserror = "2.0.12" serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/data-contracts/Cargo.toml b/packages/data-contracts/Cargo.toml index b129c4883c8..c028850debb 100644 --- a/packages/data-contracts/Cargo.toml +++ b/packages/data-contracts/Cargo.toml @@ -16,6 +16,12 @@ dpns-contract = { path = "../dpns-contract" } dashpay-contract = { path = "../dashpay-contract" } feature-flags-contract = { path = "../feature-flags-contract" } platform-value = { path = "../rs-platform-value" } +versioned-feature-core = "1.0.0" wallet-utils-contract = { path = "../wallet-utils-contract" } token-history-contract = { path = "../token-history-contract" } keyword-search-contract = { path = "../keyword-search-contract" } +ferment-macro = { version = "0.2", package = "ferment-macro", optional = true } + +[features] +default = [] +apple = ["ferment-macro"] diff --git a/packages/data-contracts/src/error.rs b/packages/data-contracts/src/error.rs index 9f82617bc18..31281ee56cb 100644 --- a/packages/data-contracts/src/error.rs +++ b/packages/data-contracts/src/error.rs @@ -1,4 +1,4 @@ -use platform_version::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; #[derive(thiserror::Error, Debug)] pub enum Error { diff --git a/packages/data-contracts/src/lib.rs b/packages/data-contracts/src/lib.rs index bd7754cfef3..9a796a1e19e 100644 --- a/packages/data-contracts/src/lib.rs +++ b/packages/data-contracts/src/lib.rs @@ -16,6 +16,7 @@ pub use withdrawals_contract; #[repr(u8)] #[derive(PartialEq, Eq, Clone, Copy, Debug, Ord, PartialOrd, Hash)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum SystemDataContract { Withdrawals = 0, MasternodeRewards = 1, diff --git a/packages/dpns-contract/Cargo.toml b/packages/dpns-contract/Cargo.toml index 1085dca9f7d..b725dd1a211 100644 --- a/packages/dpns-contract/Cargo.toml +++ b/packages/dpns-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/feature-flags-contract/Cargo.toml b/packages/feature-flags-contract/Cargo.toml index 0e66721782a..0c6184265c6 100644 --- a/packages/feature-flags-contract/Cargo.toml +++ b/packages/feature-flags-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/masternode-reward-shares-contract/Cargo.toml b/packages/masternode-reward-shares-contract/Cargo.toml index e58d9673021..ee75afde878 100644 --- a/packages/masternode-reward-shares-contract/Cargo.toml +++ b/packages/masternode-reward-shares-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/rs-dapi-client/src/transport/tonic_channel.rs b/packages/rs-dapi-client/src/transport/tonic_channel.rs index 6a0b5c4ee13..7fe5dd65e7b 100644 --- a/packages/rs-dapi-client/src/transport/tonic_channel.rs +++ b/packages/rs-dapi-client/src/transport/tonic_channel.rs @@ -21,9 +21,12 @@ pub fn create_channel( let host = uri.host().expect("Failed to get host from URI").to_string(); let mut builder = Channel::builder(uri); - let mut tls_config = ClientTlsConfig::new() - .with_native_roots() - .with_webpki_roots() + let mut tls_config = ClientTlsConfig::new(); + #[cfg(not(target_os = "ios"))] + { + tls_config = tls_config.with_native_roots(); + } + tls_config = tls_config.with_webpki_roots() .assume_http2(true); if let Some(settings) = settings { diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index f48da70bcbf..9098c2f499d 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -28,7 +28,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "rand", "signer", "serde", -], default-features = false, tag = "v0.39.6" } +], default-features = false, branch = "feat/ferment" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } @@ -62,7 +62,9 @@ indexmap = { version = "2.7.0", features = ["serde"] } strum = { version = "0.26", features = ["derive"] } json-schema-compatibility-validator = { path = '../rs-json-schema-compatibility-validator', optional = true } once_cell = "1.19.0" - +ferment = { version = "0.2", package = "ferment", optional = true } +ferment-macro = { version = "0.2", package = "ferment-macro", optional = true } +versioned-feature-core = "1.0.0" [dev-dependencies] test-case = { version = "3.3" } tokio = { version = "1.40", features = ["full"] } @@ -77,6 +79,7 @@ log = { version = "0.4.27" } default = ["state-transitions"] core_verification = ["dashcore/message_verification"] core_quorum_validation = ["dashcore/quorum_validation"] +apple = ["ferment", "ferment-macro", "core_verification", "core_quorum_validation", "platform-version/apple", "data-contracts/apple", "dash-sdk-features", "platform-value/apple", "system_contracts"] bls-signatures = ["dashcore/bls"] ed25519-dalek = ["dashcore/eddsa"] all_features = [ diff --git a/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/mod.rs b/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/mod.rs index 5b18311013a..6f974253b4c 100644 --- a/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/mod.rs +++ b/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/mod.rs @@ -1,5 +1,5 @@ use crate::asset_lock::reduced_asset_lock_value::v0::AssetLockValueV0; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; diff --git a/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/v0/mod.rs b/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/v0/mod.rs index bc733e03f48..6e4f15f5aeb 100644 --- a/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/v0/mod.rs +++ b/packages/rs-dpp/src/asset_lock/reduced_asset_lock_value/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use bincode::{Decode, Encode}; use platform_value::Bytes32; diff --git a/packages/rs-dpp/src/balances/credits.rs b/packages/rs-dpp/src/balances/credits.rs index 02f2479f045..65a6c7e5023 100644 --- a/packages/rs-dpp/src/balances/credits.rs +++ b/packages/rs-dpp/src/balances/credits.rs @@ -8,7 +8,7 @@ //! and unlocking dash on the payment chain. //! -use crate::ProtocolError; +use crate::errors::ProtocolError; use integer_encoding::VarInt; use std::convert::TryFrom; @@ -16,9 +16,11 @@ use std::convert::TryFrom; pub type Duffs = u64; /// Credits type +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type Credits = u64; /// Token Amount type +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type TokenAmount = u64; /// Signed Token Amount type @@ -29,6 +31,7 @@ pub type SumTokenAmount = i128; /// Signed Credits type is used for internal computations and total credits /// balance verification +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type SignedCredits = i64; /// Maximum value of credits diff --git a/packages/rs-dpp/src/block/block_info/mod.rs b/packages/rs-dpp/src/block/block_info/mod.rs index 477064f9a1f..ca110c168db 100644 --- a/packages/rs-dpp/src/block/block_info/mod.rs +++ b/packages/rs-dpp/src/block/block_info/mod.rs @@ -16,6 +16,7 @@ pub const DEFAULT_BLOCK_INFO: BlockInfo = BlockInfo { // @immutable /// Block information #[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Encode, Decode, Serialize, Deserialize)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BlockInfo { /// Block time in milliseconds pub time_ms: TimestampMillis, diff --git a/packages/rs-dpp/src/block/epoch/mod.rs b/packages/rs-dpp/src/block/epoch/mod.rs index 419930b4cf3..5a3962b7b63 100644 --- a/packages/rs-dpp/src/block/epoch/mod.rs +++ b/packages/rs-dpp/src/block/epoch/mod.rs @@ -9,6 +9,7 @@ pub const EPOCH_KEY_OFFSET: u16 = 256; pub const MAX_EPOCH: u16 = u16::MAX - EPOCH_KEY_OFFSET; /// Epoch index type +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type EpochIndex = u16; pub const EPOCH_0: Epoch = Epoch { @@ -21,6 +22,7 @@ pub const EPOCH_0: Epoch = Epoch { /// Epoch struct #[derive(Serialize, Clone, Eq, PartialEq, Copy, Debug)] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Epoch { /// Epoch index pub index: EpochIndex, diff --git a/packages/rs-dpp/src/block/extended_block_info/mod.rs b/packages/rs-dpp/src/block/extended_block_info/mod.rs index fb8a20950d7..555141a959c 100644 --- a/packages/rs-dpp/src/block/extended_block_info/mod.rs +++ b/packages/rs-dpp/src/block/extended_block_info/mod.rs @@ -2,13 +2,13 @@ use crate::block::block_info::BlockInfo; use crate::block::extended_block_info::v0::{ ExtendedBlockInfoV0, ExtendedBlockInfoV0Getters, ExtendedBlockInfoV0Setters, }; -use crate::protocol_error::ProtocolError; +use crate::errors::ProtocolError; -use crate::version::FeatureVersion; use bincode::{Decode, Encode}; use derive_more::From; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use serde::{Deserialize, Serialize}; +use versioned_feature_core::FeatureVersion; pub mod v0; diff --git a/packages/rs-dpp/src/block/extended_epoch_info/mod.rs b/packages/rs-dpp/src/block/extended_epoch_info/mod.rs index 9fd9fcbff06..02201ac0e21 100644 --- a/packages/rs-dpp/src/block/extended_epoch_info/mod.rs +++ b/packages/rs-dpp/src/block/extended_epoch_info/mod.rs @@ -2,7 +2,7 @@ pub mod v0; use crate::block::epoch::EpochIndex; use crate::block::extended_epoch_info::v0::{ExtendedEpochInfoV0, ExtendedEpochInfoV0Getters}; -use crate::protocol_error::ProtocolError; +use crate::errors::ProtocolError; use crate::util::deserializer::ProtocolVersion; use bincode::{Decode, Encode}; use derive_more::From; diff --git a/packages/rs-dpp/src/block/finalized_epoch_info/mod.rs b/packages/rs-dpp/src/block/finalized_epoch_info/mod.rs index d8f2854d927..cd5dbc82145 100644 --- a/packages/rs-dpp/src/block/finalized_epoch_info/mod.rs +++ b/packages/rs-dpp/src/block/finalized_epoch_info/mod.rs @@ -2,7 +2,7 @@ mod getters; pub mod v0; use crate::block::finalized_epoch_info::v0::FinalizedEpochInfoV0; -use crate::protocol_error::ProtocolError; +use crate::errors::protocol_error::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; diff --git a/packages/rs-dpp/src/bls/native_bls.rs b/packages/rs-dpp/src/bls/native_bls.rs index 3e1341bf9ab..22ad51ef9ea 100644 --- a/packages/rs-dpp/src/bls/native_bls.rs +++ b/packages/rs-dpp/src/bls/native_bls.rs @@ -1,7 +1,7 @@ use crate::bls_signatures::{ Bls12381G2Impl, Pairing, PublicKey, SecretKey, Signature, SignatureSchemes, }; -use crate::{BlsModule, ProtocolError, PublicKeyValidationError}; +use crate::{errors::ProtocolError, BlsModule, PublicKeyValidationError}; #[derive(Default)] pub struct NativeBlsModule; diff --git a/packages/rs-dpp/src/data_contract/accessors/mod.rs b/packages/rs-dpp/src/data_contract/accessors/mod.rs index 793c11e8b89..38cefed99bc 100644 --- a/packages/rs-dpp/src/data_contract/accessors/mod.rs +++ b/packages/rs-dpp/src/data_contract/accessors/mod.rs @@ -1,17 +1,18 @@ use crate::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::{DocumentType, DocumentTypeRef}; +use crate::data_contract::DataContract; use crate::data_contract::{ DocumentName, GroupContractPosition, TokenContractPosition, EMPTY_GROUPS, EMPTY_TOKENS, }; -use crate::prelude::{BlockHeight, DataContract}; +use crate::prelude::BlockHeight; use platform_value::Identifier; use crate::block::epoch::EpochIndex; use crate::data_contract::accessors::v1::{DataContractV1Getters, DataContractV1Setters}; use crate::data_contract::associated_token::token_configuration::TokenConfiguration; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::group::Group; use crate::identity::TimestampMillis; use crate::tokens::errors::TokenError; diff --git a/packages/rs-dpp/src/data_contract/accessors/v0/mod.rs b/packages/rs-dpp/src/data_contract/accessors/v0/mod.rs index 33260d80a32..d961d8013ac 100644 --- a/packages/rs-dpp/src/data_contract/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/accessors/v0/mod.rs @@ -1,6 +1,6 @@ use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::{DocumentType, DocumentTypeRef}; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::DocumentName; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_groups_exist/v0/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_groups_exist/v0/mod.rs index e20e3a9639d..38a63056392 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_groups_exist/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_groups_exist/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ GroupPositionDoesNotExistError, MainGroupIsNotDefinedError, }; use crate::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_update/v0/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_update/v0/mod.rs index a8e8b55ba31..8ee5392b6ab 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_update/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration/methods/validate_token_configuration_update/v0/mod.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::data_contract::DataContractTokenConfigurationUpdateError; use crate::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use crate::data_contract::associated_token::token_configuration::TokenConfiguration; use crate::data_contract::associated_token::token_distribution_rules::accessors::v0::TokenDistributionRulesV0Getters; use crate::data_contract::associated_token::token_marketplace_rules::accessors::v0::TokenMarketplaceRulesV0Getters; use crate::data_contract::group::Group; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::basic::data_contract::DataContractTokenConfigurationUpdateError; use crate::group::action_taker::{ActionGoal, ActionTaker}; use crate::validation::SimpleConsensusValidationResult; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/methods/validate_localizations/v0/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/methods/validate_localizations/v0/mod.rs index bafcb311ef0..cf3ce17d483 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/methods/validate_localizations/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/methods/validate_localizations/v0/mod.rs @@ -1,8 +1,8 @@ -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ DecimalsOverLimitError, InvalidTokenLanguageCodeError, InvalidTokenNameCharacterError, InvalidTokenNameLengthError, }; -use crate::consensus::basic::token::MissingDefaultLocalizationError; +use crate::errors::consensus::basic::token::MissingDefaultLocalizationError; use crate::data_contract::associated_token::token_configuration_convention::accessors::v0::TokenConfigurationConventionV0Getters; use crate::data_contract::associated_token::token_configuration_convention::TokenConfigurationConvention; use crate::data_contract::associated_token::token_configuration_localization::accessors::v0::TokenConfigurationLocalizationV0Getters; diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/mod.rs index 9c0d02ca4f1..091d1d7ef1e 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/mod.rs @@ -18,6 +18,7 @@ pub mod v0; /// compatibility with older tokens. Each variant defines a specific format version. #[derive(Serialize, Deserialize, Encode, Decode, Debug, Clone, PartialEq, Eq, PartialOrd, From)] #[serde(tag = "$format_version")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenConfigurationConvention { /// Version 0 of the token convention schema. /// diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/v0/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/v0/mod.rs index f36aa4d12b0..015661a9a22 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_convention/v0/mod.rs @@ -20,6 +20,7 @@ pub const ENGLISH_ISO_639: &str = "en"; Serialize, Deserialize, Decode, Encode, Debug, Clone, PartialEq, Eq, PartialOrd, Default, )] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenConfigurationConventionV0 { /// A mapping of ISO 639-1 language codes (2-letter lowercase strings) to localized /// token names and metadata. diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/mod.rs index 66dd6785ab2..e6003744fd2 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/mod.rs @@ -18,6 +18,7 @@ pub mod v0; /// forward-compatible manner. #[derive(Serialize, Deserialize, Encode, Decode, Debug, Clone, PartialEq, Eq, PartialOrd, From)] #[serde(tag = "$format_version")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenConfigurationLocalization { /// Version 0 of the token localization schema. /// diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/v0/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/v0/mod.rs index dae3dae9baa..f77878f840f 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_configuration_localization/v0/mod.rs @@ -11,6 +11,7 @@ use std::fmt; /// but enhances UX by allowing consistent display in multilingual interfaces. #[derive(Serialize, Deserialize, Decode, Encode, Debug, Clone, PartialEq, Eq, PartialOrd)] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenConfigurationLocalizationV0 { /// Indicates whether the token name should be capitalized when displayed. /// diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_distribution_key.rs b/packages/rs-dpp/src/data_contract/associated_token/token_distribution_key.rs index d355b062634..a2d38d4d797 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_distribution_key.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_distribution_key.rs @@ -15,6 +15,7 @@ use crate::prelude::TimestampMillis; #[derive( Serialize, Deserialize, Decode, Encode, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Default, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenDistributionType { /// A pre-programmed distribution scheduled for a specific time. #[default] diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/mod.rs index fe3775fb4c3..056f6c0d3a0 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/mod.rs @@ -42,6 +42,7 @@ pub const MIN_POL_A_PARAM: i64 = -255; pub const MAX_POL_A_PARAM: i64 = 256; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DistributionFunction { /// Emits a constant (fixed) number of tokens for every period. /// diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/validation.rs b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/validation.rs index c9738c71f1f..f70538fab26 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/validation.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/distribution_function/validation.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, }; -use crate::consensus::basic::UnsupportedFeatureError; +use crate::errors::consensus::basic::UnsupportedFeatureError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::{ DistributionFunction, MAX_DISTRIBUTION_PARAM, MAX_EXP_A_PARAM, MAX_EXP_M_PARAM, MAX_EXP_N_PARAM, MAX_LINEAR_SLOPE_A_PARAM, MAX_LOG_A_PARAM, MAX_POL_M_PARAM, MAX_POL_N_PARAM, diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_moment/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_moment/mod.rs index b84ba184b31..66bd3ce164f 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_moment/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_moment/mod.rs @@ -24,6 +24,7 @@ use crate::ProtocolError; PartialOrd, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum RewardDistributionMoment { /// The reward was distributed at a block height BlockBasedMoment(BlockHeight), diff --git a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_type/mod.rs b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_type/mod.rs index c9ca34bede4..9e72b34f0e9 100644 --- a/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_type/mod.rs +++ b/packages/rs-dpp/src/data_contract/associated_token/token_perpetual_distribution/reward_distribution_type/mod.rs @@ -1,8 +1,9 @@ mod accessors; mod evaluate_interval; +use crate::data_contract::DataContract; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::{DistributionFunction, MAX_DISTRIBUTION_CYCLES_PARAM}; -use crate::prelude::{BlockHeightInterval, DataContract, EpochInterval, TimestampMillisInterval}; +use crate::prelude::{BlockHeightInterval, EpochInterval, TimestampMillisInterval}; use bincode::{Decode, Encode}; use serde::{Deserialize, Serialize}; use std::fmt; diff --git a/packages/rs-dpp/src/data_contract/change_control_rules/authorized_action_takers.rs b/packages/rs-dpp/src/data_contract/change_control_rules/authorized_action_takers.rs index 7912d3b5360..cf0bab186d8 100644 --- a/packages/rs-dpp/src/data_contract/change_control_rules/authorized_action_takers.rs +++ b/packages/rs-dpp/src/data_contract/change_control_rules/authorized_action_takers.rs @@ -11,6 +11,7 @@ use std::fmt; #[derive( Serialize, Deserialize, Decode, Encode, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Default, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum AuthorizedActionTakers { #[default] NoOne, diff --git a/packages/rs-dpp/src/data_contract/change_control_rules/mod.rs b/packages/rs-dpp/src/data_contract/change_control_rules/mod.rs index 6bfa4c73f1f..befb1e63d2d 100644 --- a/packages/rs-dpp/src/data_contract/change_control_rules/mod.rs +++ b/packages/rs-dpp/src/data_contract/change_control_rules/mod.rs @@ -14,6 +14,7 @@ use std::collections::BTreeMap; use std::fmt; #[derive(Serialize, Deserialize, Decode, Encode, Debug, Clone, PartialEq, Eq, From)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ChangeControlRules { V0(ChangeControlRulesV0), } diff --git a/packages/rs-dpp/src/data_contract/change_control_rules/v0/mod.rs b/packages/rs-dpp/src/data_contract/change_control_rules/v0/mod.rs index d413470023e..4262b1e7c67 100644 --- a/packages/rs-dpp/src/data_contract/change_control_rules/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/change_control_rules/v0/mod.rs @@ -9,6 +9,7 @@ use std::collections::BTreeMap; use std::fmt; #[derive(Serialize, Deserialize, Decode, Encode, Debug, Clone, PartialEq, Eq, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ChangeControlRulesV0 { /// This is who is authorized to make such a change pub authorized_to_make_change: AuthorizedActionTakers, diff --git a/packages/rs-dpp/src/data_contract/config/methods/validate_update/mod.rs b/packages/rs-dpp/src/data_contract/config/methods/validate_update/mod.rs index 1df2ee3d726..ee2725c65f6 100644 --- a/packages/rs-dpp/src/data_contract/config/methods/validate_update/mod.rs +++ b/packages/rs-dpp/src/data_contract/config/methods/validate_update/mod.rs @@ -1,6 +1,6 @@ use crate::data_contract::config::DataContractConfig; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; -use crate::ProtocolError; use platform_value::Identifier; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/config/methods/validate_update/v0/mod.rs b/packages/rs-dpp/src/data_contract/config/methods/validate_update/v0/mod.rs index 224f7586f60..a9f00243051 100644 --- a/packages/rs-dpp/src/data_contract/config/methods/validate_update/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/config/methods/validate_update/v0/mod.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; -use crate::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; use crate::data_contract::config::v0::DataContractConfigGettersV0; use crate::data_contract::config::DataContractConfig; +use crate::errors::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; +use crate::errors::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; use crate::validation::SimpleConsensusValidationResult; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/data_contract/config/mod.rs b/packages/rs-dpp/src/data_contract/config/mod.rs index b5d20f671af..ef55206f417 100644 --- a/packages/rs-dpp/src/data_contract/config/mod.rs +++ b/packages/rs-dpp/src/data_contract/config/mod.rs @@ -7,18 +7,19 @@ use crate::data_contract::config::v1::{ DataContractConfigGettersV1, DataContractConfigSettersV1, DataContractConfigV1, }; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; pub use fields::*; use platform_value::Value; +use platform_version::version::PlatformVersion; use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use v0::{DataContractConfigGettersV0, DataContractConfigSettersV0, DataContractConfigV0}; #[derive(Serialize, Deserialize, Encode, Decode, Debug, Clone, Copy, PartialEq, Eq, From)] #[serde(tag = "$format_version")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContractConfig { #[serde(rename = "0")] V0(DataContractConfigV0), diff --git a/packages/rs-dpp/src/data_contract/config/v0/mod.rs b/packages/rs-dpp/src/data_contract/config/v0/mod.rs index 8e93cf34e04..66dfbdd351b 100644 --- a/packages/rs-dpp/src/data_contract/config/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/config/v0/mod.rs @@ -6,7 +6,7 @@ use crate::data_contract::config::{ DEFAULT_CONTRACT_KEEPS_HISTORY, DEFAULT_CONTRACT_MUTABILITY, }; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_value::btreemap_extensions::BTreeValueMapHelper; use platform_value::Value; @@ -15,6 +15,7 @@ use std::collections::BTreeMap; #[derive(Serialize, Deserialize, Decode, Encode, Debug, Clone, Copy, PartialEq, Eq)] #[serde(rename_all = "camelCase", default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractConfigV0 { /// Can the contract ever be deleted. If the contract is deleted, so should be all /// documents associated with it. TODO: There should also be a way to "stop" the contract - diff --git a/packages/rs-dpp/src/data_contract/config/v1/mod.rs b/packages/rs-dpp/src/data_contract/config/v1/mod.rs index c3faf947a21..5b00afc26ff 100644 --- a/packages/rs-dpp/src/data_contract/config/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/config/v1/mod.rs @@ -15,6 +15,7 @@ use std::collections::BTreeMap; #[derive(Serialize, Deserialize, Decode, Encode, Debug, Clone, Copy, PartialEq, Eq)] #[serde(rename_all = "camelCase", default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractConfigV1 { /// Can the contract ever be deleted. If the contract is deleted, so should be all /// documents associated with it. TODO: There should also be a way to "stop" the contract - diff --git a/packages/rs-dpp/src/data_contract/conversion/cbor/mod.rs b/packages/rs-dpp/src/data_contract/conversion/cbor/mod.rs index 8683b2dbb42..bc7717fbceb 100644 --- a/packages/rs-dpp/src/data_contract/conversion/cbor/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/cbor/mod.rs @@ -2,12 +2,13 @@ mod v0; use crate::data_contract::v0::DataContractV0; use crate::data_contract::v1::DataContractV1; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; +use crate::errors::ProtocolError; use crate::util::cbor_value::CborCanonicalMap; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::Identifier; -pub use v0::*; +use platform_version::version::PlatformVersion; +// pub use v0::*; +pub use v0::DataContractCborConversionMethodsV0; impl DataContractCborConversionMethodsV0 for DataContract { fn from_cbor_with_id( diff --git a/packages/rs-dpp/src/data_contract/conversion/cbor/v0/mod.rs b/packages/rs-dpp/src/data_contract/conversion/cbor/v0/mod.rs index 273f9709b49..1590ba7c4de 100644 --- a/packages/rs-dpp/src/data_contract/conversion/cbor/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/cbor/v0/mod.rs @@ -1,7 +1,7 @@ +use crate::errors::ProtocolError; use crate::util::cbor_value::CborCanonicalMap; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::Identifier; +use platform_version::version::PlatformVersion; pub trait DataContractCborConversionMethodsV0 { fn from_cbor_with_id( diff --git a/packages/rs-dpp/src/data_contract/conversion/json/mod.rs b/packages/rs-dpp/src/data_contract/conversion/json/mod.rs index 2e4147653cc..3808fc140c2 100644 --- a/packages/rs-dpp/src/data_contract/conversion/json/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/json/mod.rs @@ -1,15 +1,13 @@ mod v0; pub use v0::*; -use crate::data_contract::v0::DataContractV0; -use crate::data_contract::{DataContract, DataContractV1}; -use crate::version::PlatformVersion; +use crate::data_contract::{DataContract, DataContractV0, DataContractV1}; use crate::ProtocolError; -use serde_json::Value as JsonValue; +use platform_version::version::PlatformVersion; impl DataContractJsonConversionMethodsV0 for DataContract { fn from_json( - json_value: JsonValue, + json_value: serde_json::Value, full_validation: bool, platform_version: &PlatformVersion, ) -> Result @@ -35,7 +33,10 @@ impl DataContractJsonConversionMethodsV0 for DataContract { } } - fn to_json(&self, platform_version: &PlatformVersion) -> Result { + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result { match self { DataContract::V0(v0) => v0.to_json(platform_version), DataContract::V1(v1) => v1.to_json(platform_version), @@ -45,7 +46,7 @@ impl DataContractJsonConversionMethodsV0 for DataContract { fn to_validating_json( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { match self { DataContract::V0(v0) => v0.to_validating_json(platform_version), DataContract::V1(v1) => v1.to_validating_json(platform_version), diff --git a/packages/rs-dpp/src/data_contract/conversion/json/v0/mod.rs b/packages/rs-dpp/src/data_contract/conversion/json/v0/mod.rs index 459ed3b4598..d94c37cc568 100644 --- a/packages/rs-dpp/src/data_contract/conversion/json/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/json/v0/mod.rs @@ -1,10 +1,10 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; -use serde_json::Value as JsonValue; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; +// use serde_json::Value as JsonValue; pub trait DataContractJsonConversionMethodsV0 { fn from_json( - json_value: JsonValue, + json_value: serde_json::Value, full_validation: bool, platform_version: &PlatformVersion, ) -> Result @@ -12,10 +12,13 @@ pub trait DataContractJsonConversionMethodsV0 { Self: Sized; /// Returns Data Contract as a JSON Value - fn to_json(&self, platform_version: &PlatformVersion) -> Result; + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result; /// Returns Data Contract as a JSON Value fn to_validating_json( &self, platform_version: &PlatformVersion, - ) -> Result; + ) -> Result; } diff --git a/packages/rs-dpp/src/data_contract/conversion/serde/mod.rs b/packages/rs-dpp/src/data_contract/conversion/serde/mod.rs index 0e9d58223b9..1c15455c3e5 100644 --- a/packages/rs-dpp/src/data_contract/conversion/serde/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/serde/mod.rs @@ -1,7 +1,7 @@ use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; +use crate::errors::ProtocolError; use crate::version::PlatformVersionCurrentVersion; -use crate::ProtocolError; use platform_version::version::PlatformVersion; use platform_version::TryIntoPlatformVersioned; use serde::{Deserialize, Deserializer, Serialize, Serializer}; diff --git a/packages/rs-dpp/src/data_contract/conversion/value/mod.rs b/packages/rs-dpp/src/data_contract/conversion/value/mod.rs index 59d07245ca2..06ea10ff9ee 100644 --- a/packages/rs-dpp/src/data_contract/conversion/value/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/value/mod.rs @@ -4,9 +4,9 @@ use crate::data_contract::conversion::value::v0::DataContractValueConversionMeth use crate::data_contract::v0::DataContractV0; use crate::data_contract::v1::DataContractV1; use crate::data_contract::DataContract; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; impl DataContractValueConversionMethodsV0 for DataContract { fn from_value( diff --git a/packages/rs-dpp/src/data_contract/conversion/value/v0/mod.rs b/packages/rs-dpp/src/data_contract/conversion/value/v0/mod.rs index 614330cdb99..9595611542b 100644 --- a/packages/rs-dpp/src/data_contract/conversion/value/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/conversion/value/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; pub trait DataContractValueConversionMethodsV0 { fn from_value( diff --git a/packages/rs-dpp/src/data_contract/created_data_contract/mod.rs b/packages/rs-dpp/src/data_contract/created_data_contract/mod.rs index 0e9880679dc..845084593ca 100644 --- a/packages/rs-dpp/src/data_contract/created_data_contract/mod.rs +++ b/packages/rs-dpp/src/data_contract/created_data_contract/mod.rs @@ -4,18 +4,19 @@ pub mod v0; use crate::data_contract::created_data_contract::v0::{ CreatedDataContractInSerializationFormatV0, CreatedDataContractV0, }; -use crate::prelude::{DataContract, IdentityNonce}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::data_contract::DataContract; +use crate::errors::ProtocolError; +use crate::prelude::IdentityNonce; use bincode::{Decode, Encode}; use derive_more::From; +use platform_version::version::PlatformVersion; use crate::data_contract::serialized_version::DataContractInSerializationFormat; +use crate::errors::ProtocolError::{PlatformDeserializationError, PlatformSerializationError}; use crate::serialization::{ PlatformDeserializableWithPotentialValidationFromVersionedStructure, PlatformSerializableWithPlatformVersion, }; -use crate::ProtocolError::{PlatformDeserializationError, PlatformSerializationError}; #[cfg(feature = "data-contract-value-conversion")] use platform_value::Value; use platform_version::TryIntoPlatformVersioned; diff --git a/packages/rs-dpp/src/data_contract/created_data_contract/v0/mod.rs b/packages/rs-dpp/src/data_contract/created_data_contract/v0/mod.rs index d47dc3b894c..b472061258f 100644 --- a/packages/rs-dpp/src/data_contract/created_data_contract/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/created_data_contract/v0/mod.rs @@ -9,11 +9,12 @@ use crate::{ conversion::value::v0::DataContractValueConversionMethodsV0, created_data_contract::fields::property_names::{DATA_CONTRACT, IDENTITY_NONCE}, }, - version::PlatformVersion, ProtocolError, }; #[cfg(feature = "data-contract-value-conversion")] use platform_value::{btreemap_extensions::BTreeValueRemoveFromMapHelper, Error, Value}; +#[cfg(feature = "data-contract-value-conversion")] +use platform_version::version::PlatformVersion; // TODO: Decide on what we need ExtendedDataContract with metadata or CreatedDataContract or both. #[derive(Clone, Debug, PartialEq)] diff --git a/packages/rs-dpp/src/data_contract/data_contract_facade.rs b/packages/rs-dpp/src/data_contract/data_contract_facade.rs index aa352c47699..d48919bb79b 100644 --- a/packages/rs-dpp/src/data_contract/data_contract_facade.rs +++ b/packages/rs-dpp/src/data_contract/data_contract_facade.rs @@ -1,15 +1,15 @@ use crate::data_contract::{DataContract, DataContractFactory}; use crate::data_contract::created_data_contract::CreatedDataContract; -use crate::prelude::{Identifier, IdentityNonce}; +use crate::prelude::IdentityNonce; #[cfg(feature = "state-transitions")] -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; #[cfg(feature = "state-transitions")] -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_value::Identifier; use platform_value::Value; - /// # Data Contract Facade /// /// This module acts as a simplified, high-level interface to a more complex diff --git a/packages/rs-dpp/src/data_contract/document_type/accessors/mod.rs b/packages/rs-dpp/src/data_contract/document_type/accessors/mod.rs index 6d049e9b39e..742e336b88c 100644 --- a/packages/rs-dpp/src/data_contract/document_type/accessors/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/accessors/mod.rs @@ -14,7 +14,7 @@ use crate::data_contract::document_type::validator::StatelessJsonSchemaLazyValid use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use crate::data_contract::TokenContractPosition; use crate::document::transfer::Transferable; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; use crate::nft::TradeMode; use crate::tokens::token_amount_on_contract_token::DocumentActionTokenCost; use indexmap::IndexMap; diff --git a/packages/rs-dpp/src/data_contract/document_type/accessors/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/accessors/v0/mod.rs index 7aa1da24bfe..1ef72ee6d28 100644 --- a/packages/rs-dpp/src/data_contract/document_type/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/accessors/v0/mod.rs @@ -9,7 +9,7 @@ use crate::data_contract::document_type::restricted_creation::CreationRestrictio use crate::data_contract::document_type::validator::StatelessJsonSchemaLazyValidator; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use crate::document::transfer::Transferable; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; use crate::nft::TradeMode; use indexmap::IndexMap; use std::collections::{BTreeMap, BTreeSet}; diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/mod.rs index d5f466e5092..8dab86a90aa 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/mod.rs @@ -4,10 +4,10 @@ mod v1; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::DocumentType; use crate::data_contract::{DocumentName, TokenConfiguration, TokenContractPosition}; +use crate::errors::ProtocolError; use crate::validation::operations::ProtocolValidationOperation; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::{Identifier, Value}; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl DocumentType { diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v0/mod.rs index a1b8f94c837..9b3c824d218 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v0/mod.rs @@ -1,11 +1,11 @@ -use crate::consensus::basic::data_contract::DocumentTypesAreMissingError; +use crate::errors::consensus::basic::data_contract::DocumentTypesAreMissingError; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::class_methods::consensus_or_protocol_data_contract_error; use crate::data_contract::document_type::DocumentType; use crate::data_contract::{DocumentName, TokenConfiguration, TokenContractPosition}; use crate::validation::operations::ProtocolValidationOperation; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; +use crate::errors::ProtocolError; use platform_value::{Identifier, Value}; use std::collections::BTreeMap; @@ -67,10 +67,10 @@ impl DocumentType { mod tests { use super::*; - use crate::consensus::basic::data_contract::DocumentTypesAreMissingError; - use crate::consensus::basic::BasicError; - use crate::consensus::ConsensusError; use crate::data_contract::errors::DataContractError; + use crate::errors::consensus::basic::data_contract::DocumentTypesAreMissingError; + use crate::errors::consensus::basic::BasicError; + use crate::errors::consensus::ConsensusError; use assert_matches::assert_matches; use platform_value::Identifier; use std::ops::Deref; diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v1/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v1/mod.rs index 1aa1755649b..d2098acc163 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/create_document_types_from_document_schemas/v1/mod.rs @@ -1,11 +1,11 @@ -use crate::consensus::basic::data_contract::DocumentTypesAreMissingError; +use crate::errors::consensus::basic::data_contract::DocumentTypesAreMissingError; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::class_methods::consensus_or_protocol_data_contract_error; use crate::data_contract::document_type::DocumentType; use crate::data_contract::{DocumentName, TokenConfiguration, TokenContractPosition}; use crate::validation::operations::ProtocolValidationOperation; use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::{Identifier, Value}; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/mod.rs index bfad96e4a76..874acbdbfec 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/mod.rs @@ -1,8 +1,8 @@ +use crate::data_contract::errors::DataContractError; #[cfg(feature = "validation")] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; #[cfg(feature = "validation")] -use crate::consensus::ConsensusError; -use crate::data_contract::errors::DataContractError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; mod create_document_types_from_document_schemas; diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/mod.rs index 943c1d26424..1b5dcb43e75 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/mod.rs @@ -8,7 +8,7 @@ use crate::data_contract::errors::DataContractError; use crate::data_contract::{TokenConfiguration, TokenContractPosition}; use crate::util::json_schema::resolve_uri; use crate::validation::operations::ProtocolValidationOperation; -use crate::ProtocolError; +use crate::errors::ProtocolError; use indexmap::IndexMap; use platform_value::btreemap_extensions::BTreeValueMapHelper; use platform_value::{Identifier, Value}; diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs index 7915f665844..a7703d8f33b 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v0/mod.rs @@ -1,11 +1,11 @@ #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ DuplicateIndexNameError, InvalidIndexPropertyTypeError, InvalidIndexedPropertyConstraintError, SystemPropertyIndexAlreadyPresentError, UndefinedIndexPropertyError, UniqueIndicesLimitReachedError, }; #[cfg(feature = "validation")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::document_type::index::Index; use crate::data_contract::document_type::index_level::IndexLevel; use crate::data_contract::document_type::property::DocumentProperty; @@ -23,15 +23,15 @@ use std::collections::HashSet; use std::convert::TryInto; #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::ContestedUniqueIndexOnMutableDocumentTypeError; +use crate::errors::consensus::basic::data_contract::ContestedUniqueIndexOnMutableDocumentTypeError; #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::ContestedUniqueIndexWithUniqueIndexError; +use crate::errors::consensus::basic::data_contract::ContestedUniqueIndexWithUniqueIndexError; #[cfg(any(test, feature = "validation"))] -use crate::consensus::basic::data_contract::InvalidDocumentTypeNameError; +use crate::errors::consensus::basic::data_contract::InvalidDocumentTypeNameError; #[cfg(feature = "validation")] -use crate::consensus::basic::document::MissingPositionsInDocumentTypePropertiesError; +use crate::errors::consensus::basic::document::MissingPositionsInDocumentTypePropertiesError; #[cfg(feature = "validation")] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::data_contract::config::v0::DataContractConfigGettersV0; use crate::data_contract::config::DataContractConfig; #[cfg(feature = "validation")] @@ -47,14 +47,14 @@ use crate::data_contract::document_type::property_names::{ TRADE_MODE, TRANSFERABLE, }; use crate::data_contract::document_type::{property_names, DocumentType}; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; #[cfg(feature = "validation")] use crate::validation::meta_validators::DOCUMENT_META_SCHEMA_V0; use crate::validation::operations::ProtocolValidationOperation; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; +use crate::errors::ProtocolError; use platform_value::{Identifier, Value}; impl DocumentTypeV0 { @@ -563,8 +563,8 @@ impl DocumentTypeV0 { requires_identity_encryption_bounded_key, requires_identity_decryption_bounded_key, security_level_requirement, - #[cfg(feature = "validation")] - json_schema_validator, + // #[cfg(feature = "validation")] + // json_schema_validator, }) } } diff --git a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v1/mod.rs b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v1/mod.rs index 0c4da311f10..a6723a7d8d5 100644 --- a/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/class_methods/try_from_schema/v1/mod.rs @@ -1,11 +1,11 @@ #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ DuplicateIndexNameError, InvalidIndexPropertyTypeError, InvalidIndexedPropertyConstraintError, SystemPropertyIndexAlreadyPresentError, UndefinedIndexPropertyError, UniqueIndicesLimitReachedError, }; #[cfg(feature = "validation")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::document_type::index::Index; use crate::data_contract::document_type::index_level::IndexLevel; use crate::data_contract::document_type::property::DocumentProperty; @@ -23,19 +23,21 @@ use std::convert::TryInto; use crate::balances::credits::TokenAmount; #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::ContestedUniqueIndexOnMutableDocumentTypeError; +use crate::errors::consensus::basic::data_contract::ContestedUniqueIndexOnMutableDocumentTypeError; #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::ContestedUniqueIndexWithUniqueIndexError; +use crate::errors::consensus::basic::data_contract::ContestedUniqueIndexWithUniqueIndexError; #[cfg(any(test, feature = "validation"))] -use crate::consensus::basic::data_contract::InvalidDocumentTypeNameError; -use crate::consensus::basic::data_contract::RedundantDocumentPaidForByTokenWithContractId; +use crate::errors::consensus::basic::data_contract::InvalidDocumentTypeNameError; #[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::TokenPaymentByBurningOnlyAllowedOnInternalTokenError; +use crate::errors::consensus::basic::data_contract::RedundantDocumentPaidForByTokenWithContractId; #[cfg(feature = "validation")] -use crate::consensus::basic::document::MissingPositionsInDocumentTypePropertiesError; -use crate::consensus::basic::token::InvalidTokenPositionError; +use crate::errors::consensus::basic::data_contract::TokenPaymentByBurningOnlyAllowedOnInternalTokenError; #[cfg(feature = "validation")] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::document::MissingPositionsInDocumentTypePropertiesError; +#[cfg(feature = "validation")] +use crate::errors::consensus::basic::token::InvalidTokenPositionError; +#[cfg(feature = "validation")] +use crate::errors::consensus::basic::BasicError; use crate::data_contract::config::v0::DataContractConfigGettersV0; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::class_methods::try_from_schema::{ diff --git a/packages/rs-dpp/src/data_contract/document_type/index/mod.rs b/packages/rs-dpp/src/data_contract/document_type/index/mod.rs index e4013f1f698..a21f6c8073c 100644 --- a/packages/rs-dpp/src/data_contract/document_type/index/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/index/mod.rs @@ -3,6 +3,7 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; #[derive(Debug, PartialEq, PartialOrd, Clone, Eq)] #[cfg_attr(feature = "index-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum OrderBy { #[cfg_attr(feature = "index-serde-conversion", serde(rename = "asc"))] Asc, @@ -10,12 +11,12 @@ pub enum OrderBy { Desc, } -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; -use crate::ProtocolError; +use crate::errors::ProtocolError; use anyhow::anyhow; -use crate::data_contract::document_type::ContestedIndexResolution::MasternodeVote; +use crate::data_contract::document_type::index::ContestedIndexResolution::MasternodeVote; #[cfg(feature = "validation")] use crate::data_contract::errors::DataContractError::RegexError; use platform_value::{Value, ValueMap}; @@ -34,6 +35,7 @@ pub mod random_index; #[repr(u8)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd)] #[cfg_attr(feature = "index-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContestedIndexResolution { MasternodeVote = 0, } @@ -54,6 +56,7 @@ impl TryFrom for ContestedIndexResolution { #[repr(u8)] #[derive(Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContestedIndexFieldMatch { Regex(LazyRegex), PositiveIntegerMatch(u128), @@ -269,6 +272,7 @@ impl ContestedIndexFieldMatch { #[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd)] #[cfg_attr(feature = "index-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedIndexInformation { pub field_matches: BTreeMap, pub resolution: ContestedIndexResolution, @@ -286,6 +290,7 @@ impl Default for ContestedIndexInformation { // Indices documentation: https://dashplatform.readme.io/docs/reference-data-contracts#document-indices #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[cfg_attr(feature = "index-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Index { pub name: String, pub properties: Vec, @@ -333,6 +338,7 @@ impl Index { #[derive(Clone, Debug, PartialEq, Eq, Hash, Ord, PartialOrd)] #[cfg_attr(feature = "index-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IndexProperty { pub name: String, pub ascending: bool, diff --git a/packages/rs-dpp/src/data_contract/document_type/index/random_index.rs b/packages/rs-dpp/src/data_contract/document_type/index/random_index.rs index bad9be1a883..55b4eb881d2 100644 --- a/packages/rs-dpp/src/data_contract/document_type/index/random_index.rs +++ b/packages/rs-dpp/src/data_contract/document_type/index/random_index.rs @@ -1,5 +1,5 @@ use crate::data_contract::document_type::index::{Index, IndexProperty}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use rand::prelude::StdRng; use rand::seq::SliceRandom; use rand::Rng; diff --git a/packages/rs-dpp/src/data_contract/document_type/index_level/mod.rs b/packages/rs-dpp/src/data_contract/document_type/index_level/mod.rs index e2c6a132750..317182f81ce 100644 --- a/packages/rs-dpp/src/data_contract/document_type/index_level/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/index_level/mod.rs @@ -1,20 +1,21 @@ -#[cfg(feature = "validation")] -use crate::consensus::basic::data_contract::DataContractInvalidIndexDefinitionUpdateError; -use crate::consensus::basic::data_contract::DuplicateIndexError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::document_type::index_level::IndexType::{ ContestedResourceIndex, NonUniqueIndex, UniqueIndex, }; use crate::data_contract::document_type::Index; #[cfg(feature = "validation")] +use crate::errors::consensus::basic::data_contract::DataContractInvalidIndexDefinitionUpdateError; +use crate::errors::consensus::basic::data_contract::DuplicateIndexError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +#[cfg(feature = "validation")] use crate::validation::SimpleConsensusValidationResult; -use crate::version::PlatformVersion; use crate::ProtocolError; +use platform_version::version::PlatformVersion; use std::borrow::Borrow; use std::collections::BTreeMap; #[derive(Debug, PartialEq, Copy, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IndexType { /// A normal non unique index NonUniqueIndex, @@ -30,6 +31,7 @@ pub enum IndexType { } #[derive(Debug, PartialEq, Copy, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IndexLevelTypeInfo { /// should we insert if all fields up to here are null pub should_insert_with_all_null: bool, @@ -50,13 +52,14 @@ impl IndexType { pub type ShouldInsertWithAllNull = bool; #[derive(Debug, PartialEq, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IndexLevel { /// the lower index levels from this level - sub_index_levels: BTreeMap, + pub sub_index_levels: BTreeMap, /// did an index terminate at this level - has_index_with_type: Option, + pub has_index_with_type: Option, /// unique level identifier - level_identifier: u64, + pub level_identifier: u64, } impl IndexLevel { diff --git a/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs b/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs index 04c41d753c9..c776bf9affc 100644 --- a/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs @@ -8,13 +8,13 @@ use crate::data_contract::document_type::index::{Index, IndexProperty}; use crate::data_contract::document_type::index_level::IndexLevel; use crate::document::Document; use crate::document::INITIAL_REVISION; +use crate::errors::ProtocolError; use crate::prelude::{BlockHeight, CoreBlockHeight, Revision}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::methods::versioned_methods::DocumentTypeV0MethodsVersioned; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::voting::vote_polls::VotePoll; use platform_value::{Identifier, Value}; diff --git a/packages/rs-dpp/src/data_contract/document_type/methods/validate_update/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/methods/validate_update/v0/mod.rs index e6cc41614c4..c56c328c747 100644 --- a/packages/rs-dpp/src/data_contract/document_type/methods/validate_update/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/methods/validate_update/v0/mod.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::data_contract::IncompatibleDocumentTypeSchemaError; -use crate::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::schema::validate_schema_compatibility; use crate::data_contract::document_type::DocumentTypeRef; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; +use crate::errors::consensus::basic::data_contract::IncompatibleDocumentTypeSchemaError; +use crate::errors::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; @@ -245,8 +245,8 @@ impl DocumentTypeRef<'_> { mod tests { use super::*; - use crate::consensus::state::state_error::StateError; - use crate::consensus::ConsensusError; + use crate::errors::consensus::state::state_error::StateError; + use crate::errors::consensus::ConsensusError; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::DocumentType; use assert_matches::assert_matches; @@ -917,7 +917,7 @@ mod tests { mod validate_schema { use super::*; - use crate::consensus::basic::BasicError; + use crate::errors::consensus::basic::BasicError; use std::collections::BTreeMap; #[test] diff --git a/packages/rs-dpp/src/data_contract/document_type/mod.rs b/packages/rs-dpp/src/data_contract/document_type/mod.rs index 165afc0e254..749cacac918 100644 --- a/packages/rs-dpp/src/data_contract/document_type/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/mod.rs @@ -1,11 +1,12 @@ pub mod accessors; -mod property; -pub use property::*; +pub mod property; +// pub use property::*; +pub use property::{array::ArrayItemType, DocumentProperty, DocumentPropertyType}; pub mod class_methods; -mod index; +pub mod index; pub mod methods; -pub use index::*; -mod index_level; +pub use index::{Index, IndexProperty, OrderBy}; +pub mod index_level; pub use index_level::IndexLevel; pub use index_level::IndexLevelTypeInfo; pub use index_level::IndexType; @@ -15,11 +16,11 @@ pub mod random_document; pub mod restricted_creation; pub mod schema; -mod token_costs; +pub mod token_costs; pub mod v0; pub mod v1; #[cfg(feature = "validation")] -pub(crate) mod validator; +pub mod validator; use crate::data_contract::document_type::methods::{ DocumentTypeBasicMethods, DocumentTypeV0Methods, @@ -27,9 +28,9 @@ use crate::data_contract::document_type::methods::{ use crate::data_contract::document_type::v0::DocumentTypeV0; use crate::data_contract::document_type::v1::DocumentTypeV1; use crate::document::Document; -use crate::fee::Credits; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::balances::credits::Credits; +use platform_version::version::PlatformVersion; +use crate::errors::ProtocolError; use derive_more::From; pub const DEFAULT_HASH_SIZE: usize = 32; @@ -77,6 +78,7 @@ pub(crate) mod property_names { } #[derive(Clone, Copy, Debug, PartialEq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentTypeRef<'a> { V0(&'a DocumentTypeV0), V1(&'a DocumentTypeV1), @@ -89,6 +91,7 @@ pub enum DocumentTypeMutRef<'a> { } #[derive(Debug, Clone, PartialEq, From)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentType { V0(DocumentTypeV0), V1(DocumentTypeV1), diff --git a/packages/rs-dpp/src/data_contract/document_type/property/array.rs b/packages/rs-dpp/src/data_contract/document_type/property/array.rs index 6dd3f87e319..3c5e6387cfb 100644 --- a/packages/rs-dpp/src/data_contract/document_type/property/array.rs +++ b/packages/rs-dpp/src/data_contract/document_type/property/array.rs @@ -1,10 +1,11 @@ -use crate::data_contract::errors::DataContractError; -use crate::ProtocolError; +use crate::data_contract::errors::contract::DataContractError; +use crate::errors::ProtocolError; use integer_encoding::VarInt; use platform_value::Value; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ArrayItemType { Integer, Number, diff --git a/packages/rs-dpp/src/data_contract/document_type/property/mod.rs b/packages/rs-dpp/src/data_contract/document_type/property/mod.rs index 55c67e30cd4..3036236b7c5 100644 --- a/packages/rs-dpp/src/data_contract/document_type/property/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/property/mod.rs @@ -3,14 +3,14 @@ use std::convert::TryInto; use std::io::{BufReader, Cursor, Read}; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; -use crate::consensus::basic::decode::DecodingError; +use crate::errors::consensus::basic::decode::DecodingError; +use crate::errors::ProtocolError; use crate::data_contract::config::v1::DataContractConfigGettersV1; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::property_names; use crate::prelude::TimestampMillis; -use crate::ProtocolError; use array::ArrayItemType; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use indexmap::IndexMap; @@ -30,6 +30,7 @@ pub mod array; // It will become versioned and it will be introduced by a new document type version // @append_only #[derive(Debug, PartialEq, Clone, Serialize)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentProperty { pub property_type: DocumentPropertyType, pub required: bool, @@ -37,12 +38,14 @@ pub struct DocumentProperty { } #[derive(Debug, PartialEq, Clone, Serialize)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct StringPropertySizes { pub min_length: Option, pub max_length: Option, } #[derive(Debug, PartialEq, Clone, Serialize)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ByteArrayPropertySizes { pub min_size: Option, pub max_size: Option, @@ -50,6 +53,7 @@ pub struct ByteArrayPropertySizes { // @append_only #[derive(Debug, PartialEq, Clone, Serialize)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentPropertyType { U128, I128, diff --git a/packages/rs-dpp/src/data_contract/document_type/random_document.rs b/packages/rs-dpp/src/data_contract/document_type/random_document.rs index 102199904d9..c2a7b33bbc8 100644 --- a/packages/rs-dpp/src/data_contract/document_type/random_document.rs +++ b/packages/rs-dpp/src/data_contract/document_type/random_document.rs @@ -13,7 +13,7 @@ use crate::identity::accessors::IdentityGettersV0; use crate::identity::Identity; use crate::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis}; use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::{Bytes32, Identifier}; use rand::prelude::StdRng; use rand::SeedableRng; diff --git a/packages/rs-dpp/src/data_contract/document_type/restricted_creation/mod.rs b/packages/rs-dpp/src/data_contract/document_type/restricted_creation/mod.rs index e875a6fe2c4..cb9f6cce624 100644 --- a/packages/rs-dpp/src/data_contract/document_type/restricted_creation/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/restricted_creation/mod.rs @@ -1,12 +1,13 @@ -use crate::consensus::basic::data_contract::UnknownDocumentCreationRestrictionModeError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::data_contract::UnknownDocumentCreationRestrictionModeError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use std::fmt; use std::fmt::{Display, Formatter}; #[derive(Debug, PartialEq, Clone, Copy, Eq, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum CreationRestrictionMode { NoRestrictions, OwnerOnly, diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/mod.rs index dc7019cf7a2..afe5ae275c5 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/mod.rs @@ -1,8 +1,8 @@ mod v0; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::document_type::DocumentType; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/v0/mod.rs index 620fb154974..54391977792 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/enrich_with_base_schema/v0/mod.rs @@ -1,5 +1,5 @@ use crate::data_contract::document_type::property_names; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::serialized_version::property_names as contract_property_names; use platform_value::{Value, ValueMapHelper}; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/mod.rs index ccd1e64fedb..a6398905463 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/mod.rs @@ -1,7 +1,7 @@ use crate::data_contract::document_type::property::DocumentProperty; use crate::data_contract::document_type::v0::DocumentTypeV0; use crate::data_contract::document_type::DocumentType; -use crate::ProtocolError; +use crate::errors::ProtocolError; use indexmap::IndexMap; use platform_version::version::dpp_versions::dpp_contract_versions::DocumentTypeVersions; use std::collections::BTreeSet; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/v0/mod.rs index 3fc2259f7ef..debc1597af6 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/find_identifier_and_binary_paths/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::data_contract::document_type::array::ArrayItemType; +use crate::data_contract::document_type::property::array::ArrayItemType; use crate::data_contract::document_type::property::{DocumentProperty, DocumentPropertyType}; use crate::data_contract::document_type::v0::DocumentTypeV0; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs index 9fcd16358c3..7ea11f97de9 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs @@ -4,9 +4,9 @@ pub use traversal_validator::*; #[cfg(test)] mod test { use super::*; - use crate::consensus::basic::BasicError; - use crate::consensus::codes::ErrorWithCode; - use crate::consensus::ConsensusError; + use crate::errors::consensus::basic::BasicError; + use crate::errors::consensus::codes::ErrorWithCode; + use crate::errors::consensus::ConsensusError; use assert_matches::assert_matches; use platform_value::{platform_value, Value}; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/mod.rs index 2533144be24..9f37c08fc52 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/mod.rs @@ -1,7 +1,7 @@ use platform_value::Value; use platform_version::version::PlatformVersion; use crate::data_contract::document_type::schema::recursive_schema_validator::traversal_validator::v0::SubValidator; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; mod v0; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/v0/mod.rs index 5e4891d5c18..b1c9c8dad29 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/traversal_validator/v0/mod.rs @@ -1,10 +1,10 @@ use platform_value::Value; use platform_version::version::PlatformVersion; -use crate::consensus::basic::value_error::ValueError; -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::value_error::ValueError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; -use crate::ProtocolError; pub type SubValidator = fn( path: &str, diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/mod.rs index df6ef724d8a..1d95e848fab 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/mod.rs @@ -1,5 +1,5 @@ +use crate::errors::ProtocolError; use crate::validation::ConsensusValidationResult; -use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/v0/mod.rs index 990f5cf15cf..7e3452474bf 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/validate_max_depth/v0/mod.rs @@ -2,10 +2,10 @@ use platform_value::Value; use platform_version::version::PlatformVersion; use std::collections::BTreeSet; -use crate::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; -use crate::consensus::basic::data_contract::InvalidJsonSchemaRefError; -use crate::consensus::basic::BasicError; use crate::data_contract::document_type::schema::MaxDepthValidationResult; +use crate::errors::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; +use crate::errors::consensus::basic::data_contract::InvalidJsonSchemaRefError; +use crate::errors::consensus::basic::BasicError; use crate::util::json_schema::resolve_uri; use crate::validation::ConsensusValidationResult; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/mod.rs index 182f8082581..025003d6cdf 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/mod.rs @@ -1,5 +1,5 @@ -use crate::data_contract::JsonValue; -use crate::ProtocolError; +// use crate::data_contract::JsonValue; +use crate::errors::ProtocolError; use platform_version::version::PlatformVersion; mod v0; @@ -13,8 +13,8 @@ pub struct IncompatibleJsonSchemaOperation { } pub fn validate_schema_compatibility( - original_schema: &JsonValue, - new_schema: &JsonValue, + original_schema: &serde_json::Value, + new_schema: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result, ProtocolError> { match platform_version diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/v0/mod.rs index b20239c2c26..8fb52503e1d 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/validate_schema_compatibility/v0/mod.rs @@ -1,6 +1,6 @@ use crate::data_contract::document_type::schema::IncompatibleJsonSchemaOperation; -use crate::data_contract::errors::{DataContractError, JsonSchemaError}; -use crate::data_contract::JsonValue; +use crate::data_contract::errors::{contract::DataContractError, JsonSchemaError}; +// use crate::data_contract::JsonValue; use crate::validation::SimpleValidationResult; use crate::ProtocolError; use json_schema_compatibility_validator::{ @@ -29,8 +29,8 @@ static OPTIONS: Lazy = Lazy::new(|| { }); pub(super) fn validate_schema_compatibility_v0( - original_schema: &JsonValue, - new_schema: &JsonValue, + original_schema: &serde_json::Value, + new_schema: &serde_json::Value, ) -> Result, ProtocolError> { validate_schemas_compatibility(original_schema, new_schema, OPTIONS.deref()) .map(|result| { diff --git a/packages/rs-dpp/src/data_contract/document_type/token_costs/mod.rs b/packages/rs-dpp/src/data_contract/document_type/token_costs/mod.rs index 493d8a420cc..7339f90f996 100644 --- a/packages/rs-dpp/src/data_contract/document_type/token_costs/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/token_costs/mod.rs @@ -10,6 +10,7 @@ pub mod v0; /// The token costs for various document operations #[derive(Debug, PartialEq, Clone, From)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenCosts { /// Version 0 of token costs V0(TokenCostsV0), diff --git a/packages/rs-dpp/src/data_contract/document_type/token_costs/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/token_costs/v0/mod.rs index e848928830a..f95c76558fa 100644 --- a/packages/rs-dpp/src/data_contract/document_type/token_costs/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/token_costs/v0/mod.rs @@ -5,6 +5,7 @@ use crate::tokens::token_amount_on_contract_token::DocumentActionTokenCost; /// Token costs for various document operations. #[derive(Debug, PartialEq, Clone, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenCostsV0 { /// Cost of creating a document. pub create: Option, diff --git a/packages/rs-dpp/src/data_contract/document_type/v0/accessors.rs b/packages/rs-dpp/src/data_contract/document_type/v0/accessors.rs index efc5da11ac8..8afdb7d6b65 100644 --- a/packages/rs-dpp/src/data_contract/document_type/v0/accessors.rs +++ b/packages/rs-dpp/src/data_contract/document_type/v0/accessors.rs @@ -13,7 +13,7 @@ use crate::data_contract::document_type::restricted_creation::CreationRestrictio use crate::data_contract::document_type::validator::StatelessJsonSchemaLazyValidator; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use crate::document::transfer::Transferable; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; use crate::nft::TradeMode; use indexmap::IndexMap; use std::collections::{BTreeMap, BTreeSet}; diff --git a/packages/rs-dpp/src/data_contract/document_type/v0/mod.rs b/packages/rs-dpp/src/data_contract/document_type/v0/mod.rs index 69c62729fba..7dddd6ab485 100644 --- a/packages/rs-dpp/src/data_contract/document_type/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/v0/mod.rs @@ -13,54 +13,53 @@ use crate::data_contract::document_type::restricted_creation::CreationRestrictio #[cfg(feature = "validation")] use crate::data_contract::document_type::validator::StatelessJsonSchemaLazyValidator; use crate::document::transfer::Transferable; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; use crate::nft::TradeMode; use platform_value::{Identifier, Value}; -mod accessors; +pub mod accessors; #[cfg(feature = "random-document-types")] pub mod random_document_type; #[derive(Debug, PartialEq, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTypeV0 { - pub(in crate::data_contract) name: String, - pub(in crate::data_contract) schema: Value, - pub(in crate::data_contract) indices: BTreeMap, - pub(in crate::data_contract) index_structure: IndexLevel, + pub name: String, + pub schema: Value, + pub indices: BTreeMap, + pub index_structure: IndexLevel, /// Flattened properties flatten all objects for quick lookups for indexes /// Document field should not contain sub objects. - pub(in crate::data_contract) flattened_properties: IndexMap, + pub flattened_properties: IndexMap, /// Document field can contain sub objects. - pub(in crate::data_contract) properties: IndexMap, - pub(in crate::data_contract) identifier_paths: BTreeSet, - pub(in crate::data_contract) binary_paths: BTreeSet, + pub properties: IndexMap, + pub identifier_paths: BTreeSet, + pub binary_paths: BTreeSet, /// The required fields on the document type - pub(in crate::data_contract) required_fields: BTreeSet, + pub required_fields: BTreeSet, /// The transient fields on the document type - pub(in crate::data_contract) transient_fields: BTreeSet, + pub transient_fields: BTreeSet, /// Should documents keep history? - pub(in crate::data_contract) documents_keep_history: bool, + pub documents_keep_history: bool, /// Are documents mutable? - pub(in crate::data_contract) documents_mutable: bool, + pub documents_mutable: bool, /// Can documents of this type be deleted? - pub(in crate::data_contract) documents_can_be_deleted: bool, + pub documents_can_be_deleted: bool, /// Can documents be transferred without a trade? - pub(in crate::data_contract) documents_transferable: Transferable, + pub documents_transferable: Transferable, /// How are these documents traded? - pub(in crate::data_contract) trade_mode: TradeMode, + pub trade_mode: TradeMode, /// Is document creation restricted? - pub(in crate::data_contract) creation_restriction_mode: CreationRestrictionMode, + pub creation_restriction_mode: CreationRestrictionMode, /// The data contract id - pub(in crate::data_contract) data_contract_id: Identifier, + pub data_contract_id: Identifier, /// Encryption key storage requirements - pub(in crate::data_contract) requires_identity_encryption_bounded_key: - Option, + pub requires_identity_encryption_bounded_key: Option, /// Decryption key storage requirements - pub(in crate::data_contract) requires_identity_decryption_bounded_key: - Option, - pub(in crate::data_contract) security_level_requirement: SecurityLevel, + pub requires_identity_decryption_bounded_key: Option, + pub security_level_requirement: SecurityLevel, #[cfg(feature = "validation")] - pub(in crate::data_contract) json_schema_validator: StatelessJsonSchemaLazyValidator, + pub json_schema_validator: StatelessJsonSchemaLazyValidator, } impl DocumentTypeBasicMethods for DocumentTypeV0 {} diff --git a/packages/rs-dpp/src/data_contract/document_type/v0/random_document_type.rs b/packages/rs-dpp/src/data_contract/document_type/v0/random_document_type.rs index 34a844509d1..5b334706d0d 100644 --- a/packages/rs-dpp/src/data_contract/document_type/v0/random_document_type.rs +++ b/packages/rs-dpp/src/data_contract/document_type/v0/random_document_type.rs @@ -98,24 +98,24 @@ impl RandomDocumentTypeParameters { } } -use crate::data_contract::document_type::array::ArrayItemType; use crate::data_contract::document_type::index_level::IndexLevel; +use crate::data_contract::document_type::property::array::ArrayItemType; use crate::data_contract::document_type::restricted_creation::CreationRestrictionMode; #[cfg(feature = "validation")] use crate::data_contract::document_type::v0::StatelessJsonSchemaLazyValidator; +use crate::data_contract::document_type::property::{ByteArrayPropertySizes, StringPropertySizes}; use crate::data_contract::document_type::{ v0::DocumentTypeV0, DocumentProperty, DocumentPropertyType, DocumentType, Index, }; -use crate::data_contract::document_type::{ByteArrayPropertySizes, StringPropertySizes}; use crate::document::transfer::Transferable; -use crate::identity::SecurityLevel; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::SecurityLevel; use crate::nft::TradeMode; -use crate::version::PlatformVersion; -use crate::ProtocolError; use bincode::{Decode, Encode}; use indexmap::IndexMap; use itertools::Itertools; use platform_value::{platform_value, Identifier}; +use platform_version::version::PlatformVersion; use rand::rngs::StdRng; use rand::seq::SliceRandom; use rand::Rng; diff --git a/packages/rs-dpp/src/data_contract/document_type/v1/mod.rs b/packages/rs-dpp/src/data_contract/document_type/v1/mod.rs index ce7a0dd4f3f..19c4ab26c07 100644 --- a/packages/rs-dpp/src/data_contract/document_type/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/v1/mod.rs @@ -27,47 +27,48 @@ mod accessors; pub mod random_document_type; #[derive(Debug, PartialEq, Clone)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTypeV1 { - pub(in crate::data_contract) name: String, - pub(in crate::data_contract) schema: Value, - pub(in crate::data_contract) indices: BTreeMap, - pub(in crate::data_contract) index_structure: IndexLevel, + pub name: String, + pub schema: Value, + pub indices: BTreeMap, + pub index_structure: IndexLevel, /// Flattened properties flatten all objects for quick lookups for indexes /// Document field should not contain sub objects. - pub(in crate::data_contract) flattened_properties: IndexMap, + pub flattened_properties: IndexMap, /// Document field can contain sub objects. - pub(in crate::data_contract) properties: IndexMap, - pub(in crate::data_contract) identifier_paths: BTreeSet, - pub(in crate::data_contract) binary_paths: BTreeSet, + pub properties: IndexMap, + pub identifier_paths: BTreeSet, + pub binary_paths: BTreeSet, /// The required fields on the document type - pub(in crate::data_contract) required_fields: BTreeSet, + pub required_fields: BTreeSet, /// The transient fields on the document type - pub(in crate::data_contract) transient_fields: BTreeSet, + pub transient_fields: BTreeSet, /// Should documents keep history? - pub(in crate::data_contract) documents_keep_history: bool, + pub documents_keep_history: bool, /// Are documents mutable? - pub(in crate::data_contract) documents_mutable: bool, + pub documents_mutable: bool, /// Can documents of this type be deleted? - pub(in crate::data_contract) documents_can_be_deleted: bool, + pub documents_can_be_deleted: bool, /// Can documents be transferred without a trade? - pub(in crate::data_contract) documents_transferable: Transferable, + pub documents_transferable: Transferable, /// How are these documents traded? - pub(in crate::data_contract) trade_mode: TradeMode, + pub trade_mode: TradeMode, /// Is document creation restricted? - pub(in crate::data_contract) creation_restriction_mode: CreationRestrictionMode, + pub creation_restriction_mode: CreationRestrictionMode, /// The data contract id - pub(in crate::data_contract) data_contract_id: Identifier, + pub data_contract_id: Identifier, /// Encryption key storage requirements - pub(in crate::data_contract) requires_identity_encryption_bounded_key: + pub requires_identity_encryption_bounded_key: Option, /// Decryption key storage requirements - pub(in crate::data_contract) requires_identity_decryption_bounded_key: + pub requires_identity_decryption_bounded_key: Option, - pub(in crate::data_contract) security_level_requirement: SecurityLevel, + pub security_level_requirement: SecurityLevel, #[cfg(feature = "validation")] - pub(in crate::data_contract) json_schema_validator: StatelessJsonSchemaLazyValidator, + pub json_schema_validator: StatelessJsonSchemaLazyValidator, /// The token costs associated with state transitions on this document type - pub(in crate::data_contract) token_costs: TokenCosts, + pub token_costs: TokenCosts, } impl DocumentTypeBasicMethods for DocumentTypeV1 {} diff --git a/packages/rs-dpp/src/data_contract/document_type/validator.rs b/packages/rs-dpp/src/data_contract/document_type/validator.rs index f2d104d6734..b92d3324353 100644 --- a/packages/rs-dpp/src/data_contract/document_type/validator.rs +++ b/packages/rs-dpp/src/data_contract/document_type/validator.rs @@ -7,7 +7,7 @@ use std::ops::Deref; /// re-build on the next validation #[derive(Debug)] -pub struct StatelessJsonSchemaLazyValidator(JsonSchemaValidator); +pub struct StatelessJsonSchemaLazyValidator(pub JsonSchemaValidator); impl Default for StatelessJsonSchemaLazyValidator { fn default() -> Self { diff --git a/packages/rs-dpp/src/data_contract/errors/contract.rs b/packages/rs-dpp/src/data_contract/errors/contract.rs index 80dee9f226f..e76a2541e37 100644 --- a/packages/rs-dpp/src/data_contract/errors/contract.rs +++ b/packages/rs-dpp/src/data_contract/errors/contract.rs @@ -1,19 +1,20 @@ -use crate::consensus::basic::data_contract::DocumentTypesAreMissingError; -use crate::consensus::basic::decode::DecodingError; -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::data_contract::DocumentTypesAreMissingError; +use crate::errors::consensus::basic::decode::DecodingError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::basic::document::InvalidDocumentTypeError; -use crate::consensus::ConsensusError; use crate::data_contract::errors::json_schema_error::JsonSchemaError; -use crate::ProtocolError; +use crate::errors::consensus::basic::document::InvalidDocumentTypeError; +use crate::errors::consensus::ConsensusError; // @append_only #[derive( Error, Debug, PartialEq, PlatformSerialize, PlatformDeserialize, Encode, Decode, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContractError { #[error(transparent)] DecodingContractError(DecodingError), diff --git a/packages/rs-dpp/src/data_contract/errors/data_contract_not_present_error.rs b/packages/rs-dpp/src/data_contract/errors/data_contract_not_present_error.rs index a22b9b6436d..358c6ac927e 100644 --- a/packages/rs-dpp/src/data_contract/errors/data_contract_not_present_error.rs +++ b/packages/rs-dpp/src/data_contract/errors/data_contract_not_present_error.rs @@ -1,13 +1,14 @@ use platform_value::Identifier; use thiserror::Error; -use crate::ProtocolError; +use crate::errors::ProtocolError; // @append_only #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Data Contract is not present")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractNotPresentError { - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractNotPresentError { diff --git a/packages/rs-dpp/src/data_contract/errors/identity_not_present_error.rs b/packages/rs-dpp/src/data_contract/errors/identity_not_present_error.rs index 05b2f3f8a0e..116cce50af3 100644 --- a/packages/rs-dpp/src/data_contract/errors/identity_not_present_error.rs +++ b/packages/rs-dpp/src/data_contract/errors/identity_not_present_error.rs @@ -1,13 +1,14 @@ use platform_value::Identifier; use thiserror::Error; -use crate::ProtocolError; +use crate::errors::ProtocolError; // @append_only #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Identity is not present")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityNotPresentError { - id: Identifier, + pub id: Identifier, } impl IdentityNotPresentError { diff --git a/packages/rs-dpp/src/data_contract/errors/invalid_document_type_error.rs b/packages/rs-dpp/src/data_contract/errors/invalid_document_type_error.rs index e14bf7a2242..db0c5250783 100644 --- a/packages/rs-dpp/src/data_contract/errors/invalid_document_type_error.rs +++ b/packages/rs-dpp/src/data_contract/errors/invalid_document_type_error.rs @@ -1,14 +1,15 @@ use thiserror::Error; use crate::data_contract::DataContract; -use crate::ProtocolError; +use crate::errors::ProtocolError; // @append_only #[derive(Error, Debug, Clone, PartialEq)] #[error("Data Contract doesn't define document with type {doc_type}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTypeError { - doc_type: String, - data_contract: DataContract, + pub doc_type: String, + pub data_contract: DataContract, } impl InvalidDocumentTypeError { @@ -29,6 +30,6 @@ impl InvalidDocumentTypeError { impl From for ProtocolError { fn from(err: InvalidDocumentTypeError) -> Self { - Self::InvalidDocumentTypeError(err) + ProtocolError::InvalidDocumentTypeError(err) } } diff --git a/packages/rs-dpp/src/data_contract/errors/json_schema_error.rs b/packages/rs-dpp/src/data_contract/errors/json_schema_error.rs index 6d318541080..31d482f3219 100644 --- a/packages/rs-dpp/src/data_contract/errors/json_schema_error.rs +++ b/packages/rs-dpp/src/data_contract/errors/json_schema_error.rs @@ -7,6 +7,7 @@ use thiserror::Error; #[derive( Error, Debug, PartialEq, Eq, PlatformSerialize, PlatformDeserialize, Encode, Decode, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum JsonSchemaError { #[error("can't create json schema: {0}")] CreateSchemaError(String), diff --git a/packages/rs-dpp/src/data_contract/errors/mod.rs b/packages/rs-dpp/src/data_contract/errors/mod.rs index dd860ad6fe7..90fa14505d8 100644 --- a/packages/rs-dpp/src/data_contract/errors/mod.rs +++ b/packages/rs-dpp/src/data_contract/errors/mod.rs @@ -1,11 +1,11 @@ -mod contract; -mod data_contract_not_present_error; -mod identity_not_present_error; -mod invalid_document_type_error; -mod json_schema_error; +pub mod contract; +pub mod data_contract_not_present_error; +pub mod identity_not_present_error; +pub mod invalid_document_type_error; +pub mod json_schema_error; pub use contract::DataContractError; -pub use data_contract_not_present_error::*; -pub use identity_not_present_error::*; -pub use invalid_document_type_error::*; +pub use data_contract_not_present_error::DataContractNotPresentError; +pub use identity_not_present_error::IdentityNotPresentError; +pub use invalid_document_type_error::InvalidDocumentTypeError; pub use json_schema_error::JsonSchemaError; diff --git a/packages/rs-dpp/src/data_contract/factory/mod.rs b/packages/rs-dpp/src/data_contract/factory/mod.rs index 09534897606..a83faf3745f 100644 --- a/packages/rs-dpp/src/data_contract/factory/mod.rs +++ b/packages/rs-dpp/src/data_contract/factory/mod.rs @@ -3,17 +3,17 @@ mod v0; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::DataContract; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use derive_more::From; use platform_value::{Identifier, Value}; +use platform_version::version::PlatformVersion; use crate::data_contract::config::DataContractConfig; use crate::prelude::IdentityNonce; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; pub use v0::DataContractFactoryV0; /// # Data Contract Factory diff --git a/packages/rs-dpp/src/data_contract/factory/v0/mod.rs b/packages/rs-dpp/src/data_contract/factory/v0/mod.rs index 635d90ec231..c26b63f4205 100644 --- a/packages/rs-dpp/src/data_contract/factory/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/factory/v0/mod.rs @@ -1,9 +1,9 @@ -use platform_value::Value; +use platform_value::{Identifier, Value}; use platform_version::TryFromPlatformVersioned; -use crate::consensus::basic::decode::SerializedObjectParsingError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::decode::SerializedObjectParsingError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::config::DataContractConfig; #[cfg(feature = "data-contract-value-conversion")] @@ -16,15 +16,15 @@ use crate::data_contract::v0::DataContractV0; use crate::data_contract::{DataContract, INITIAL_DATA_CONTRACT_VERSION}; use crate::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; #[cfg(feature = "state-transitions")] -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; #[cfg(feature = "state-transitions")] -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; #[cfg(feature = "data-contract-value-conversion")] use crate::data_contract::v1::DataContractV1; +use crate::errors::ProtocolError; use crate::prelude::IdentityNonce; use crate::version::PlatformVersion; -use crate::{errors::ProtocolError, prelude::Identifier}; /// The version 0 implementation of the data contract factory. /// @@ -214,7 +214,7 @@ mod tests { use crate::data_contract::schema::DataContractSchemaMethodsV0; use crate::serialization::PlatformSerializableWithPlatformVersion; - use crate::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; + use crate::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; use crate::state_transition::StateTransitionLike; use crate::tests::fixtures::get_data_contract_fixture; diff --git a/packages/rs-dpp/src/data_contract/group/mod.rs b/packages/rs-dpp/src/data_contract/group/mod.rs index b65b4423910..2457d1c252a 100644 --- a/packages/rs-dpp/src/data_contract/group/mod.rs +++ b/packages/rs-dpp/src/data_contract/group/mod.rs @@ -16,8 +16,11 @@ pub mod v0; pub type RequiredSigners = u8; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type GroupMemberPower = u32; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type GroupSumPower = u32; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type GroupRequiredPower = u32; #[derive( Serialize, @@ -33,6 +36,7 @@ pub type GroupRequiredPower = u32; )] #[platform_serialize(unversioned)] #[serde(tag = "$format_version")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Group { #[serde(rename = "0")] V0(GroupV0), diff --git a/packages/rs-dpp/src/data_contract/group/v0/mod.rs b/packages/rs-dpp/src/data_contract/group/v0/mod.rs index cbb0c3025fe..66c40f91948 100644 --- a/packages/rs-dpp/src/data_contract/group/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/group/v0/mod.rs @@ -1,11 +1,11 @@ -use crate::consensus::basic::data_contract::{ +use crate::data_contract::group::accessors::v0::{GroupV0Getters, GroupV0Setters}; +use crate::data_contract::group::methods::v0::GroupMethodsV0; +use crate::data_contract::group::{GroupMemberPower, GroupRequiredPower}; +use crate::errors::consensus::basic::data_contract::{ GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupRequiredPowerIsInvalidError, GroupTotalPowerLessThanRequiredError, }; -use crate::data_contract::group::accessors::v0::{GroupV0Getters, GroupV0Setters}; -use crate::data_contract::group::methods::v0::GroupMethodsV0; -use crate::data_contract::group::{GroupMemberPower, GroupRequiredPower}; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -28,6 +28,7 @@ use std::collections::BTreeMap; Eq, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupV0 { pub members: BTreeMap, pub required_power: GroupRequiredPower, diff --git a/packages/rs-dpp/src/data_contract/methods/registration_cost/v1/mod.rs b/packages/rs-dpp/src/data_contract/methods/registration_cost/v1/mod.rs index 6dce1253630..7f92613139c 100644 --- a/packages/rs-dpp/src/data_contract/methods/registration_cost/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/registration_cost/v1/mod.rs @@ -6,7 +6,7 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::Index; use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::fee::Credits; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; use platform_value::Value; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/methods/schema/mod.rs b/packages/rs-dpp/src/data_contract/methods/schema/mod.rs index b048cd44ffe..027bf54e2d7 100644 --- a/packages/rs-dpp/src/data_contract/methods/schema/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/schema/mod.rs @@ -1,10 +1,10 @@ mod v0; pub use v0::*; +use crate::data_contract::DataContract; use crate::data_contract::{DefinitionName, DocumentName}; -use crate::prelude::DataContract; +use crate::errors::ProtocolError; use crate::validation::operations::ProtocolValidationOperation; -use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/data_contract/methods/schema/v0/mod.rs b/packages/rs-dpp/src/data_contract/methods/schema/v0/mod.rs index ff7bfcb5101..c15e0ed26fd 100644 --- a/packages/rs-dpp/src/data_contract/methods/schema/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/schema/v0/mod.rs @@ -1,6 +1,6 @@ use crate::data_contract::{DefinitionName, DocumentName}; +use crate::errors::ProtocolError; use crate::validation::operations::ProtocolValidationOperation; -use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/data_contract/methods/validate_document/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_document/mod.rs index acf0bc2b34a..856f2796dbe 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_document/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_document/mod.rs @@ -1,11 +1,11 @@ -use crate::prelude::DataContract; +use crate::data_contract::DataContract; use platform_value::Value; use platform_version::version::PlatformVersion; mod v0; use crate::document::Document; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; -use crate::ProtocolError; pub use v0::*; impl DataContractDocumentValidationMethodsV0 for DataContract { diff --git a/packages/rs-dpp/src/data_contract/methods/validate_document/v0/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_document/v0/mod.rs index 32914c4e23a..d8dff0916ed 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_document/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_document/v0/mod.rs @@ -2,19 +2,19 @@ use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentType; -use crate::consensus::basic::document::{ - DocumentFieldMaxSizeExceededError, InvalidDocumentTypeError, MissingDocumentTypeError, -}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::data_contract::document_type::v0::StatelessJsonSchemaLazyValidator; use crate::data_contract::schema::DataContractSchemaMethodsV0; use crate::data_contract::DataContract; use crate::document::{property_names, Document, DocumentV0Getters}; +use crate::errors::consensus::basic::document::{ + DocumentFieldMaxSizeExceededError, InvalidDocumentTypeError, MissingDocumentTypeError, +}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; -use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; -use std::ops::Deref; pub trait DataContractDocumentValidationMethodsV0 { fn validate_document( diff --git a/packages/rs-dpp/src/data_contract/methods/validate_groups/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_groups/mod.rs index d6a6bef8a87..8e5cec61a20 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_groups/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_groups/mod.rs @@ -1,6 +1,5 @@ use crate::data_contract::group::Group; -use crate::data_contract::GroupContractPosition; -use crate::prelude::DataContract; +use crate::data_contract::{DataContract, GroupContractPosition}; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/data_contract/methods/validate_groups/v0/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_groups/v0/mod.rs index 3e208102199..fafa0444df4 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_groups/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_groups/v0/mod.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::data_contract::NonContiguousContractGroupPositionsError; use crate::data_contract::group::methods::v0::GroupMethodsV0; use crate::data_contract::group::Group; use crate::data_contract::{DataContract, GroupContractPosition}; +use crate::errors::consensus::basic::data_contract::NonContiguousContractGroupPositionsError; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/data_contract/methods/validate_update/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_update/mod.rs index 2a40b26459f..5b64cc4dd8c 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_update/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_update/mod.rs @@ -1,5 +1,5 @@ use crate::block::block_info::BlockInfo; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-dpp/src/data_contract/methods/validate_update/v0/mod.rs b/packages/rs-dpp/src/data_contract/methods/validate_update/v0/mod.rs index 45aeef36e7b..aa897356cab 100644 --- a/packages/rs-dpp/src/data_contract/methods/validate_update/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/methods/validate_update/v0/mod.rs @@ -1,18 +1,18 @@ use std::collections::HashSet; use crate::block::block_info::BlockInfo; -use crate::consensus::state::state_error::StateError; -use crate::consensus::state::token::PreProgrammedDistributionTimestampInPastError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::state::token::PreProgrammedDistributionTimestampInPastError; use crate::data_contract::accessors::v0::DataContractV0Getters; -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ DuplicateKeywordsError, IncompatibleDataContractSchemaError, InvalidDataContractVersionError, InvalidDescriptionLengthError, InvalidKeywordCharacterError, InvalidKeywordLengthError, TooManyKeywordsError, }; -use crate::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; -use crate::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; -use crate::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; +use crate::errors::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; +use crate::errors::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; +use crate::errors::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; use crate::data_contract::accessors::v1::DataContractV1Getters; use crate::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use crate::data_contract::associated_token::token_distribution_rules::accessors::v0::TokenDistributionRulesV0Getters; @@ -20,6 +20,12 @@ use crate::data_contract::associated_token::token_pre_programmed_distribution::a use crate::data_contract::document_type::schema::validate_schema_compatibility; use crate::data_contract::schema::DataContractSchemaMethodsV0; use crate::data_contract::DataContract; +use crate::errors::consensus::basic::data_contract::{ + IncompatibleDataContractSchemaError, InvalidDataContractVersionError, +}; +use crate::errors::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; +use crate::errors::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; +use crate::errors::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_value::Value; @@ -329,10 +335,10 @@ impl DataContract { #[cfg(test)] mod tests { use super::*; - use crate::consensus::basic::basic_error::BasicError; - use crate::consensus::state::state_error::StateError; - use crate::consensus::ConsensusError; use crate::data_contract::config::v0::DataContractConfigSettersV0; + use crate::errors::consensus::basic::basic_error::BasicError; + use crate::errors::consensus::state::state_error::StateError; + use crate::errors::consensus::ConsensusError; use crate::prelude::IdentityNonce; use crate::tests::fixtures::get_data_contract_fixture; use assert_matches::assert_matches; diff --git a/packages/rs-dpp/src/data_contract/mod.rs b/packages/rs-dpp/src/data_contract/mod.rs index 8cc81bc0800..86b0cb885f8 100644 --- a/packages/rs-dpp/src/data_contract/mod.rs +++ b/packages/rs-dpp/src/data_contract/mod.rs @@ -51,9 +51,10 @@ use crate::data_contract::serialized_version::{ }; use crate::util::hash::hash_double_to_vec; -use crate::version::{FeatureVersion, PlatformVersion}; -use crate::ProtocolError; -use crate::ProtocolError::{PlatformDeserializationError, PlatformSerializationError}; +use crate::errors::ProtocolError; +use crate::errors::ProtocolError::{PlatformDeserializationError, PlatformSerializationError}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; pub use crate::data_contract::associated_token::token_configuration::TokenConfiguration; use crate::data_contract::group::Group; @@ -61,15 +62,20 @@ use crate::data_contract::v0::DataContractV0; use crate::data_contract::v1::DataContractV1; use platform_version::TryIntoPlatformVersioned; use platform_versioning::PlatformVersioned; -pub use serde_json::Value as JsonValue; -type JsonSchema = JsonValue; -type DefinitionName = String; +#[cfg_attr(feature = "apple", ferment_macro::export)] +pub type JsonSchema = serde_json::Value; +#[cfg_attr(feature = "apple", ferment_macro::export)] +pub type DefinitionName = String; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type DocumentName = String; pub type TokenName = String; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type GroupContractPosition = u16; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type TokenContractPosition = u16; -type PropertyPath = String; +#[cfg_attr(feature = "apple", ferment_macro::export)] +pub type PropertyPath = String; pub const INITIAL_DATA_CONTRACT_VERSION: u32 = 1; @@ -102,6 +108,7 @@ static EMPTY_KEYWORDS: Lazy> = Lazy::new(Vec::new); /// - the contract structure can disable certain features dependant on missing information /// - the contract might be unusable until it is updated by the owner #[derive(Debug, Clone, PartialEq, From, PlatformVersioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContract { V0(DataContractV0), V1(DataContractV1), @@ -329,8 +336,8 @@ mod tests { use crate::tests::fixtures::{ get_dashpay_contract_fixture, get_dashpay_contract_with_generalized_encryption_key_fixture, }; - use crate::version::PlatformVersion; use data_contracts::SystemDataContract::Dashpay; + use platform_version::version::PlatformVersion; #[test] fn test_contract_serialization() { diff --git a/packages/rs-dpp/src/data_contract/serialized_version/mod.rs b/packages/rs-dpp/src/data_contract/serialized_version/mod.rs index d8d85fd6dfb..720bb601f2d 100644 --- a/packages/rs-dpp/src/data_contract/serialized_version/mod.rs +++ b/packages/rs-dpp/src/data_contract/serialized_version/mod.rs @@ -12,8 +12,8 @@ use crate::data_contract::group::Group; use crate::data_contract::serialized_version::v1::DataContractInSerializationFormatV1; use crate::data_contract::v0::DataContractV0; use crate::data_contract::v1::DataContractV1; +use crate::errors::ProtocolError; use crate::validation::operations::ProtocolValidationOperation; -use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; use platform_value::{Identifier, Value}; @@ -22,8 +22,8 @@ use platform_versioning::PlatformVersioned; #[cfg(feature = "data-contract-serde-conversion")] use serde::{Deserialize, Serialize}; -pub(in crate::data_contract) mod v0; -pub(in crate::data_contract) mod v1; +pub mod v0; +pub mod v1; pub mod property_names { pub const ID: &str = "id"; @@ -40,6 +40,7 @@ pub const CONTRACT_DESERIALIZATION_LIMIT: usize = 15000; derive(Serialize, Deserialize), serde(tag = "$format_version") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContractInSerializationFormat { #[cfg_attr(feature = "data-contract-serde-conversion", serde(rename = "0"))] V0(DataContractInSerializationFormatV0), diff --git a/packages/rs-dpp/src/data_contract/serialized_version/v0/mod.rs b/packages/rs-dpp/src/data_contract/serialized_version/v0/mod.rs index 9c0cb3a5081..9083a732f52 100644 --- a/packages/rs-dpp/src/data_contract/serialized_version/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/serialized_version/v0/mod.rs @@ -14,6 +14,7 @@ use std::collections::BTreeMap; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Encode, Decode)] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractInSerializationFormatV0 { /// A unique identifier for the data contract. pub id: Identifier, diff --git a/packages/rs-dpp/src/data_contract/serialized_version/v1/mod.rs b/packages/rs-dpp/src/data_contract/serialized_version/v1/mod.rs index c2304a8935d..1a3e4aa18ca 100644 --- a/packages/rs-dpp/src/data_contract/serialized_version/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/serialized_version/v1/mod.rs @@ -21,6 +21,7 @@ use std::collections::BTreeMap; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Encode, Decode)] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractInSerializationFormatV1 { /// A unique identifier for the data contract. pub id: Identifier, diff --git a/packages/rs-dpp/src/data_contract/storage_requirements/keys_for_document_type.rs b/packages/rs-dpp/src/data_contract/storage_requirements/keys_for_document_type.rs index b825466eba2..8b781da7a6b 100644 --- a/packages/rs-dpp/src/data_contract/storage_requirements/keys_for_document_type.rs +++ b/packages/rs-dpp/src/data_contract/storage_requirements/keys_for_document_type.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::data_contract::UnknownStorageKeyRequirementsError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::data_contract::UnknownStorageKeyRequirementsError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use serde_repr::*; use std::convert::TryFrom; @@ -10,6 +10,7 @@ use std::convert::TryFrom; // @append_only #[repr(u8)] #[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Eq, Copy, Clone, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StorageKeyRequirements { Unique = 0, Multiple = 1, diff --git a/packages/rs-dpp/src/data_contract/v0/accessors/mod.rs b/packages/rs-dpp/src/data_contract/v0/accessors/mod.rs index b60eb72797a..3c0c344cd79 100644 --- a/packages/rs-dpp/src/data_contract/v0/accessors/mod.rs +++ b/packages/rs-dpp/src/data_contract/v0/accessors/mod.rs @@ -1,7 +1,7 @@ use crate::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; use crate::data_contract::config::DataContractConfig; use crate::data_contract::document_type::{DocumentType, DocumentTypeRef}; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::v0::DataContractV0; use crate::data_contract::DocumentName; diff --git a/packages/rs-dpp/src/data_contract/v0/conversion/cbor.rs b/packages/rs-dpp/src/data_contract/v0/conversion/cbor.rs index c2aba05b124..e9f2d5ebb0d 100644 --- a/packages/rs-dpp/src/data_contract/v0/conversion/cbor.rs +++ b/packages/rs-dpp/src/data_contract/v0/conversion/cbor.rs @@ -3,10 +3,10 @@ use crate::data_contract::conversion::value::v0::DataContractValueConversionMeth use crate::data_contract::v0::DataContractV0; use crate::util::cbor_value::CborCanonicalMap; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use ciborium::Value as CborValue; use platform_value::{Identifier, Value}; +use platform_version::version::PlatformVersion; use std::convert::TryFrom; impl DataContractCborConversionMethodsV0 for DataContractV0 { diff --git a/packages/rs-dpp/src/data_contract/v0/conversion/json.rs b/packages/rs-dpp/src/data_contract/v0/conversion/json.rs index 90e05b5f1fd..4ce6d3d983f 100644 --- a/packages/rs-dpp/src/data_contract/v0/conversion/json.rs +++ b/packages/rs-dpp/src/data_contract/v0/conversion/json.rs @@ -2,15 +2,15 @@ use crate::data_contract::conversion::json::DataContractJsonConversionMethodsV0; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; use crate::data_contract::v0::DataContractV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; impl DataContractJsonConversionMethodsV0 for DataContractV0 { fn from_json( - json_value: JsonValue, + json_value: serde_json::Value, full_validation: bool, platform_version: &PlatformVersion, ) -> Result { @@ -18,7 +18,10 @@ impl DataContractJsonConversionMethodsV0 for DataContractV0 { } /// Returns Data Contract as a JSON Value - fn to_json(&self, platform_version: &PlatformVersion) -> Result { + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result { self.to_value(platform_version)? .try_into() .map_err(ProtocolError::ValueError) @@ -30,7 +33,7 @@ impl DataContractJsonConversionMethodsV0 for DataContractV0 { fn to_validating_json( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { self.to_value(platform_version)? .try_into_validating_json() .map_err(ProtocolError::ValueError) diff --git a/packages/rs-dpp/src/data_contract/v0/conversion/value.rs b/packages/rs-dpp/src/data_contract/v0/conversion/value.rs index db16bc497d7..f66bfcad66e 100644 --- a/packages/rs-dpp/src/data_contract/v0/conversion/value.rs +++ b/packages/rs-dpp/src/data_contract/v0/conversion/value.rs @@ -3,9 +3,9 @@ use crate::data_contract::serialized_version::property_names; use crate::data_contract::serialized_version::v0::DataContractInSerializationFormatV0; use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::data_contract::v0::DataContractV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::{ReplacementType, Value}; +use platform_version::version::PlatformVersion; use platform_version::TryFromPlatformVersioned; pub const DATA_CONTRACT_IDENTIFIER_FIELDS_V0: [&str; 2] = diff --git a/packages/rs-dpp/src/data_contract/v0/data_contract.rs b/packages/rs-dpp/src/data_contract/v0/data_contract.rs index d77c22d0bc8..41d414e3a67 100644 --- a/packages/rs-dpp/src/data_contract/v0/data_contract.rs +++ b/packages/rs-dpp/src/data_contract/v0/data_contract.rs @@ -19,29 +19,30 @@ use crate::metadata::Metadata; /// Additionally, `DataContractV0` holds definitions for JSON schemas, entropy, and binary properties /// of the documents. #[derive(Debug, Clone, PartialEq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractV0 { /// A unique identifier for the data contract. /// This field must always present in all versions. - pub(crate) id: Identifier, + pub id: Identifier, /// The version of this data contract. - pub(crate) version: u32, + pub version: u32, /// The identifier of the contract owner. - pub(crate) owner_id: Identifier, + pub owner_id: Identifier, /// A mapping of document names to their corresponding document types. pub document_types: BTreeMap, // TODO: Move metadata from here /// Optional metadata associated with the contract. - pub(crate) metadata: Option, + pub metadata: Option, /// Internal configuration for the contract. - pub(crate) config: DataContractConfig, + pub config: DataContractConfig, /// Shared subschemas to reuse across documents (see $defs) - pub(crate) schema_defs: Option>, + pub schema_defs: Option>, } #[cfg(test)] diff --git a/packages/rs-dpp/src/data_contract/v0/methods/schema.rs b/packages/rs-dpp/src/data_contract/v0/methods/schema.rs index 576e98d2a89..cd7da14cb23 100644 --- a/packages/rs-dpp/src/data_contract/v0/methods/schema.rs +++ b/packages/rs-dpp/src/data_contract/v0/methods/schema.rs @@ -3,8 +3,8 @@ use crate::data_contract::document_type::DocumentType; use crate::data_contract::schema::DataContractSchemaMethodsV0; use crate::data_contract::v0::DataContractV0; use crate::data_contract::{DefinitionName, DocumentName}; +use crate::errors::ProtocolError; use crate::validation::operations::ProtocolValidationOperation; -use crate::ProtocolError; use platform_value::Value; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/data_contract/v0/mod.rs b/packages/rs-dpp/src/data_contract/v0/mod.rs index c814a35c4bf..3c51c7a35e6 100644 --- a/packages/rs-dpp/src/data_contract/v0/mod.rs +++ b/packages/rs-dpp/src/data_contract/v0/mod.rs @@ -4,4 +4,5 @@ pub mod data_contract; mod methods; pub mod serialization; -pub use data_contract::*; +// pub use data_contract::*; +pub use data_contract::DataContractV0; diff --git a/packages/rs-dpp/src/data_contract/v0/serialization/mod.rs b/packages/rs-dpp/src/data_contract/v0/serialization/mod.rs index ca4048864e2..969d5b92d22 100644 --- a/packages/rs-dpp/src/data_contract/v0/serialization/mod.rs +++ b/packages/rs-dpp/src/data_contract/v0/serialization/mod.rs @@ -3,8 +3,9 @@ use crate::data_contract::serialized_version::v0::DataContractInSerializationFor use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::data_contract::v0::DataContractV0; use crate::data_contract::DataContract; -use crate::version::{PlatformVersion, PlatformVersionCurrentVersion}; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::version::PlatformVersionCurrentVersion; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; use crate::data_contract::serialized_version::v1::DataContractInSerializationFormatV1; diff --git a/packages/rs-dpp/src/data_contract/v1/data_contract.rs b/packages/rs-dpp/src/data_contract/v1/data_contract.rs index e9c247f2373..445666d6e53 100644 --- a/packages/rs-dpp/src/data_contract/v1/data_contract.rs +++ b/packages/rs-dpp/src/data_contract/v1/data_contract.rs @@ -74,6 +74,7 @@ use platform_value::Value; /// These additions ensure that data contracts are not only more flexible and governed but also /// fully auditable in terms of when and how they evolve over time. #[derive(Debug, Clone, PartialEq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractV1 { /// A unique identifier for the data contract. /// This field must always present in all versions. diff --git a/packages/rs-dpp/src/data_contract/v1/mod.rs b/packages/rs-dpp/src/data_contract/v1/mod.rs index c814a35c4bf..895324c8ea8 100644 --- a/packages/rs-dpp/src/data_contract/v1/mod.rs +++ b/packages/rs-dpp/src/data_contract/v1/mod.rs @@ -4,4 +4,4 @@ pub mod data_contract; mod methods; pub mod serialization; -pub use data_contract::*; +pub use data_contract::DataContractV1; diff --git a/packages/rs-dpp/src/document/accessors/v0/mod.rs b/packages/rs-dpp/src/document/accessors/v0/mod.rs index 671ac05c4a6..25f78e5ff1d 100644 --- a/packages/rs-dpp/src/document/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/document/accessors/v0/mod.rs @@ -5,8 +5,8 @@ use platform_value::Value; use std::collections::BTreeMap; use crate::identity::TimestampMillis; -use crate::prelude::Identifier; use crate::prelude::Revision; +use platform_value::Identifier; pub trait DocumentV0Getters { /// Returns the unique document ID. diff --git a/packages/rs-dpp/src/document/document_factory/mod.rs b/packages/rs-dpp/src/document/document_factory/mod.rs index 2d958c7eb8d..86871205b98 100644 --- a/packages/rs-dpp/src/document/document_factory/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/mod.rs @@ -3,17 +3,17 @@ mod v0; use crate::data_contract::DataContract; use std::collections::BTreeMap; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use derive_more::From; use platform_value::{Bytes32, Identifier, Value}; +use platform_version::version::PlatformVersion; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; #[cfg(feature = "extended-document")] use crate::document::ExtendedDocument; #[cfg(feature = "state-transitions")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ batched_transition::document_transition_action_type::DocumentTransitionActionType, BatchTransition, }; diff --git a/packages/rs-dpp/src/document/document_factory/v0/mod.rs b/packages/rs-dpp/src/document/document_factory/v0/mod.rs index 7cfbfed6757..3396572b383 100644 --- a/packages/rs-dpp/src/document/document_factory/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/v0/mod.rs @@ -1,17 +1,17 @@ -use crate::consensus::basic::document::InvalidDocumentTypeError; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::DataContract; use crate::document::errors::DocumentError; use crate::document::{Document, DocumentV0Getters, DocumentV0Setters, INITIAL_REVISION}; +use crate::errors::consensus::basic::document::InvalidDocumentTypeError; use chrono::Utc; use std::collections::BTreeMap; +use crate::errors::ProtocolError; use crate::util::entropy_generator::{DefaultEntropyGenerator, EntropyGenerator}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; use platform_value::{Bytes32, Identifier, Value}; @@ -24,7 +24,7 @@ use crate::document::{ }; use crate::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis}; #[cfg(feature = "state-transitions")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ batched_transition::{ document_transition_action_type::DocumentTransitionActionType, DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, @@ -581,7 +581,7 @@ mod test { use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::document::document_factory::DocumentFactoryV0; use crate::document::{Document, DocumentV0}; - use crate::identifier::Identifier; + use platform_value::Identifier; use crate::system_data_contracts::load_system_data_contract; #[test] diff --git a/packages/rs-dpp/src/document/document_methods/get_raw_for_contract/v0/mod.rs b/packages/rs-dpp/src/document/document_methods/get_raw_for_contract/v0/mod.rs index 8750f4034d6..4bb068ff9e9 100644 --- a/packages/rs-dpp/src/document/document_methods/get_raw_for_contract/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_methods/get_raw_for_contract/v0/mod.rs @@ -1,10 +1,10 @@ use crate::data_contract::accessors::v0::DataContractV0Getters; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::DataContract; use crate::document::document_methods::DocumentGetRawForDocumentTypeV0; use crate::document::DocumentV0Getters; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; pub trait DocumentGetRawForContractV0: DocumentV0Getters + DocumentGetRawForDocumentTypeV0 { /// Return a value given the path to its key and the document type for a contract. diff --git a/packages/rs-dpp/src/document/document_methods/get_raw_for_document_type/v0/mod.rs b/packages/rs-dpp/src/document/document_methods/get_raw_for_document_type/v0/mod.rs index 2bcaa11c271..924f47596c9 100644 --- a/packages/rs-dpp/src/document/document_methods/get_raw_for_document_type/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_methods/get_raw_for_document_type/v0/mod.rs @@ -2,9 +2,9 @@ use crate::data_contract::document_type::methods::DocumentTypeV0Methods; use crate::data_contract::document_type::DocumentPropertyType; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::DocumentV0Getters; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::btreemap_extensions::BTreeValueMapPathHelper; +use platform_version::version::PlatformVersion; pub trait DocumentGetRawForDocumentTypeV0: DocumentV0Getters { /// Return a value given the path to its key for a document type. diff --git a/packages/rs-dpp/src/document/document_methods/hash/v0/mod.rs b/packages/rs-dpp/src/document/document_methods/hash/v0/mod.rs index 091366a8c65..5043320cbfc 100644 --- a/packages/rs-dpp/src/document/document_methods/hash/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_methods/hash/v0/mod.rs @@ -3,9 +3,9 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::DataContract; use crate::document::serialization_traits::DocumentPlatformConversionMethodsV0; +use crate::errors::ProtocolError; use crate::util::hash::hash_double_to_vec; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; pub trait DocumentHashV0Method: DocumentPlatformConversionMethodsV0 { /// The document is only unique within the contract and document type diff --git a/packages/rs-dpp/src/document/document_methods/mod.rs b/packages/rs-dpp/src/document/document_methods/mod.rs index 6b3f779dde3..07c506bfc1c 100644 --- a/packages/rs-dpp/src/document/document_methods/mod.rs +++ b/packages/rs-dpp/src/document/document_methods/mod.rs @@ -1,7 +1,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::DataContract; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; mod get_raw_for_contract; mod get_raw_for_document_type; diff --git a/packages/rs-dpp/src/document/errors.rs b/packages/rs-dpp/src/document/errors.rs index 9df0c53b500..4de4f6c1f6d 100644 --- a/packages/rs-dpp/src/document/errors.rs +++ b/packages/rs-dpp/src/document/errors.rs @@ -9,6 +9,7 @@ use crate::document::Document; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransition; #[derive(Error, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentError { #[cfg(feature = "state-transitions")] #[error("Document already exists")] diff --git a/packages/rs-dpp/src/document/extended_document/accessors.rs b/packages/rs-dpp/src/document/extended_document/accessors.rs index c20951f83ac..a44c4474dc0 100644 --- a/packages/rs-dpp/src/document/extended_document/accessors.rs +++ b/packages/rs-dpp/src/document/extended_document/accessors.rs @@ -1,11 +1,11 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::DataContract; use crate::document::{Document, ExtendedDocument}; +use crate::errors::ProtocolError; use crate::identity::TimestampMillis; use crate::metadata::Metadata; use crate::prelude::{BlockHeight, CoreBlockHeight, Revision}; use crate::tokens::token_payment_info::TokenPaymentInfo; -use crate::ProtocolError; use platform_value::{Bytes32, Identifier, Value}; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/document/extended_document/mod.rs b/packages/rs-dpp/src/document/extended_document/mod.rs index 83f1eb3c3df..e2c7aafc67e 100644 --- a/packages/rs-dpp/src/document/extended_document/mod.rs +++ b/packages/rs-dpp/src/document/extended_document/mod.rs @@ -12,7 +12,7 @@ pub use fields::{property_names, IDENTIFIER_FIELDS}; feature = "document-value-conversion" ))] use crate::data_contract::DataContract; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::document::extended_document::v0::ExtendedDocumentV0; @@ -24,8 +24,6 @@ use derive_more::From; use platform_value::Value; use platform_version::version::PlatformVersion; use platform_versioning::PlatformVersioned; -#[cfg(feature = "document-json-conversion")] -use serde_json::Value as JsonValue; #[cfg(feature = "document-value-conversion")] use std::collections::BTreeMap; @@ -41,7 +39,7 @@ impl ExtendedDocument { /// # Errors /// /// Returns a `ProtocolError` if there's an error in converting the properties to JSON. - pub fn properties_as_json_data(&self) -> Result { + pub fn properties_as_json_data(&self) -> Result { match self { ExtendedDocument::V0(v0) => v0.properties_as_json_data(), } @@ -101,7 +99,7 @@ impl ExtendedDocument { /// This function is a passthrough to the `from_raw_json_document` method. #[cfg(feature = "document-json-conversion")] pub fn from_raw_json_document( - raw_document: JsonValue, + raw_document: serde_json::Value, data_contract: DataContract, platform_version: &PlatformVersion, ) -> Result { @@ -192,7 +190,10 @@ impl ExtendedDocument { /// /// This function is a passthrough to the `to_json` method. #[cfg(feature = "document-json-conversion")] - pub fn to_json(&self, platform_version: &PlatformVersion) -> Result { + pub fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result { match self { ExtendedDocument::V0(v0) => v0.to_json(platform_version), } @@ -205,7 +206,7 @@ impl ExtendedDocument { pub fn to_pretty_json( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { match self { ExtendedDocument::V0(v0) => v0.to_pretty_json(platform_version), } @@ -255,7 +256,7 @@ impl ExtendedDocument { /// /// This function is a passthrough to the `to_json_object_for_validation` method. #[cfg(feature = "document-json-conversion")] - pub fn to_json_object_for_validation(&self) -> Result { + pub fn to_json_object_for_validation(&self) -> Result { match self { ExtendedDocument::V0(v0) => v0.to_json_object_for_validation(), } @@ -315,7 +316,7 @@ impl ExtendedDocument { #[cfg(test)] mod test { use anyhow::Result; - use serde_json::{json, Value as JsonValue}; + use serde_json::json; use std::convert::TryInto; use crate::document::extended_document::{ExtendedDocument, IDENTIFIER_FIELDS}; @@ -324,7 +325,7 @@ mod test { use crate::data_contract::DataContract; use crate::document::extended_document::v0::ExtendedDocumentV0; - use crate::prelude::Identifier; + use platform_value::Identifier; use crate::system_data_contracts::load_system_data_contract; use crate::tests::utils::*; use data_contracts::SystemDataContract; @@ -341,6 +342,7 @@ mod test { use crate::tests::fixtures::get_dashpay_contract_fixture; use base64::prelude::BASE64_STANDARD; use base64::Engine; + use serde_json::Value as JsonValue; fn init() { let _ = env_logger::builder() @@ -600,15 +602,15 @@ mod test { assert_eq!( json_document["$id"], - JsonValue::String(bs58::encode(&id).into_string()) + serde_json::Value::String(bs58::encode(&id).into_string()) ); assert_eq!( json_document["$ownerId"], - JsonValue::String(bs58::encode(&owner_id).into_string()) + serde_json::Value::String(bs58::encode(&owner_id).into_string()) ); assert_eq!( json_document["$dataContractId"], - JsonValue::String(bs58::encode(&data_contract_id).into_string()) + serde_json::Value::String(bs58::encode(&data_contract_id).into_string()) ); assert_eq!( json_document["alphaBinary"], diff --git a/packages/rs-dpp/src/document/extended_document/serialize.rs b/packages/rs-dpp/src/document/extended_document/serialize.rs index 8abf17aab50..9b6c7100818 100644 --- a/packages/rs-dpp/src/document/extended_document/serialize.rs +++ b/packages/rs-dpp/src/document/extended_document/serialize.rs @@ -1,13 +1,13 @@ use crate::document::extended_document::v0::ExtendedDocumentV0; use crate::document::serialization_traits::ExtendedDocumentPlatformConversionMethodsV0; -use crate::prelude::ExtendedDocument; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::document::ExtendedDocument; +use crate::errors::ProtocolError; use bincode::enc::Encoder; use bincode::error::EncodeError; use platform_serialization::{PlatformVersionEncode, PlatformVersionedDecode}; -use platform_version::version::FeatureVersion; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ExtendedDocumentPlatformConversionMethodsV0 for ExtendedDocument { /// Serializes the document. diff --git a/packages/rs-dpp/src/document/extended_document/v0/json_conversion.rs b/packages/rs-dpp/src/document/extended_document/v0/json_conversion.rs index cbc8cb4a266..94a45417050 100644 --- a/packages/rs-dpp/src/document/extended_document/v0/json_conversion.rs +++ b/packages/rs-dpp/src/document/extended_document/v0/json_conversion.rs @@ -5,18 +5,18 @@ use crate::document::serialization_traits::{ DocumentJsonMethodsV0, DocumentPlatformValueMethodsV0, }; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Identifier; use platform_version::version::PlatformVersion; use serde::Deserialize; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; impl DocumentJsonMethodsV0<'_> for ExtendedDocumentV0 { fn to_json_with_identifiers_using_bytes( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { let mut json = self .document .to_json_with_identifiers_using_bytes(platform_version)?; @@ -30,7 +30,10 @@ impl DocumentJsonMethodsV0<'_> for ExtendedDocumentV0 { Ok(json) } - fn to_json(&self, platform_version: &PlatformVersion) -> Result { + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result { let mut json = self.document.to_json(platform_version)?; let value_mut = json.as_object_mut().unwrap(); let contract = self.data_contract.to_json(platform_version)?; @@ -43,7 +46,7 @@ impl DocumentJsonMethodsV0<'_> for ExtendedDocumentV0 { } fn from_json_value( - document_value: JsonValue, + document_value: serde_json::Value, platform_version: &PlatformVersion, ) -> Result where diff --git a/packages/rs-dpp/src/document/extended_document/v0/mod.rs b/packages/rs-dpp/src/document/extended_document/v0/mod.rs index 597a8165cb3..1f435b71271 100644 --- a/packages/rs-dpp/src/document/extended_document/v0/mod.rs +++ b/packages/rs-dpp/src/document/extended_document/v0/mod.rs @@ -16,8 +16,8 @@ use crate::identity::TimestampMillis; use crate::metadata::Metadata; use crate::prelude::{BlockHeight, CoreBlockHeight, Revision}; +use crate::errors::ProtocolError; use crate::util::hash::hash_double_to_vec; -use crate::ProtocolError; use platform_value::btreemap_extensions::{ BTreeValueMapInsertionPathHelper, BTreeValueMapPathHelper, @@ -50,8 +50,8 @@ use crate::validation::SimpleConsensusValidationResult; #[cfg(feature = "document-json-conversion")] use platform_value::converter::serde_json::BTreeValueJsonConverter; use platform_version::version::PlatformVersion; -#[cfg(feature = "document-json-conversion")] -use serde_json::Value as JsonValue; +// #[cfg(feature = "document-json-conversion")] +// use serde_json::Value as JsonValue; /// The `ExtendedDocumentV0` struct represents the data provided by the platform in response to a query. #[derive(Debug, Clone)] @@ -137,7 +137,7 @@ pub struct ExtendedDocumentV0 { impl ExtendedDocumentV0 { #[cfg(feature = "document-json-conversion")] - pub(super) fn properties_as_json_data(&self) -> Result { + pub(super) fn properties_as_json_data(&self) -> Result { self.document .properties() .to_json_value() @@ -261,7 +261,7 @@ impl ExtendedDocumentV0 { contract: DataContract, platform_version: &PlatformVersion, ) -> Result { - let json_value: JsonValue = serde_json::from_str(string).map_err(|_| { + let json_value: serde_json::Value = serde_json::from_str(string).map_err(|_| { ProtocolError::StringDecodeError("error decoding from json string".to_string()) })?; Self::from_untrusted_platform_value(json_value.into(), contract, platform_version) @@ -279,7 +279,7 @@ impl ExtendedDocumentV0 { /// /// Returns a `ProtocolError` if there is an error processing the raw JSON document. pub fn from_raw_json_document( - raw_document: JsonValue, + raw_document: serde_json::Value, data_contract: DataContract, platform_version: &PlatformVersion, ) -> Result { @@ -422,16 +422,18 @@ impl ExtendedDocumentV0 { pub fn to_pretty_json( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { let mut value = self.document.to_json(platform_version)?; let value_mut = value.as_object_mut().unwrap(); value_mut.insert( property_names::DOCUMENT_TYPE_NAME.to_string(), - JsonValue::String(self.document_type_name.clone()), + serde_json::Value::String(self.document_type_name.clone()), ); value_mut.insert( property_names::DATA_CONTRACT_ID.to_string(), - JsonValue::String(bs58::encode(self.data_contract_id.to_buffer()).into_string()), + serde_json::Value::String( + bs58::encode(self.data_contract_id.to_buffer()).into_string(), + ), ); if let Some(token_payment_info) = self.token_payment_info { let value: Value = token_payment_info.try_into()?; @@ -503,7 +505,7 @@ impl ExtendedDocumentV0 { } #[cfg(feature = "document-json-conversion")] - pub fn to_json_object_for_validation(&self) -> Result { + pub fn to_json_object_for_validation(&self) -> Result { self.to_value()? .try_into_validating_json() .map_err(ProtocolError::ValueError) diff --git a/packages/rs-dpp/src/document/extended_document/v0/platform_value_conversion.rs b/packages/rs-dpp/src/document/extended_document/v0/platform_value_conversion.rs index a27f8f7ea45..c12c9752deb 100644 --- a/packages/rs-dpp/src/document/extended_document/v0/platform_value_conversion.rs +++ b/packages/rs-dpp/src/document/extended_document/v0/platform_value_conversion.rs @@ -1,8 +1,8 @@ use crate::document::extended_document::v0::ExtendedDocumentV0; use crate::document::property_names; use crate::document::serialization_traits::DocumentPlatformValueMethodsV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; use platform_value::Value; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/document/extended_document/v0/serialize.rs b/packages/rs-dpp/src/document/extended_document/v0/serialize.rs index af70e8784cc..25b02763c0d 100644 --- a/packages/rs-dpp/src/document/extended_document/v0/serialize.rs +++ b/packages/rs-dpp/src/document/extended_document/v0/serialize.rs @@ -1,8 +1,8 @@ use crate::document::Document; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::data_contract::accessors::v0::DataContractV0Getters; @@ -17,13 +17,13 @@ use crate::serialization::{ PlatformDeserializableWithBytesLenFromVersionedStructure, PlatformSerializableWithPlatformVersion, }; -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; use integer_encoding::{VarInt, VarIntReader}; -use crate::consensus::basic::decode::DecodingError; -use crate::data_contract::errors::DataContractError; -use platform_version::version::FeatureVersion; +use crate::data_contract::errors::contract::DataContractError; +use crate::errors::consensus::basic::decode::DecodingError; +use versioned_feature_core::FeatureVersion; impl ExtendedDocumentPlatformSerializationMethodsV0 for ExtendedDocumentV0 { /// Serializes the extended document. diff --git a/packages/rs-dpp/src/document/generate_document_id.rs b/packages/rs-dpp/src/document/generate_document_id.rs index b14fc599a44..dbf7cad8acf 100644 --- a/packages/rs-dpp/src/document/generate_document_id.rs +++ b/packages/rs-dpp/src/document/generate_document_id.rs @@ -1,6 +1,6 @@ use crate::document::Document; -use crate::{prelude::Identifier, util::hash::hash_double_to_vec}; - +use crate::util::hash::hash_double_to_vec; +use platform_value::Identifier; impl Document { /// Generates the document ID pub fn generate_document_id_v0( diff --git a/packages/rs-dpp/src/document/mod.rs b/packages/rs-dpp/src/document/mod.rs index bcb7b29dc7a..9011b513191 100644 --- a/packages/rs-dpp/src/document/mod.rs +++ b/packages/rs-dpp/src/document/mod.rs @@ -16,17 +16,16 @@ pub mod serialization_traits; #[cfg(feature = "factories")] pub mod specialized_document_factory; pub mod transfer; -mod v0; +pub mod v0; pub use accessors::*; -pub use v0::*; - #[cfg(feature = "extended-document")] pub use extended_document::property_names as extended_document_property_names; #[cfg(feature = "extended-document")] pub use extended_document::ExtendedDocument; #[cfg(feature = "extended-document")] pub use extended_document::IDENTIFIER_FIELDS as EXTENDED_DOCUMENT_IDENTIFIER_FIELDS; +pub use v0::{serialize, DocumentV0}; /// the initial revision of newly created document pub const INITIAL_REVISION: u64 = 1; @@ -38,9 +37,9 @@ use crate::document::document_methods::{ DocumentIsEqualIgnoringTimestampsV0, DocumentMethodsV0, }; use crate::document::errors::DocumentError; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use derive_more::From; +use platform_version::version::PlatformVersion; #[cfg(feature = "document-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -54,6 +53,7 @@ use std::fmt::Formatter; derive(Serialize, Deserialize), serde(tag = "$version") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Document { #[cfg_attr(feature = "document-serde-conversion", serde(rename = "0"))] V0(DocumentV0), diff --git a/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/mod.rs b/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/mod.rs index 91bfa04a604..66ea6c3c833 100644 --- a/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/mod.rs @@ -1,11 +1,11 @@ mod v0; use crate::document::{Document, DocumentV0}; +use crate::errors::ProtocolError; use crate::util::deserializer; use crate::util::deserializer::SplitFeatureVersionOutcome; -use crate::version::PlatformVersion; -use crate::ProtocolError; use ciborium::Value as CborValue; +use platform_version::version::PlatformVersion; pub use v0::*; impl DocumentCborMethodsV0 for Document { diff --git a/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/v0/mod.rs index 108c2a43146..3565122009d 100644 --- a/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/cbor_conversion/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use ciborium::Value as CborValue; +use platform_version::version::PlatformVersion; pub trait DocumentCborMethodsV0 { /// Reads a CBOR-serialized document and creates a Document from it. diff --git a/packages/rs-dpp/src/document/serialization_traits/json_conversion/mod.rs b/packages/rs-dpp/src/document/serialization_traits/json_conversion/mod.rs index f2b168ad698..9b7a8f22c73 100644 --- a/packages/rs-dpp/src/document/serialization_traits/json_conversion/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/json_conversion/mod.rs @@ -3,11 +3,11 @@ mod v0; pub use v0::*; use crate::document::{Document, DocumentV0}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Identifier; use platform_version::version::PlatformVersion; use serde::Deserialize; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; impl DocumentJsonMethodsV0<'_> for Document { @@ -15,14 +15,17 @@ impl DocumentJsonMethodsV0<'_> for Document { fn to_json_with_identifiers_using_bytes( &self, platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { match self { Document::V0(v0) => v0.to_json_with_identifiers_using_bytes(platform_version), } } /// Convert the document to a JSON value. - fn to_json(&self, platform_version: &PlatformVersion) -> Result { + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result { match self { Document::V0(v0) => v0.to_json(platform_version), } @@ -30,7 +33,7 @@ impl DocumentJsonMethodsV0<'_> for Document { /// Create a document from a JSON value. fn from_json_value( - document_value: JsonValue, + document_value: serde_json::Value, platform_version: &PlatformVersion, ) -> Result where diff --git a/packages/rs-dpp/src/document/serialization_traits/json_conversion/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/json_conversion/v0/mod.rs index 2fff0a43370..8899d045c84 100644 --- a/packages/rs-dpp/src/document/serialization_traits/json_conversion/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/json_conversion/v0/mod.rs @@ -1,19 +1,22 @@ use crate::document::serialization_traits::DocumentPlatformValueMethodsV0; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Identifier; use platform_version::version::PlatformVersion; use serde::Deserialize; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; pub trait DocumentJsonMethodsV0<'a>: DocumentPlatformValueMethodsV0<'a> { fn to_json_with_identifiers_using_bytes( &self, platform_version: &PlatformVersion, - ) -> Result; - fn to_json(&self, platform_version: &PlatformVersion) -> Result; + ) -> Result; + fn to_json( + &self, + platform_version: &PlatformVersion, + ) -> Result; fn from_json_value( - document_value: JsonValue, + document_value: serde_json::Value, platform_version: &PlatformVersion, ) -> Result where diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/deserialize/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/deserialize/v0/mod.rs index a6e43769b52..2354cba28d0 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/deserialize/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/deserialize/v0/mod.rs @@ -1,7 +1,7 @@ use crate::data_contract::document_type::DocumentTypeRef; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; #[cfg(feature = "extended-document")] -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_version::version::PlatformVersion; pub(in crate::document) trait DocumentPlatformDeserializationMethodsV0 { diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/mod.rs index eed376b58bd..cc702c1748f 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/mod.rs @@ -5,11 +5,12 @@ mod v0; use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::DataContract; use crate::document::{Document, DocumentV0}; +use crate::errors::ProtocolError; #[cfg(feature = "validation")] use crate::prelude::ConsensusValidationResult; -use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; pub use v0::*; +use versioned_feature_core::FeatureVersion; impl DocumentPlatformConversionMethodsV0 for Document { /// Serializes the document. diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/serialize/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/serialize/v0/mod.rs index 4d6348011b7..1f0e9335f48 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/serialize/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/serialize/v0/mod.rs @@ -1,5 +1,5 @@ use crate::data_contract::document_type::DocumentTypeRef; -use crate::ProtocolError; +use crate::errors::ProtocolError; #[cfg(feature = "extended-document")] use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/v0/mod.rs index 67a9dd95700..3655ca165c1 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/v0/mod.rs @@ -1,10 +1,10 @@ use crate::data_contract::document_type::DocumentTypeRef; -use crate::prelude::DataContract; +use crate::data_contract::DataContract; +use crate::errors::ProtocolError; #[cfg(feature = "validation")] use crate::validation::ConsensusValidationResult; -use crate::version::PlatformVersion; -use crate::ProtocolError; -use platform_version::version::FeatureVersion; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; pub trait DocumentPlatformConversionMethodsV0: Clone { /// Serializes the document. diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/mod.rs index 315d766493f..aeddd5ecbff 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/mod.rs @@ -3,9 +3,9 @@ mod v0; pub use v0::*; use crate::document::{Document, DocumentV0}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl DocumentPlatformValueMethodsV0<'_> for Document { diff --git a/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/v0/mod.rs b/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/v0/mod.rs index fb372aa0293..582dd9fb794 100644 --- a/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/v0/mod.rs +++ b/packages/rs-dpp/src/document/serialization_traits/platform_value_conversion/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/document/specialized_document_factory/mod.rs b/packages/rs-dpp/src/document/specialized_document_factory/mod.rs index f006f3f2712..a535c586c39 100644 --- a/packages/rs-dpp/src/document/specialized_document_factory/mod.rs +++ b/packages/rs-dpp/src/document/specialized_document_factory/mod.rs @@ -3,17 +3,17 @@ mod v0; use crate::data_contract::DataContract; use std::collections::BTreeMap; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use derive_more::From; use platform_value::{Bytes32, Identifier, Value}; +use platform_version::version::PlatformVersion; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; #[cfg(feature = "extended-document")] use crate::document::ExtendedDocument; #[cfg(feature = "state-transitions")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ batched_transition::document_transition_action_type::DocumentTransitionActionType, BatchTransition, }; diff --git a/packages/rs-dpp/src/document/specialized_document_factory/v0/mod.rs b/packages/rs-dpp/src/document/specialized_document_factory/v0/mod.rs index 6e6ace91043..1163dcf1ed1 100644 --- a/packages/rs-dpp/src/document/specialized_document_factory/v0/mod.rs +++ b/packages/rs-dpp/src/document/specialized_document_factory/v0/mod.rs @@ -1,17 +1,17 @@ -use crate::consensus::basic::document::InvalidDocumentTypeError; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::data_contract::DataContract; use crate::document::errors::DocumentError; use crate::document::{Document, DocumentV0Getters, DocumentV0Setters, INITIAL_REVISION}; +use crate::errors::consensus::basic::document::InvalidDocumentTypeError; use chrono::Utc; use std::collections::BTreeMap; +use crate::errors::ProtocolError; use crate::util::entropy_generator::{DefaultEntropyGenerator, EntropyGenerator}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; use platform_value::{Bytes32, Identifier, Value}; @@ -23,7 +23,7 @@ use crate::document::{ }; use crate::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis}; #[cfg(feature = "state-transitions")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ batched_transition::{ document_transition_action_type::DocumentTransitionActionType, DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, diff --git a/packages/rs-dpp/src/document/transfer.rs b/packages/rs-dpp/src/document/transfer.rs index cf7bfd48b25..6ad7636646c 100644 --- a/packages/rs-dpp/src/document/transfer.rs +++ b/packages/rs-dpp/src/document/transfer.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::data_contract::UnknownTransferableTypeError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::data_contract::UnknownTransferableTypeError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use derive_more::Display; @@ -9,6 +9,7 @@ use derive_more::Display; #[derive(Clone, Copy, Debug, PartialEq, Default, Display)] #[repr(u8)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Transferable { #[default] Never = 0, diff --git a/packages/rs-dpp/src/document/v0/cbor_conversion.rs b/packages/rs-dpp/src/document/v0/cbor_conversion.rs index 8fe0732ea2c..f69ef8f1a0a 100644 --- a/packages/rs-dpp/src/document/v0/cbor_conversion.rs +++ b/packages/rs-dpp/src/document/v0/cbor_conversion.rs @@ -3,17 +3,17 @@ use crate::document::property_names; use crate::identity::TimestampMillis; use crate::prelude::{BlockHeight, CoreBlockHeight, Revision}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::document::serialization_traits::{ DocumentCborMethodsV0, DocumentPlatformValueMethodsV0, }; use crate::document::v0::DocumentV0; -use crate::version::PlatformVersion; use ciborium::Value as CborValue; use integer_encoding::VarIntWriter; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; use platform_value::{Identifier, Value}; +use platform_version::version::PlatformVersion; use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use std::convert::{TryFrom, TryInto}; diff --git a/packages/rs-dpp/src/document/v0/json_conversion.rs b/packages/rs-dpp/src/document/v0/json_conversion.rs index fd7d9bb8daa..ffd88df318e 100644 --- a/packages/rs-dpp/src/document/v0/json_conversion.rs +++ b/packages/rs-dpp/src/document/v0/json_conversion.rs @@ -3,19 +3,19 @@ use crate::document::serialization_traits::{ DocumentJsonMethodsV0, DocumentPlatformValueMethodsV0, }; use crate::document::DocumentV0; +use crate::errors::ProtocolError; use crate::util::json_value::JsonValueExt; -use crate::ProtocolError; use platform_value::{Identifier, Value}; use platform_version::version::PlatformVersion; use serde::Deserialize; -use serde_json::{json, Value as JsonValue}; +use serde_json::json; use std::convert::TryInto; impl DocumentJsonMethodsV0<'_> for DocumentV0 { fn to_json_with_identifiers_using_bytes( &self, _platform_version: &PlatformVersion, - ) -> Result { + ) -> Result { let mut value = json!({ property_names::ID: self.id, property_names::OWNER_ID: self.owner_id, @@ -24,53 +24,53 @@ impl DocumentJsonMethodsV0<'_> for DocumentV0 { if let Some(created_at) = self.created_at { value_mut.insert( property_names::CREATED_AT.to_string(), - JsonValue::Number(created_at.into()), + serde_json::Value::Number(created_at.into()), ); } if let Some(updated_at) = self.updated_at { value_mut.insert( property_names::UPDATED_AT.to_string(), - JsonValue::Number(updated_at.into()), + serde_json::Value::Number(updated_at.into()), ); } if let Some(created_at_block_height) = self.created_at_block_height { value_mut.insert( property_names::CREATED_AT_BLOCK_HEIGHT.to_string(), - JsonValue::Number(created_at_block_height.into()), + serde_json::Value::Number(created_at_block_height.into()), ); } if let Some(updated_at_block_height) = self.updated_at_block_height { value_mut.insert( property_names::UPDATED_AT_BLOCK_HEIGHT.to_string(), - JsonValue::Number(updated_at_block_height.into()), + serde_json::Value::Number(updated_at_block_height.into()), ); } if let Some(created_at_core_block_height) = self.created_at_core_block_height { value_mut.insert( property_names::CREATED_AT_CORE_BLOCK_HEIGHT.to_string(), - JsonValue::Number(created_at_core_block_height.into()), + serde_json::Value::Number(created_at_core_block_height.into()), ); } if let Some(updated_at_core_block_height) = self.updated_at_core_block_height { value_mut.insert( property_names::UPDATED_AT_CORE_BLOCK_HEIGHT.to_string(), - JsonValue::Number(updated_at_core_block_height.into()), + serde_json::Value::Number(updated_at_core_block_height.into()), ); } if let Some(revision) = self.revision { value_mut.insert( property_names::REVISION.to_string(), - JsonValue::Number(revision.into()), + serde_json::Value::Number(revision.into()), ); } self.properties .iter() .try_for_each(|(key, property_value)| { - let serde_value: JsonValue = property_value.try_to_validating_json()?; + let serde_value: serde_json::Value = property_value.try_to_validating_json()?; value_mut.insert(key.to_string(), serde_value); Ok::<(), ProtocolError>(()) })?; @@ -78,13 +78,16 @@ impl DocumentJsonMethodsV0<'_> for DocumentV0 { Ok(value) } - fn to_json(&self, _platform_version: &PlatformVersion) -> Result { + fn to_json( + &self, + _platform_version: &PlatformVersion, + ) -> Result { self.to_object() .map(|v| v.try_into().map_err(ProtocolError::ValueError))? } fn from_json_value( - mut document_value: JsonValue, + mut document_value: serde_json::Value, _platform_version: &PlatformVersion, ) -> Result where diff --git a/packages/rs-dpp/src/document/v0/mod.rs b/packages/rs-dpp/src/document/v0/mod.rs index c68c01a42ac..9a9724f851c 100644 --- a/packages/rs-dpp/src/document/v0/mod.rs +++ b/packages/rs-dpp/src/document/v0/mod.rs @@ -16,7 +16,7 @@ use chrono::DateTime; use std::collections::BTreeMap; use std::fmt; -use platform_value::Value; +use platform_value::{Identifier, Value}; #[cfg(feature = "document-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -27,11 +27,12 @@ use crate::document::document_methods::{ use crate::identity::TimestampMillis; use crate::prelude::Revision; -use crate::prelude::{BlockHeight, CoreBlockHeight, Identifier}; +use crate::prelude::{BlockHeight, CoreBlockHeight}; /// Documents contain the data that goes into data contracts. #[derive(Clone, Debug, PartialEq, Default)] #[cfg_attr(feature = "document-serde-conversion", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentV0 { /// The unique document ID. #[cfg_attr(feature = "document-serde-conversion", serde(rename = "$id"))] diff --git a/packages/rs-dpp/src/document/v0/platform_value_conversion.rs b/packages/rs-dpp/src/document/v0/platform_value_conversion.rs index a3d42b775a7..ec76cce0420 100644 --- a/packages/rs-dpp/src/document/v0/platform_value_conversion.rs +++ b/packages/rs-dpp/src/document/v0/platform_value_conversion.rs @@ -1,8 +1,8 @@ use crate::document::serialization_traits::DocumentPlatformValueMethodsV0; use crate::document::DocumentV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl DocumentPlatformValueMethodsV0<'_> for DocumentV0 { diff --git a/packages/rs-dpp/src/document/v0/serialize.rs b/packages/rs-dpp/src/document/v0/serialize.rs index ce4792af538..7f325c40cbe 100644 --- a/packages/rs-dpp/src/document/v0/serialize.rs +++ b/packages/rs-dpp/src/document/v0/serialize.rs @@ -1,5 +1,6 @@ +use crate::data_contract::DataContract; use crate::data_contract::document_type::{DocumentPropertyType, DocumentTypeRef}; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use crate::document::property_names::{ CREATED_AT, CREATED_AT_BLOCK_HEIGHT, CREATED_AT_CORE_BLOCK_HEIGHT, PRICE, TRANSFERRED_AT, @@ -10,9 +11,9 @@ use crate::document::property_names::{ #[cfg(feature = "validation")] use crate::prelude::ConsensusValidationResult; -use crate::prelude::{DataContract, Revision}; +use crate::prelude::Revision; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::methods::DocumentTypeBasicMethods; @@ -20,20 +21,20 @@ use crate::document::serialization_traits::deserialize::v0::DocumentPlatformDese use crate::document::serialization_traits::serialize::v0::DocumentPlatformSerializationMethodsV0; use crate::document::serialization_traits::DocumentPlatformConversionMethodsV0; use crate::document::v0::DocumentV0; -use crate::version::PlatformVersion; use byteorder::{BigEndian, ReadBytesExt}; use integer_encoding::{VarInt, VarIntReader}; +use platform_version::version::PlatformVersion; use platform_value::{Identifier, Value}; -use platform_version::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; use std::collections::BTreeMap; -use crate::consensus::basic::decode::DecodingError; +use crate::errors::consensus::basic::decode::DecodingError; #[cfg(feature = "validation")] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; #[cfg(feature = "validation")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::config::DataContractConfig; use std::io::{BufReader, Read}; diff --git a/packages/rs-dpp/src/errors/compatible_protocol_version_is_not_defined_error.rs b/packages/rs-dpp/src/errors/compatible_protocol_version_is_not_defined_error.rs index 8bd39c19c78..838319128c0 100644 --- a/packages/rs-dpp/src/errors/compatible_protocol_version_is_not_defined_error.rs +++ b/packages/rs-dpp/src/errors/compatible_protocol_version_is_not_defined_error.rs @@ -2,8 +2,9 @@ use thiserror::Error; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Compatible version is not defined for protocol version {current_protocol_version}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct CompatibleProtocolVersionIsNotDefinedError { - current_protocol_version: u32, + pub current_protocol_version: u32, } impl CompatibleProtocolVersionIsNotDefinedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/basic_error.rs b/packages/rs-dpp/src/errors/consensus/basic/basic_error.rs index e2c339ce649..2d0bbd30bb7 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/basic_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/basic_error.rs @@ -2,9 +2,9 @@ use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; - -use crate::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; -use crate::consensus::basic::data_contract::{ +use crate::data_contract::errors::DataContractError; +use crate::errors::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; +use crate::errors::consensus::basic::data_contract::{ ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractHaveNewUniqueIndexError, DataContractImmutablePropertiesUpdateError, DataContractInvalidIndexDefinitionUpdateError, DataContractTokenConfigurationUpdateError, @@ -29,14 +29,14 @@ use crate::consensus::basic::data_contract::{ UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError, }; -use crate::consensus::basic::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ InvalidJsonSchemaRefError, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, UnknownDocumentActionTokenEffectError, }; -use crate::consensus::basic::decode::{ +use crate::errors::consensus::basic::decode::{ ProtocolVersionParsingError, SerializedObjectParsingError, VersionError, }; -use crate::consensus::basic::document::{ +use crate::errors::consensus::basic::document::{ ContestedDocumentsTemporarilyNotAllowedError, DataContractNotPresentError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, DocumentTransitionsAreAbsentError, DuplicateDocumentTransitionsWithIdsError, @@ -47,8 +47,8 @@ use crate::consensus::basic::document::{ MissingDocumentTransitionTypeError, MissingDocumentTypeError, MissingPositionsInDocumentTypePropertiesError, NonceOutOfBoundsError, }; -use crate::consensus::basic::identity::{ - DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, +use crate::errors::consensus::basic::identity::{ + DataContractBoundsNotPresentError, DuplicatedIdentityPublicKeyBasicError, DuplicatedIdentityPublicKeyIdBasicError, IdentityAssetLockProofLockedTransactionMismatchError, IdentityAssetLockStateTransitionReplayError, IdentityAssetLockTransactionIsNotFoundError, @@ -68,40 +68,41 @@ use crate::consensus::basic::identity::{ MissingMasterPublicKeyError, NotImplementedIdentityCreditWithdrawalTransitionPoolingError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError, }; -use crate::consensus::basic::invalid_identifier_error::InvalidIdentifierError; -use crate::consensus::basic::state_transition::{ +use crate::errors::consensus::basic::identity::disabling_key_id_also_being_added_in_same_transition_error::DisablingKeyIdAlsoBeingAddedInSameTransitionError; +use crate::errors::consensus::basic::invalid_identifier_error::InvalidIdentifierError; +use crate::errors::consensus::basic::state_transition::{ InvalidStateTransitionTypeError, MissingStateTransitionTypeError, StateTransitionMaxSizeExceededError, }; -use crate::consensus::basic::{ +use crate::errors::consensus::basic::{ IncompatibleProtocolVersionError, UnsupportedFeatureError, UnsupportedProtocolVersionError, }; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; -use super::data_contract::{ +use crate::errors::consensus::basic::data_contract::{ DuplicateKeywordsError, InvalidDescriptionLengthError, InvalidKeywordLengthError, TooManyKeywordsError, }; -use crate::consensus::basic::group::GroupActionNotAllowedOnTransitionError; -use crate::consensus::basic::overflow_error::OverflowError; -use crate::consensus::basic::token::{ +use crate::errors::consensus::basic::group::GroupActionNotAllowedOnTransitionError; +use crate::errors::consensus::basic::overflow_error::OverflowError; +use crate::errors::consensus::basic::token::{ ChoosingTokenMintRecipientNotAllowedError, ContractHasNoTokensError, DestinationIdentityForTokenMintingNotSetError, InvalidActionIdError, InvalidTokenAmountError, InvalidTokenConfigUpdateNoChangeError, InvalidTokenIdError, InvalidTokenNoteTooBigError, InvalidTokenPositionError, MissingDefaultLocalizationError, TokenNoteOnlyAllowedWhenProposerError, TokenTransferToOurselfError, }; -use crate::consensus::basic::unsupported_version_error::UnsupportedVersionError; -use crate::consensus::basic::value_error::ValueError; -use crate::consensus::basic::{ +use crate::errors::consensus::basic::unsupported_version_error::UnsupportedVersionError; +use crate::errors::consensus::basic::value_error::ValueError; +use crate::errors::consensus::basic::{ json_schema_compilation_error::JsonSchemaCompilationError, json_schema_error::JsonSchemaError, }; -use crate::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; -use crate::data_contract::errors::DataContractError; +use crate::errors::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; #[derive( Error, Debug, PlatformSerialize, PlatformDeserialize, Encode, Decode, PartialEq, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum BasicError { /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_on_mutable_document_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_on_mutable_document_type_error.rs index def757d547f..411240a0a67 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_on_mutable_document_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_on_mutable_document_type_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,14 +12,15 @@ use thiserror::Error; "Document type '{document_type}' has a contested unique index '{contested_unique_index_name}' but is set as mutable which is not allowed" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedUniqueIndexOnMutableDocumentTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - contested_unique_index_name: String, + pub document_type: String, + pub contested_unique_index_name: String, } impl ContestedUniqueIndexOnMutableDocumentTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_with_unique_index_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_with_unique_index_error.rs index cfaa8b9fe12..cd77df1f94b 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_with_unique_index_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/contested_unique_index_with_unique_index_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,15 +12,16 @@ use thiserror::Error; "Document type '{document_type}' has a contested unique index '{contested_unique_index_name}' and a unique index '{unique_index_name}' as well which is not allowed" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedUniqueIndexWithUniqueIndexError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - contested_unique_index_name: String, - unique_index_name: String, + pub document_type: String, + pub contested_unique_index_name: String, + pub unique_index_name: String, } impl ContestedUniqueIndexWithUniqueIndexError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs index e97ccb2f0a0..073f3a48823 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Document with type {document_type} has a new unique index named '{index_name}'. Adding unique indices during Data Contract update is not allowed.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractHaveNewUniqueIndexError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, + pub document_type: String, + pub index_name: String, } impl DataContractHaveNewUniqueIndexError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs index 2eeebfb0ce0..8e6fc042581 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Value; @@ -12,16 +12,17 @@ use bincode::{Decode, Encode}; )] #[error("only $defs, version and documents fields are allowed to be updated. Forbidden operation '{operation}' on '{field_path}'")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractImmutablePropertiesUpdateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - operation: String, - field_path: String, - old_value: Value, - new_value: Value, + pub operation: String, + pub field_path: String, + pub old_value: Value, + pub new_value: Value, } impl DataContractImmutablePropertiesUpdateError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs index 52f4633e2ad..a89c9a8cb7c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Document with type {document_type} could not add or remove '{index_path}' during data contract update as we do not allow modifications of data contract index paths")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractInvalidIndexDefinitionUpdateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_path: String, + pub document_type: String, + pub index_path: String, } impl DataContractInvalidIndexDefinitionUpdateError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs index dd539edc469..2cae99af3cf 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("JSON Schema depth is greater than {max_depth:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractMaxDepthExceedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - max_depth: usize, + pub max_depth: usize, } impl DataContractMaxDepthExceedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_token_configuration_update_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_token_configuration_update_error.rs index a367fb8ad20..fb926075374 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_token_configuration_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_token_configuration_update_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -12,16 +12,17 @@ use bincode::{Decode, Encode}; )] #[error("Forbidden operation '{operation}' on '{field_path}', old config is {old_config}, new config is {new_config}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractTokenConfigurationUpdateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - operation: String, - field_path: String, - old_config: TokenConfiguration, - new_config: TokenConfiguration, + pub operation: String, + pub field_path: String, + pub old_config: TokenConfiguration, + pub new_config: TokenConfiguration, } impl DataContractTokenConfigurationUpdateError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs index 31150163eb8..6ab492565e3 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Document with type {document_type} has updated unique index named '{index_name}'. Change of unique indices is not allowed")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractUniqueIndicesChangedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, + pub document_type: String, + pub index_name: String, } impl DataContractUniqueIndicesChangedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs index 1492ee2ebe4..22c66c0b398 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs @@ -1,12 +1,12 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::ConsensusError; +use platform_value::Identifier; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; use bincode::{Decode, Encode}; #[derive( @@ -14,8 +14,9 @@ use bincode::{Decode, Encode}; )] #[error("Data Contract {data_contract_id} must have at least one document type or token defined.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTypesAreMissingError { - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DocumentTypesAreMissingError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_error.rs index 7d56cf7876a..3eb6cd2ba64 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Duplicate '{index_name}' index definition for '{document_type}' document")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateIndexError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, + pub document_type: String, + pub index_name: String, } impl DuplicateIndexError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs index cbafd8e8e6b..0e3c9f7f363 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use bincode::{Decode, Encode}; )] #[error("Duplicate index name '{duplicate_index_name}' defined in '{document_type}' document")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateIndexNameError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - duplicate_index_name: String, + pub document_type: String, + pub duplicate_index_name: String, } impl DuplicateIndexNameError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_keywords_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_keywords_error.rs index c84d918cf36..a2c7513b1b9 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_keywords_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/duplicate_keywords_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Data contract {data_contract_id} has duplicated keyword '{keyword}'.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateKeywordsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - keyword: String, + pub data_contract_id: Identifier, + pub keyword: String, } impl DuplicateKeywordsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_exceeds_max_members_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_exceeds_max_members_error.rs index adc124655ad..cafcbb157af 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_exceeds_max_members_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_exceeds_max_members_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,8 +10,9 @@ use thiserror::Error; )] #[error("Group exceeds the maximum allowed number of members: {max_members}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupExceedsMaxMembersError { - max_members: u32, + pub max_members: u32, } impl GroupExceedsMaxMembersError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_of_zero_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_of_zero_error.rs index 4d3b9c37d8f..909d3a85bcc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_of_zero_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_of_zero_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identifier::Identifier; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; #[derive( @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Member {member_id} has a power of 0, which is not allowed")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupMemberHasPowerOfZeroError { - member_id: Identifier, + pub member_id: Identifier, } impl GroupMemberHasPowerOfZeroError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_over_limit_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_over_limit_error.rs index 40bbd70a607..1b1697a4c25 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_over_limit_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_member_has_power_over_limit_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::group::GroupMemberPower; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identifier::Identifier; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; #[derive( @@ -14,10 +14,11 @@ use thiserror::Error; "Member {member_id} has a power of {power}, which exceeds the allowed limit of {max_power}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupMemberHasPowerOverLimitError { - member_id: Identifier, - power: GroupMemberPower, - max_power: GroupMemberPower, + pub member_id: Identifier, + pub power: GroupMemberPower, + pub max_power: GroupMemberPower, } impl GroupMemberHasPowerOverLimitError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_non_unilateral_member_power_has_less_than_required_power_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_non_unilateral_member_power_has_less_than_required_power_error.rs index 7d8632fc533..835b0e0a3c1 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_non_unilateral_member_power_has_less_than_required_power_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_non_unilateral_member_power_has_less_than_required_power_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::group::GroupMemberPower; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,9 +11,10 @@ use thiserror::Error; )] #[error("The collective power of non-unilateral members {total_power} is less than the required power {required_power}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError { - total_power: GroupMemberPower, - required_power: GroupMemberPower, + pub total_power: GroupMemberPower, + pub required_power: GroupMemberPower, } impl GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_position_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_position_does_not_exist_error.rs index 7f525489363..766b2424f57 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_position_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_position_does_not_exist_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,8 +12,9 @@ use thiserror::Error; )] #[error("Group position {} does not exist", missing_group_position)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupPositionDoesNotExistError { - missing_group_position: GroupContractPosition, + pub missing_group_position: GroupContractPosition, } impl GroupPositionDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_required_power_is_invalid_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_required_power_is_invalid_error.rs index b36462efd56..7644fc49597 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_required_power_is_invalid_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_required_power_is_invalid_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::group::GroupRequiredPower; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; @@ -11,9 +11,10 @@ use thiserror::Error; )] #[platform_serialize(unversioned)] #[error("The required group power {required_power} is invalid. It must be > 0 and <= {max_power}.")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupRequiredPowerIsInvalidError { - required_power: GroupRequiredPower, - max_power: GroupRequiredPower, + pub required_power: GroupRequiredPower, + pub max_power: GroupRequiredPower, } impl GroupRequiredPowerIsInvalidError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_total_power_has_less_than_required_power_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_total_power_has_less_than_required_power_error.rs index 6559f20e5c0..f6ba678b443 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_total_power_has_less_than_required_power_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/group_total_power_has_less_than_required_power_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::group::GroupMemberPower; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,9 +11,10 @@ use thiserror::Error; )] #[error("Group total power {total_power} is less than the required power {required_power}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupTotalPowerLessThanRequiredError { - total_power: GroupMemberPower, - required_power: GroupMemberPower, + pub total_power: GroupMemberPower, + pub required_power: GroupMemberPower, } impl GroupTotalPowerLessThanRequiredError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs index 9a75c009495..0d38dfba52f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs @@ -1,12 +1,12 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; +use platform_value::Identifier; #[derive( Error, Debug, Clone, PartialEq, Encode, Decode, PlatformSerialize, PlatformDeserialize, @@ -14,10 +14,11 @@ use bincode::{Decode, Encode}; #[error("Data Contract updated schema is not backward compatible with one defined in Data Contract with id {data_contract_id}. Field: '{field_path}', Operation: '{operation}'" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IncompatibleDataContractSchemaError { - data_contract_id: Identifier, - operation: String, - field_path: String, + pub data_contract_id: Identifier, + pub operation: String, + pub field_path: String, } impl IncompatibleDataContractSchemaError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs index 2dd41eb12e4..8e591289a60 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -13,10 +13,11 @@ use bincode::{Decode, Encode}; #[error("Updated document type '{document_type_name}' schema is not backward compatible with previous version. Incompatible change '{operation}' of property '{property_path}'" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IncompatibleDocumentTypeSchemaError { - document_type_name: String, - operation: String, - property_path: String, + pub document_type_name: String, + pub operation: String, + pub property_path: String, } impl IncompatibleDocumentTypeSchemaError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs index 37573de69f8..ab589e34d25 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,15 +12,16 @@ use bincode::{Decode, Encode}; )] #[error("Pattern '{pattern}' at '{path}' is not not compatible with Re2: {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IncompatibleRe2PatternError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pattern: String, - path: String, - message: String, + pub pattern: String, + pub path: String, + pub message: String, } impl IncompatibleRe2PatternError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_compound_index_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_compound_index_error.rs index 663a961e75a..70e881cbdcc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_compound_index_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_compound_index_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use bincode::{Decode, Encode}; )] #[error("All or none of unique compound properties must be set for '{index_name}' index of '{document_type}' document")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidCompoundIndexError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, + pub document_type: String, + pub index_name: String, } impl InvalidCompoundIndexError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs index bf98afb6836..7cc54f5e84c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Data Contract Id must be {}, got {}", bs58::encode(expected_id).into_string(), bs58::encode(invalid_id).into_string())] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDataContractIdError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - expected_id: Vec, - invalid_id: Vec, + pub expected_id: Vec, + pub invalid_id: Vec, } impl InvalidDataContractIdError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs index 02fde1a679c..9f3e528376e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Data Contract version must be {expected_version}, got {version}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDataContractVersionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - expected_version: u32, - version: u32, + pub expected_version: u32, + pub version: u32, } impl InvalidDataContractVersionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_description_length_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_description_length_error.rs index 5554da1ac4e..e127379df5d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_description_length_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_description_length_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Data contract {} has description with invalid length: '{}'. Valid length is between 3 and 100 characters.", data_contract_id, description.len())] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDescriptionLengthError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - description: String, + pub data_contract_id: Identifier, + pub description: String, } impl InvalidDescriptionLengthError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs index 8b9a8bf1c76..c500927a906 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("document type name '{name}' is not supported. It must be from 1 to 64 alphanumeric chars, and '_' or '-'.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTypeNameError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - name: String, + pub name: String, } impl InvalidDocumentTypeNameError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_required_security_level.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_required_security_level.rs index dae65b27284..a3e1058743c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_required_security_level.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_required_security_level.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::SecurityLevel; use bincode::{Decode, Encode}; use platform_value::Identifier; @@ -14,15 +14,16 @@ use platform_value::Identifier; )] #[error("Invalid document type security level error security level: got {security_level:?} for {contract_id}::{document_type_name}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTypeRequiredSecurityLevelError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - security_level: SecurityLevel, - contract_id: Identifier, - document_type_name: String, + pub security_level: SecurityLevel, + pub contract_id: Identifier, + pub document_type_name: String, } impl InvalidDocumentTypeRequiredSecurityLevelError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_index_property_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_index_property_type_error.rs index 49a531680d3..0a4e7af54bc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_index_property_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_index_property_type_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,16 +12,17 @@ use bincode::{Decode, Encode}; )] #[error("'{property_name}' property of '{document_type}' document has an invalid type '{property_type}' and cannot be use as an index")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIndexPropertyTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, - property_name: String, - property_type: String, + pub document_type: String, + pub index_name: String, + pub property_name: String, + pub property_type: String, } impl InvalidIndexPropertyTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_indexed_property_constraint_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_indexed_property_constraint_error.rs index e73ea6e26c3..e6175c4bf45 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_indexed_property_constraint_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_indexed_property_constraint_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,17 +12,18 @@ use bincode::{Decode, Encode}; )] #[error("Indexed property '{property_name}' for '{document_type}' document has an invalid constraint '{constraint_name}', reason: '{reason}'")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIndexedPropertyConstraintError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, - property_name: String, - constraint_name: String, - reason: String, + pub document_type: String, + pub index_name: String, + pub property_name: String, + pub constraint_name: String, + pub reason: String, } impl InvalidIndexedPropertyConstraintError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs index 0b30d024486..74ca7710f1b 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,13 +12,14 @@ use bincode::{Decode, Encode}; )] #[error("Invalid JSON Schema $ref: {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidJsonSchemaRefError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - message: String, + pub message: String, } impl InvalidJsonSchemaRefError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_character_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_character_error.rs index 48e02d3431c..a797d53dbcb 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_character_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_character_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Data contract {data_contract_id} has a keyword with invalid characters. Keywords must not contain whitespace or control characters.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidKeywordCharacterError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - keyword: String, + pub data_contract_id: Identifier, + pub keyword: String, } impl InvalidKeywordCharacterError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_length_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_length_error.rs index 40988ef52ce..4c5bb5b799c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_length_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_keyword_length_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Data contract {data_contract_id} has keyword with invalid length: '{keyword}'. Valid length is between 3 and 50 characters.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidKeywordLengthError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - keyword: String, + pub data_contract_id: Identifier, + pub keyword: String, } impl InvalidKeywordLengthError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_base_supply_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_base_supply_error.rs index 738be8b2223..2534a6c74a2 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_base_supply_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_base_supply_error.rs @@ -1,10 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; - use bincode::{Decode, Encode}; #[derive( Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, @@ -15,13 +14,14 @@ use bincode::{Decode, Encode}; i64::MAX )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenBaseSupplyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - base_supply: u64, + pub base_supply: u64, } impl InvalidTokenBaseSupplyError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_divide_by_zero_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_divide_by_zero_error.rs index 0d61950a806..8a50a08b8ec 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_divide_by_zero_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_divide_by_zero_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::DistributionFunction; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -16,13 +16,14 @@ use bincode::{Decode, Encode}; distribution_function )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenDistributionFunctionDivideByZeroError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - distribution_function: DistributionFunction, + pub distribution_function: DistributionFunction, } impl InvalidTokenDistributionFunctionDivideByZeroError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_incoherence_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_incoherence_error.rs index 3224b76e8df..033bfa536a7 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_incoherence_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_incoherence_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,13 +12,14 @@ use bincode::{Decode, Encode}; )] #[error("Incoherent parameters in token distribution function: {}", message)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenDistributionFunctionIncoherenceError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - message: String, + pub message: String, } impl InvalidTokenDistributionFunctionIncoherenceError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_error.rs index 22d269abe16..a207bfbb20c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -22,16 +22,17 @@ use bincode::{Decode, Encode}; } )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenDistributionFunctionInvalidParameterError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - parameter: String, - min: i64, - max: i64, - not_valid: Option, + pub parameter: String, + pub min: i64, + pub max: i64, + pub not_valid: Option, } impl InvalidTokenDistributionFunctionInvalidParameterError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_tuple_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_tuple_error.rs index 39d0d444a0c..d1acfe59107 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_tuple_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_distribution_function_invalid_parameter_tuple_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -17,15 +17,16 @@ use bincode::{Decode, Encode}; second_parameter )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenDistributionFunctionInvalidParameterTupleError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - first_parameter: String, - second_parameter: String, - relation: String, // "greater than" or "smaller than" + pub first_parameter: String, + pub second_parameter: String, + pub relation: String, // "greater than" or "smaller than" } impl InvalidTokenDistributionFunctionInvalidParameterTupleError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_language_code_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_language_code_error.rs index a5a6d0d03c9..d3316f639d7 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_language_code_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_language_code_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,11 +10,12 @@ use thiserror::Error; )] #[error("Invalid token language code: '{language_code}'")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenLanguageCodeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - language_code: String, + pub language_code: String, } impl InvalidTokenLanguageCodeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_character_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_character_error.rs index a15763539d1..eeaa52cad8d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_character_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_character_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Data contract has a token name {token_name} in {form} with invalid characters. Token names must not contain whitespace or control characters.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenNameCharacterError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - form: String, - token_name: String, + pub form: String, + pub token_name: String, } impl InvalidTokenNameCharacterError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_length_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_length_error.rs index 333ec475fd0..f0122097a79 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_length_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/invalid_token_name_length_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,16 +10,17 @@ use thiserror::Error; )] #[error("Token {form} length was {actual}, but must be between {min} and {max} characters.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenNameLengthError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - actual: usize, - min: usize, - max: usize, - form: String, + pub actual: usize, + pub min: usize, + pub max: usize, + pub form: String, } impl InvalidTokenNameLengthError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/keywords_over_limit.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/keywords_over_limit.rs index 9a0b6b20481..8a7b383e72b 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/keywords_over_limit.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/keywords_over_limit.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -13,14 +13,15 @@ use thiserror::Error; "Data contract {data_contract_id} has too many keywords: '{keywords_len}'. The maximum is 50." )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TooManyKeywordsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - keywords_len: u8, + pub data_contract_id: Identifier, + pub keywords_len: u8, } impl TooManyKeywordsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/main_group_is_not_defined.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/main_group_is_not_defined.rs index 83fc8bd3c7f..46a22247ee0 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/main_group_is_not_defined.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/main_group_is_not_defined.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,6 +10,7 @@ use thiserror::Error; )] #[error("Main group is not defined.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MainGroupIsNotDefinedError; impl Default for MainGroupIsNotDefinedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs index b9348da8bc3..e3bdcc9de8c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs @@ -1,120 +1,118 @@ -mod contested_unique_index_on_mutable_document_type_error; -mod contested_unique_index_with_unique_index_error; -mod data_contract_have_new_unique_index_error; -mod data_contract_immutable_properties_update_error; -mod data_contract_invalid_index_definition_update_error; +pub mod contested_unique_index_on_mutable_document_type_error; +pub mod contested_unique_index_with_unique_index_error; +pub mod data_contract_have_new_unique_index_error; +pub mod data_contract_immutable_properties_update_error; +pub mod data_contract_invalid_index_definition_update_error; pub mod data_contract_max_depth_exceed_error; -mod data_contract_token_configuration_update_error; -mod data_contract_unique_indices_changed_error; -mod document_types_are_missing_error; -mod duplicate_index_error; -mod duplicate_index_name_error; -mod duplicate_keywords_error; -mod group_exceeds_max_members_error; -mod group_member_has_power_of_zero_error; -mod group_member_has_power_over_limit_error; -mod group_non_unilateral_member_power_has_less_than_required_power_error; -mod group_position_does_not_exist_error; -mod group_required_power_is_invalid_error; -mod group_total_power_has_less_than_required_power_error; -mod incompatible_data_contract_schema_error; -mod incompatible_document_type_schema_error; -mod incompatible_re2_pattern_error; -mod invalid_compound_index_error; -mod invalid_data_contract_id_error; -mod invalid_data_contract_version_error; -mod invalid_description_length_error; -mod invalid_document_type_name_error; -mod invalid_document_type_required_security_level; -mod invalid_index_property_type_error; -mod invalid_indexed_property_constraint_error; -mod invalid_json_schema_ref_error; -mod invalid_keyword_character_error; -mod invalid_keyword_length_error; -mod invalid_token_base_supply_error; -mod invalid_token_distribution_function_divide_by_zero_error; -mod invalid_token_distribution_function_incoherence_error; -mod invalid_token_distribution_function_invalid_parameter_error; -mod invalid_token_distribution_function_invalid_parameter_tuple_error; -mod invalid_token_language_code_error; -mod invalid_token_name_character_error; -mod invalid_token_name_length_error; -mod keywords_over_limit; -mod main_group_is_not_defined; -mod new_tokens_destination_identity_option_required_error; -mod non_contiguous_contract_group_positions_error; -mod non_contiguous_contract_token_positions_error; -mod redundant_document_paid_for_by_token_with_contract_id; -mod system_property_index_already_present_error; -mod token_decimals_over_limit_error; -mod token_payment_by_burning_only_allowed_on_internal_token_error; -mod undefined_index_property_error; -mod unique_indices_limit_reached_error; -mod unknown_document_action_token_effect_error; -mod unknown_document_creation_restriction_mode_error; -mod unknown_gas_fees_paid_by_error; -mod unknown_security_level_error; -mod unknown_storage_key_requirements_error; -mod unknown_trade_mode_error; -mod unknown_transferable_type_error; +pub mod data_contract_token_configuration_update_error; +pub mod data_contract_unique_indices_changed_error; +pub mod document_types_are_missing_error; +pub mod duplicate_index_error; +pub mod duplicate_index_name_error; +pub mod duplicate_keywords_error; +pub mod group_exceeds_max_members_error; +pub mod group_member_has_power_of_zero_error; +pub mod group_member_has_power_over_limit_error; +pub mod group_non_unilateral_member_power_has_less_than_required_power_error; +pub mod group_position_does_not_exist_error; +pub mod group_required_power_is_invalid_error; +pub mod group_total_power_has_less_than_required_power_error; +pub mod incompatible_data_contract_schema_error; +pub mod incompatible_document_type_schema_error; +pub mod incompatible_re2_pattern_error; +pub mod invalid_compound_index_error; +pub mod invalid_data_contract_id_error; +pub mod invalid_data_contract_version_error; +pub mod invalid_description_length_error; +pub mod invalid_document_type_name_error; +pub mod invalid_document_type_required_security_level; +pub mod invalid_index_property_type_error; +pub mod invalid_indexed_property_constraint_error; +pub mod invalid_json_schema_ref_error; +pub mod invalid_keyword_character_error; +pub mod invalid_keyword_length_error; +pub mod invalid_token_base_supply_error; +pub mod invalid_token_distribution_function_divide_by_zero_error; +pub mod invalid_token_distribution_function_incoherence_error; +pub mod invalid_token_distribution_function_invalid_parameter_error; +pub mod invalid_token_distribution_function_invalid_parameter_tuple_error; +pub mod invalid_token_language_code_error; +pub mod invalid_token_name_character_error; +pub mod invalid_token_name_length_error; +pub mod keywords_over_limit; +pub mod main_group_is_not_defined; +pub mod new_tokens_destination_identity_option_required_error; +pub mod non_contiguous_contract_group_positions_error; +pub mod non_contiguous_contract_token_positions_error; +pub mod redundant_document_paid_for_by_token_with_contract_id; +pub mod system_property_index_already_present_error; +pub mod token_decimals_over_limit_error; +pub mod token_payment_by_burning_only_allowed_on_internal_token_error; +pub mod undefined_index_property_error; +pub mod unique_indices_limit_reached_error; +pub mod unknown_document_action_token_effect_error; +pub mod unknown_document_creation_restriction_mode_error; +pub mod unknown_gas_fees_paid_by_error; +pub mod unknown_security_level_error; +pub mod unknown_storage_key_requirements_error; +pub mod unknown_trade_mode_error; +pub mod unknown_transferable_type_error; -pub use data_contract_have_new_unique_index_error::*; -pub use data_contract_immutable_properties_update_error::*; -pub use data_contract_invalid_index_definition_update_error::*; -pub use data_contract_token_configuration_update_error::*; -pub use data_contract_unique_indices_changed_error::*; -pub use document_types_are_missing_error::*; -pub use duplicate_index_error::*; -pub use duplicate_index_name_error::*; -pub use incompatible_data_contract_schema_error::*; -pub use incompatible_re2_pattern_error::*; -pub use invalid_compound_index_error::*; -pub use invalid_data_contract_id_error::*; -pub use invalid_data_contract_version_error::*; -pub use invalid_document_type_required_security_level::*; -pub use invalid_index_property_type_error::*; -pub use invalid_indexed_property_constraint_error::*; -pub use invalid_json_schema_ref_error::*; - -pub use system_property_index_already_present_error::*; -pub use undefined_index_property_error::*; -pub use unique_indices_limit_reached_error::*; - -pub use contested_unique_index_on_mutable_document_type_error::*; -pub use contested_unique_index_with_unique_index_error::*; -pub use duplicate_keywords_error::*; -pub use group_exceeds_max_members_error::*; -pub use group_member_has_power_of_zero_error::*; -pub use group_member_has_power_over_limit_error::*; -pub use group_non_unilateral_member_power_has_less_than_required_power_error::*; -pub use group_position_does_not_exist_error::*; -pub use group_required_power_is_invalid_error::*; -pub use group_total_power_has_less_than_required_power_error::*; -pub use incompatible_document_type_schema_error::*; -pub use invalid_description_length_error::*; -pub use invalid_document_type_name_error::*; -pub use invalid_keyword_character_error::*; -pub use invalid_keyword_length_error::*; -pub use invalid_token_base_supply_error::*; -pub use invalid_token_distribution_function_divide_by_zero_error::*; -pub use invalid_token_distribution_function_incoherence_error::*; -pub use invalid_token_distribution_function_invalid_parameter_error::*; -pub use invalid_token_distribution_function_invalid_parameter_tuple_error::*; -pub use invalid_token_language_code_error::*; -pub use invalid_token_name_character_error::*; -pub use invalid_token_name_length_error::*; -pub use keywords_over_limit::*; -pub use main_group_is_not_defined::*; -pub use new_tokens_destination_identity_option_required_error::*; -pub use non_contiguous_contract_group_positions_error::*; -pub use non_contiguous_contract_token_positions_error::*; -pub use redundant_document_paid_for_by_token_with_contract_id::*; -pub use token_decimals_over_limit_error::*; -pub use token_payment_by_burning_only_allowed_on_internal_token_error::*; -pub use unknown_document_action_token_effect_error::*; -pub use unknown_document_creation_restriction_mode_error::*; -pub use unknown_gas_fees_paid_by_error::*; -pub use unknown_security_level_error::*; -pub use unknown_storage_key_requirements_error::*; -pub use unknown_trade_mode_error::*; -pub use unknown_transferable_type_error::*; +pub use data_contract_have_new_unique_index_error::DataContractHaveNewUniqueIndexError; +pub use data_contract_immutable_properties_update_error::DataContractImmutablePropertiesUpdateError; +pub use data_contract_invalid_index_definition_update_error::DataContractInvalidIndexDefinitionUpdateError; +pub use data_contract_token_configuration_update_error::DataContractTokenConfigurationUpdateError; +pub use data_contract_unique_indices_changed_error::DataContractUniqueIndicesChangedError; +pub use document_types_are_missing_error::DocumentTypesAreMissingError; +pub use duplicate_index_error::DuplicateIndexError; +pub use duplicate_index_name_error::DuplicateIndexNameError; +pub use incompatible_data_contract_schema_error::IncompatibleDataContractSchemaError; +pub use incompatible_re2_pattern_error::IncompatibleRe2PatternError; +pub use invalid_compound_index_error::InvalidCompoundIndexError; +pub use invalid_data_contract_id_error::InvalidDataContractIdError; +pub use invalid_data_contract_version_error::InvalidDataContractVersionError; +pub use invalid_document_type_required_security_level::InvalidDocumentTypeRequiredSecurityLevelError; +pub use invalid_index_property_type_error::InvalidIndexPropertyTypeError; +pub use invalid_indexed_property_constraint_error::InvalidIndexedPropertyConstraintError; +pub use invalid_json_schema_ref_error::InvalidJsonSchemaRefError; +pub use system_property_index_already_present_error::SystemPropertyIndexAlreadyPresentError; +pub use undefined_index_property_error::UndefinedIndexPropertyError; +pub use unique_indices_limit_reached_error::UniqueIndicesLimitReachedError; +pub use contested_unique_index_on_mutable_document_type_error::ContestedUniqueIndexOnMutableDocumentTypeError; +pub use contested_unique_index_with_unique_index_error::ContestedUniqueIndexWithUniqueIndexError; +pub use duplicate_keywords_error::DuplicateKeywordsError; +pub use group_exceeds_max_members_error::GroupExceedsMaxMembersError; +pub use group_member_has_power_of_zero_error::GroupMemberHasPowerOfZeroError; +pub use group_member_has_power_over_limit_error::GroupMemberHasPowerOverLimitError; +pub use group_non_unilateral_member_power_has_less_than_required_power_error::GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError; +pub use group_position_does_not_exist_error::GroupPositionDoesNotExistError; +pub use group_required_power_is_invalid_error::GroupRequiredPowerIsInvalidError; +pub use group_total_power_has_less_than_required_power_error::GroupTotalPowerLessThanRequiredError; +pub use incompatible_document_type_schema_error::IncompatibleDocumentTypeSchemaError; +pub use invalid_description_length_error::InvalidDescriptionLengthError; +pub use invalid_document_type_name_error::InvalidDocumentTypeNameError; +pub use invalid_keyword_character_error::InvalidKeywordCharacterError; +pub use invalid_keyword_length_error::InvalidKeywordLengthError; +pub use invalid_token_base_supply_error::InvalidTokenBaseSupplyError; +pub use invalid_token_distribution_function_divide_by_zero_error::InvalidTokenDistributionFunctionDivideByZeroError; +pub use invalid_token_distribution_function_incoherence_error::InvalidTokenDistributionFunctionIncoherenceError; +pub use invalid_token_distribution_function_invalid_parameter_error::InvalidTokenDistributionFunctionInvalidParameterError; +pub use invalid_token_distribution_function_invalid_parameter_tuple_error::InvalidTokenDistributionFunctionInvalidParameterTupleError; +pub use invalid_token_language_code_error::InvalidTokenLanguageCodeError; +pub use invalid_token_name_character_error::InvalidTokenNameCharacterError; +pub use invalid_token_name_length_error::InvalidTokenNameLengthError; +pub use keywords_over_limit::TooManyKeywordsError; +pub use main_group_is_not_defined::MainGroupIsNotDefinedError; +pub use new_tokens_destination_identity_option_required_error::NewTokensDestinationIdentityOptionRequiredError; +pub use non_contiguous_contract_group_positions_error::NonContiguousContractGroupPositionsError; +pub use non_contiguous_contract_token_positions_error::NonContiguousContractTokenPositionsError; +pub use redundant_document_paid_for_by_token_with_contract_id::RedundantDocumentPaidForByTokenWithContractId; +pub use token_decimals_over_limit_error::DecimalsOverLimitError; +pub use token_payment_by_burning_only_allowed_on_internal_token_error::TokenPaymentByBurningOnlyAllowedOnInternalTokenError; +pub use unknown_document_action_token_effect_error::UnknownDocumentActionTokenEffectError; +pub use unknown_document_creation_restriction_mode_error::UnknownDocumentCreationRestrictionModeError; +pub use unknown_gas_fees_paid_by_error::UnknownGasFeesPaidByError; +pub use unknown_security_level_error::UnknownSecurityLevelError; +pub use unknown_storage_key_requirements_error::UnknownStorageKeyRequirementsError; +pub use unknown_trade_mode_error::UnknownTradeModeError; +pub use unknown_transferable_type_error::UnknownTransferableTypeError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/new_tokens_destination_identity_option_required_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/new_tokens_destination_identity_option_required_error.rs index cb23fc8e522..043cef1caf5 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/new_tokens_destination_identity_option_required_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/new_tokens_destination_identity_option_required_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -12,9 +12,10 @@ use thiserror::Error; )] #[error("token configuration requires a new tokens destination identity if choosing destination is not allowed for contract {contract_id} at position {token_position}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NewTokensDestinationIdentityOptionRequiredError { - contract_id: Identifier, - token_position: TokenContractPosition, + pub contract_id: Identifier, + pub token_position: TokenContractPosition, } impl NewTokensDestinationIdentityOptionRequiredError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_group_positions_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_group_positions_error.rs index 3409e866f8c..30d8b5e88dc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_group_positions_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_group_positions_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,14 +15,15 @@ use thiserror::Error; followed_position )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NonContiguousContractGroupPositionsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - missing_position: GroupContractPosition, - followed_position: GroupContractPosition, + pub missing_position: GroupContractPosition, + pub followed_position: GroupContractPosition, } impl NonContiguousContractGroupPositionsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_token_positions_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_token_positions_error.rs index 2875f2bb420..98ae34e69a9 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_token_positions_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/non_contiguous_contract_token_positions_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,14 +15,15 @@ use thiserror::Error; followed_position )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NonContiguousContractTokenPositionsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - missing_position: TokenContractPosition, - followed_position: TokenContractPosition, + pub missing_position: TokenContractPosition, + pub followed_position: TokenContractPosition, } impl NonContiguousContractTokenPositionsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/redundant_document_paid_for_by_token_with_contract_id.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/redundant_document_paid_for_by_token_with_contract_id.rs index 70d672829a6..7ee97d8c49d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/redundant_document_paid_for_by_token_with_contract_id.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/redundant_document_paid_for_by_token_with_contract_id.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Document paid for by a token has a contractId {contract_id} set, which is redundant because it is targeting the current contract")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct RedundantDocumentPaidForByTokenWithContractId { - contract_id: Identifier, + pub contract_id: Identifier, } impl RedundantDocumentPaidForByTokenWithContractId { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/system_property_index_already_present_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/system_property_index_already_present_error.rs index 2eb3ccf7a2c..400cfe582f6 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/system_property_index_already_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/system_property_index_already_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,15 +10,16 @@ use thiserror::Error; )] #[error("System property '{property_name}' is already indexed and can't be used in '{index_name}' index of '{document_type}' document")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SystemPropertyIndexAlreadyPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, - property_name: String, + pub document_type: String, + pub index_name: String, + pub property_name: String, } impl SystemPropertyIndexAlreadyPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_decimals_over_limit_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_decimals_over_limit_error.rs index 88159657f6b..d42c06f5361 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_decimals_over_limit_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_decimals_over_limit_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Data contract is trying to define a token with {decimals} decimal places, which exceeds the maximum allowed: {max_decimals}.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DecimalsOverLimitError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - decimals: u8, - max_decimals: u8, + pub decimals: u8, + pub max_decimals: u8, } impl DecimalsOverLimitError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_payment_by_burning_only_allowed_on_internal_token_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_payment_by_burning_only_allowed_on_internal_token_error.rs index 65fcd8ed0a7..714cda45471 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_payment_by_burning_only_allowed_on_internal_token_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/token_payment_by_burning_only_allowed_on_internal_token_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; use crate::tokens::calculate_token_id; use crate::ProtocolError; @@ -13,10 +13,11 @@ use thiserror::Error; Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenPaymentByBurningOnlyAllowedOnInternalTokenError { - external_token_contract_id: Identifier, - external_token_contract_token_position: TokenContractPosition, - action: String, + pub external_token_contract_id: Identifier, + pub external_token_contract_token_position: TokenContractPosition, + pub action: String, } impl TokenPaymentByBurningOnlyAllowedOnInternalTokenError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/undefined_index_property_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/undefined_index_property_error.rs index bf4297aaaa9..9cef2d59f74 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/undefined_index_property_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/undefined_index_property_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,15 +10,16 @@ use thiserror::Error; )] #[error("'{property_name}' property is not defined in the '{document_type}' document")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UndefinedIndexPropertyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_name: String, - property_name: String, + pub document_type: String, + pub index_name: String, + pub property_name: String, } impl UndefinedIndexPropertyError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unique_indices_limit_reached_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unique_indices_limit_reached_error.rs index e136354d260..3b8b9da2903 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unique_indices_limit_reached_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unique_indices_limit_reached_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,15 +10,16 @@ use thiserror::Error; )] #[error("'{document_type}' document has more than '{index_limit}' unique indexes (contested is {is_contested_limit})")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UniqueIndicesLimitReachedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_limit: u16, - is_contested_limit: bool, + pub document_type: String, + pub index_limit: u16, + pub is_contested_limit: bool, } impl UniqueIndicesLimitReachedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_action_token_effect_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_action_token_effect_error.rs index f7820172795..40dddcb3338 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_action_token_effect_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_action_token_effect_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,9 +14,10 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownDocumentActionTokenEffectError { - allowed_values: Vec, - received: u64, + pub allowed_values: Vec, + pub received: u64, } impl UnknownDocumentActionTokenEffectError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_creation_restriction_mode_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_creation_restriction_mode_error.rs index 2d55df7e397..6caef896b7f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_creation_restriction_mode_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_document_creation_restriction_mode_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownDocumentCreationRestrictionModeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - allowed_values: Vec, - received: u8, + pub allowed_values: Vec, + pub received: u8, } impl UnknownDocumentCreationRestrictionModeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_gas_fees_paid_by_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_gas_fees_paid_by_error.rs index bd9dbbd4e4f..aae470538d1 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_gas_fees_paid_by_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_gas_fees_paid_by_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,12 +14,13 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownGasFeesPaidByError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING A NEW VERSION */ - allowed_values: Vec, - received: u64, + pub allowed_values: Vec, + pub received: u64, } impl UnknownGasFeesPaidByError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_security_level_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_security_level_error.rs index 325c5641106..981479435cf 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_security_level_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_security_level_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownSecurityLevelError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - allowed_values: Vec, - received: u8, + pub allowed_values: Vec, + pub received: u8, } impl UnknownSecurityLevelError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_storage_key_requirements_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_storage_key_requirements_error.rs index 82d00e70371..889b2bfba01 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_storage_key_requirements_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_storage_key_requirements_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownStorageKeyRequirementsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - allowed_values: Vec, - received: i128, + pub allowed_values: Vec, + pub received: i128, } impl UnknownStorageKeyRequirementsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_trade_mode_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_trade_mode_error.rs index bbf57f33351..880723c29ce 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_trade_mode_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_trade_mode_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownTradeModeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - allowed_values: Vec, - received: u8, + pub allowed_values: Vec, + pub received: u8, } impl UnknownTradeModeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_transferable_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_transferable_type_error.rs index 0ed1a89d4cf..e296e6c6c9d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_transferable_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/unknown_transferable_type_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use thiserror::Error; received )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownTransferableTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - allowed_values: Vec, - received: u8, + pub allowed_values: Vec, + pub received: u8, } impl UnknownTransferableTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/decode/decoding_error.rs b/packages/rs-dpp/src/errors/consensus/basic/decode/decoding_error.rs index 6f3bb18e9f2..700f25a7865 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/decode/decoding_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/decode/decoding_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; -use crate::data_contract::errors::DataContractError; +use crate::data_contract::errors::contract::DataContractError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; #[derive( @@ -12,13 +12,14 @@ use bincode::{Decode, Encode}; )] #[error("Decoding error: {error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DecodingError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - error: String, + pub error: String, } impl DecodingError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/decode/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/decode/mod.rs index 68796ee211e..6ab06b167e4 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/decode/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/decode/mod.rs @@ -1,9 +1,9 @@ -mod decoding_error; -mod protocol_version_parsing_error; -mod serialized_object_parsing_error; -mod version_error; +pub mod decoding_error; +pub mod protocol_version_parsing_error; +pub mod serialized_object_parsing_error; +pub mod version_error; -pub use decoding_error::*; -pub use protocol_version_parsing_error::*; -pub use serialized_object_parsing_error::*; -pub use version_error::*; +pub use decoding_error::DecodingError; +pub use protocol_version_parsing_error::ProtocolVersionParsingError; +pub use serialized_object_parsing_error::SerializedObjectParsingError; +pub use version_error::VersionError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs b/packages/rs-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs index c64e379c0ba..2077c739184 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; #[derive( @@ -11,13 +11,14 @@ use bincode::{Decode, Encode}; )] #[error("Can't read protocol version from serialized object: {parsing_error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ProtocolVersionParsingError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - parsing_error: String, + pub parsing_error: String, } impl ProtocolVersionParsingError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs b/packages/rs-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs index c415b41e939..22e871a3ced 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Parsing of serialized object failed due to: {parsing_error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SerializedObjectParsingError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - parsing_error: String, + pub parsing_error: String, } impl SerializedObjectParsingError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/decode/version_error.rs b/packages/rs-dpp/src/errors/consensus/basic/decode/version_error.rs index 013204d5ded..bc01f9a448d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/decode/version_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/decode/version_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; #[derive( @@ -11,13 +11,14 @@ use bincode::{Decode, Encode}; )] #[error("Can't read protocol version from serialized object: {error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct VersionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - error: String, + pub error: String, } impl VersionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/contested_documents_temporarily_not_allowed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/contested_documents_temporarily_not_allowed_error.rs index 55e01ad27a2..7da60816880 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/contested_documents_temporarily_not_allowed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/contested_documents_temporarily_not_allowed_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -14,14 +14,15 @@ use bincode::{Decode, Encode}; "Contested documents are not allowed until epoch {target_epoch}. Current epoch is {current_epoch}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedDocumentsTemporarilyNotAllowedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - current_epoch: EpochIndex, - target_epoch: EpochIndex, + pub current_epoch: EpochIndex, + pub target_epoch: EpochIndex, } impl ContestedDocumentsTemporarilyNotAllowedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs index 7ae01a0df1a..b32d2204e4b 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Data Contract {data_contract_id} is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractNotPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractNotPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/document_creation_not_allowed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/document_creation_not_allowed_error.rs index 5ad1732dddc..0928943cda1 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/document_creation_not_allowed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/document_creation_not_allowed_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::document_type::restricted_creation::CreationRestrictionMode; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,17 +12,18 @@ use thiserror::Error; )] #[error("Document Creation on {data_contract_id}:{document_type_name} is not allowed because of the document type's creation restriction mode {creation_restriction_mode}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentCreationNotAllowedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, + pub data_contract_id: Identifier, - document_type_name: String, + pub document_type_name: String, - creation_restriction_mode: CreationRestrictionMode, + pub creation_restriction_mode: CreationRestrictionMode, } impl DocumentCreationNotAllowedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/document_field_max_size_exceeded_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/document_field_max_size_exceeded_error.rs index 358d7fd3987..b9b881eaa83 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/document_field_max_size_exceeded_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/document_field_max_size_exceeded_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,15 +12,16 @@ use thiserror::Error; "Document field {field} size {actual_size_bytes} is more than system maximum {max_size_bytes}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentFieldMaxSizeExceededError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - field: String, - actual_size_bytes: u64, - max_size_bytes: u64, + pub field: String, + pub actual_size_bytes: u64, + pub max_size_bytes: u64, } impl DocumentFieldMaxSizeExceededError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs index 854a530cb31..7f95618288f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; @@ -11,6 +11,7 @@ use thiserror::Error; )] #[error("Documents Batch Transition has no document transitions")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTransitionsAreAbsentError {} impl Default for DocumentTransitionsAreAbsentError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs index 45fbb67a838..1b17b8ed508 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Document transitions with duplicate IDs {:?}", references)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateDocumentTransitionsWithIdsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - references: Vec<(String, [u8; 32])>, + pub references: Vec<(String, [u8; 32])>, } impl DuplicateDocumentTransitionsWithIdsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs index 6100b5128ce..09f3acf8c18 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -13,13 +13,14 @@ use thiserror::Error; references )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateDocumentTransitionsWithIndicesError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - references: Vec<(String, [u8; 32])>, + pub references: Vec<(String, [u8; 32])>, } impl DuplicateDocumentTransitionsWithIndicesError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs index 54eee70ff2c..5816f62f028 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::prelude::IdentityNonce; use bincode::{Decode, Encode}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Nonce is out of bounds: {}", nonce)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NonceOutOfBoundsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - nonce: IdentityNonce, + pub nonce: IdentityNonce, } impl NonceOutOfBoundsError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs index 2a2c9c8944d..062ae3354af 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -13,14 +13,15 @@ use thiserror::Error; index_properties )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InconsistentCompoundIndexDataError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - index_properties: Vec, + pub document_type: String, + pub index_properties: Vec, } impl InconsistentCompoundIndexDataError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs index 5097d8b0734..a888c28b918 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Document transition action {} is not supported", action)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTransitionActionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - action: String, + pub action: String, } impl InvalidDocumentTransitionActionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs index 094703cfcee..ef0a1d321db 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::prelude::Identifier; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; #[derive( @@ -15,14 +15,15 @@ use thiserror::Error; expected_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTransitionIdError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - expected_id: Identifier, - invalid_id: Identifier, + pub expected_id: Identifier, + pub invalid_id: Identifier, } impl InvalidDocumentTransitionIdError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs index 066cc3304dd..f31a81686b1 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs @@ -1,26 +1,25 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; +use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; -use crate::prelude::Identifier; - -use bincode::{Decode, Encode}; - #[derive( Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] #[error("Data Contract {data_contract_id} doesn't define document with the type {document_type}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_type: String, - data_contract_id: Identifier, + pub document_type: String, + pub data_contract_id: Identifier, } impl InvalidDocumentTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/max_documents_transitions_exceeded_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/max_documents_transitions_exceeded_error.rs index 549ae5d3fc6..d031fdd6c50 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/max_documents_transitions_exceeded_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/max_documents_transitions_exceeded_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; use crate::errors::ProtocolError; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Amount of document transitions must be less or equal to {max_transitions}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MaxDocumentsTransitionsExceededError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - max_transitions: u16, + pub max_transitions: u16, } impl MaxDocumentsTransitionsExceededError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/missing_data_contract_id_basic_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/missing_data_contract_id_basic_error.rs index 67e53ca26eb..31ff213a1cf 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/missing_data_contract_id_basic_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/missing_data_contract_id_basic_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -19,6 +19,7 @@ use thiserror::Error; )] #[error("$dataContractId is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingDataContractIdBasicError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs index 502633dbb93..88be598783e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,6 +20,7 @@ use bincode::{Decode, Encode}; )] #[error("$action is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingDocumentTransitionActionError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs index 65e1703c86b..24ff1763e73 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,6 +20,7 @@ use bincode::{Decode, Encode}; )] #[error("$type is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingDocumentTransitionTypeError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs index 3130733ef6e..94938375eb6 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,6 +20,7 @@ use bincode::{Decode, Encode}; )] #[error("$type is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingDocumentTypeError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs index ff520b8ffb6..a1b352c3c6d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/missing_positions_in_document_type_properties_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -24,15 +24,16 @@ use platform_value::Identifier; document_type_name )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingPositionsInDocumentTypePropertiesError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - missing_position: u32, - contract_id: Identifier, - document_type_name: String, + pub missing_position: u32, + pub contract_id: Identifier, + pub document_type_name: String, } impl MissingPositionsInDocumentTypePropertiesError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/document/mod.rs index f40fc9c3044..5949ea55cff 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/mod.rs @@ -1,37 +1,37 @@ -mod contested_documents_temporarily_not_allowed_error; -mod data_contract_not_present_error; -mod document_creation_not_allowed_error; -mod document_field_max_size_exceeded_error; -mod document_transitions_are_absent_error; -mod duplicate_document_transitions_with_ids_error; -mod duplicate_document_transitions_with_indices_error; -mod identity_contract_nonce_out_of_bounds_error; -mod inconsistent_compound_index_data_error; -mod invalid_document_transition_action_error; -mod invalid_document_transition_id_error; -mod invalid_document_type_error; -mod max_documents_transitions_exceeded_error; -mod missing_data_contract_id_basic_error; -mod missing_document_transition_action_error; -mod missing_document_transition_type_error; -mod missing_document_type_error; -mod missing_positions_in_document_type_properties_error; +pub mod contested_documents_temporarily_not_allowed_error; +pub mod data_contract_not_present_error; +pub mod document_creation_not_allowed_error; +pub mod document_field_max_size_exceeded_error; +pub mod document_transitions_are_absent_error; +pub mod duplicate_document_transitions_with_ids_error; +pub mod duplicate_document_transitions_with_indices_error; +pub mod identity_contract_nonce_out_of_bounds_error; +pub mod inconsistent_compound_index_data_error; +pub mod invalid_document_transition_action_error; +pub mod invalid_document_transition_id_error; +pub mod invalid_document_type_error; +pub mod max_documents_transitions_exceeded_error; +pub mod missing_data_contract_id_basic_error; +pub mod missing_document_transition_action_error; +pub mod missing_document_transition_type_error; +pub mod missing_document_type_error; +pub mod missing_positions_in_document_type_properties_error; -pub use contested_documents_temporarily_not_allowed_error::*; -pub use data_contract_not_present_error::*; -pub use document_creation_not_allowed_error::*; -pub use document_field_max_size_exceeded_error::*; -pub use document_transitions_are_absent_error::*; -pub use duplicate_document_transitions_with_ids_error::*; -pub use duplicate_document_transitions_with_indices_error::*; -pub use identity_contract_nonce_out_of_bounds_error::*; -pub use inconsistent_compound_index_data_error::*; -pub use invalid_document_transition_action_error::*; -pub use invalid_document_transition_id_error::*; -pub use invalid_document_type_error::*; -pub use max_documents_transitions_exceeded_error::*; -pub use missing_data_contract_id_basic_error::*; -pub use missing_document_transition_action_error::*; -pub use missing_document_transition_type_error::*; -pub use missing_document_type_error::*; -pub use missing_positions_in_document_type_properties_error::*; +pub use contested_documents_temporarily_not_allowed_error::ContestedDocumentsTemporarilyNotAllowedError; +pub use data_contract_not_present_error::DataContractNotPresentError; +pub use document_creation_not_allowed_error::DocumentCreationNotAllowedError; +pub use document_field_max_size_exceeded_error::DocumentFieldMaxSizeExceededError; +pub use document_transitions_are_absent_error::DocumentTransitionsAreAbsentError; +pub use duplicate_document_transitions_with_ids_error::DuplicateDocumentTransitionsWithIdsError; +pub use duplicate_document_transitions_with_indices_error::DuplicateDocumentTransitionsWithIndicesError; +pub use identity_contract_nonce_out_of_bounds_error::NonceOutOfBoundsError; +pub use inconsistent_compound_index_data_error::InconsistentCompoundIndexDataError; +pub use invalid_document_transition_action_error::InvalidDocumentTransitionActionError; +pub use invalid_document_transition_id_error::InvalidDocumentTransitionIdError; +pub use invalid_document_type_error::InvalidDocumentTypeError; +pub use max_documents_transitions_exceeded_error::MaxDocumentsTransitionsExceededError; +pub use missing_data_contract_id_basic_error::MissingDataContractIdBasicError; +pub use missing_document_transition_action_error::MissingDocumentTransitionActionError; +pub use missing_document_transition_type_error::MissingDocumentTransitionTypeError; +pub use missing_document_type_error::MissingDocumentTypeError; +pub use missing_positions_in_document_type_properties_error::MissingPositionsInDocumentTypePropertiesError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/group/group_action_not_allowed_on_transition_error.rs b/packages/rs-dpp/src/errors/consensus/basic/group/group_action_not_allowed_on_transition_error.rs index 8f2862fa9ab..f4fe3122e78 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/group/group_action_not_allowed_on_transition_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/group/group_action_not_allowed_on_transition_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,8 +10,9 @@ use thiserror::Error; )] #[error("Group action is not allowed during transition: {}", transition_type)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupActionNotAllowedOnTransitionError { - transition_type: String, + pub transition_type: String, } impl GroupActionNotAllowedOnTransitionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/group/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/group/mod.rs index 32c6ce2d357..58ec07fd75e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/group/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/group/mod.rs @@ -1,3 +1,3 @@ -mod group_action_not_allowed_on_transition_error; +pub mod group_action_not_allowed_on_transition_error; -pub use group_action_not_allowed_on_transition_error::*; +pub use group_action_not_allowed_on_transition_error::GroupActionNotAllowedOnTransitionError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/data_contract_bounds_not_present_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/data_contract_bounds_not_present_error.rs index c6dcfc1d4ea..3c52c1db442 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/data_contract_bounds_not_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/data_contract_bounds_not_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; use platform_value::Identifier; use serde::{Deserialize, Serialize}; @@ -7,13 +7,14 @@ use thiserror::Error; #[derive(Error, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Encode, Decode)] #[error("Data Contract {data_contract_id} expected bounds are not present")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractBoundsNotPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractBoundsNotPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/disabling_key_id_also_being_added_in_same_transition_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/disabling_key_id_also_being_added_in_same_transition_error.rs index 4d37c1e4e70..745829c19cb 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/disabling_key_id_also_being_added_in_same_transition_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/disabling_key_id_also_being_added_in_same_transition_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Disabling a key with id {key_id:?} that is being added in same state transition")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DisablingKeyIdAlsoBeingAddedInSameTransitionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - key_id: KeyID, + pub key_id: KeyID, } impl DisablingKeyIdAlsoBeingAddedInSameTransitionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_basic_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_basic_error.rs index 19a313d702c..a72ea5b7178 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_basic_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_basic_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Duplicated public keys {duplicated_ids:?} found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicatedIdentityPublicKeyBasicError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - duplicated_ids: Vec, + pub duplicated_ids: Vec, } impl DuplicatedIdentityPublicKeyBasicError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_basic_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_basic_error.rs index cf95281b69a..c1a747285f9 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_basic_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_basic_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Duplicated public key ids {duplicated_ids:?} found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicatedIdentityPublicKeyIdBasicError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - duplicated_ids: Vec, + pub duplicated_ids: Vec, } impl DuplicatedIdentityPublicKeyIdBasicError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs index 12b433973cb..246a3cf2108 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use dashcore::Txid; @@ -11,6 +11,7 @@ use thiserror::Error; )] #[error("`Instant Lock transaction {instant_lock_transaction_id:?} and Asset lock transaction {asset_lock_transaction_id:?} mismatch`")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockProofLockedTransactionMismatchError { /* @@ -19,10 +20,10 @@ pub struct IdentityAssetLockProofLockedTransactionMismatchError { */ #[platform_serialize(with_serde)] #[bincode(with_serde)] - instant_lock_transaction_id: Txid, + pub instant_lock_transaction_id: Txid, #[platform_serialize(with_serde)] #[bincode(with_serde)] - asset_lock_transaction_id: Txid, + pub asset_lock_transaction_id: Txid, } impl IdentityAssetLockProofLockedTransactionMismatchError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs index 8c1e8ab9401..d091bd0bb60 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use dashcore::Txid; @@ -12,6 +12,7 @@ use thiserror::Error; )] #[error("Asset lock transaction {transaction_id} is trying to be replayed and will be discarded")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockStateTransitionReplayError { /* @@ -20,11 +21,11 @@ pub struct IdentityAssetLockStateTransitionReplayError { */ #[platform_serialize(with_serde)] #[bincode(with_serde)] - transaction_id: Txid, + pub transaction_id: Txid, - output_index: usize, + pub output_index: usize, - state_transition_id: Bytes32, + pub state_transition_id: Bytes32, } impl IdentityAssetLockStateTransitionReplayError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs index b4d39d261c3..783790e7de0 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs @@ -1,24 +1,25 @@ use bincode::{Decode, Encode}; use std::fmt::{Display, Formatter}; -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; #[derive( Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockTransactionIsNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - transaction_id: [u8; 32], + pub transaction_id: [u8; 32], } impl Display for IdentityAssetLockTransactionIsNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_consumed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_consumed_error.rs index 250d2fc72cc..f233a2c26d2 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_consumed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_consumed_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use dashcore::Txid; @@ -11,6 +11,7 @@ use thiserror::Error; )] #[error("Asset lock transaction {transaction_id} output {output_index} already completely used")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockTransactionOutPointAlreadyConsumedError { /* @@ -19,8 +20,8 @@ pub struct IdentityAssetLockTransactionOutPointAlreadyConsumedError { */ #[platform_serialize(with_serde)] #[bincode(with_serde)] - transaction_id: Txid, - output_index: usize, + pub transaction_id: Txid, + pub output_index: usize, } impl IdentityAssetLockTransactionOutPointAlreadyConsumedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_not_enough_balance_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_not_enough_balance_error.rs index 98db7c70539..98855eb4c9d 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_not_enough_balance_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_not_enough_balance_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::balances::credits::Credits; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::fee::Credits; use bincode::{Decode, Encode}; use dashcore::Txid; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,6 +12,7 @@ use thiserror::Error; )] #[error("Asset lock transaction {transaction_id} output {output_index} only has {credits_left} credits left out of {initial_asset_lock_credits} initial credits on the asset lock but needs {credits_required} credits to start processing")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockTransactionOutPointNotEnoughBalanceError { /* @@ -20,11 +21,11 @@ pub struct IdentityAssetLockTransactionOutPointNotEnoughBalanceError { */ #[platform_serialize(with_serde)] #[bincode(with_serde)] - transaction_id: Txid, - output_index: usize, - initial_asset_lock_credits: Credits, - credits_left: Credits, - credits_required: Credits, + pub transaction_id: Txid, + pub output_index: usize, + pub initial_asset_lock_credits: Credits, + pub credits_left: Credits, + pub credits_required: Credits, } impl IdentityAssetLockTransactionOutPointNotEnoughBalanceError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs index 6f191742153..f1f1b013e00 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Asset Lock Transaction Output with index {output_index} not found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAssetLockTransactionOutputNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - output_index: usize, + pub output_index: usize, } impl IdentityAssetLockTransactionOutputNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs index 5330a50619d..b5a2b985b1f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -19,6 +19,7 @@ use thiserror::Error; )] #[error("Credits transfer recipient must be another identity")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityCreditTransferToSelfError {} impl IdentityCreditTransferToSelfError {} diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs index c1708fa455b..70611a8b8e8 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use bincode::{Decode, Encode}; )] #[error("Asset Lock proof core chain height {proof_core_chain_locked_height:?} is higher than the current consensus core height {current_core_chain_locked_height:?}.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidAssetLockProofCoreChainHeightError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - proof_core_chain_locked_height: u32, - current_core_chain_locked_height: u32, + pub proof_core_chain_locked_height: u32, + pub current_core_chain_locked_height: u32, } impl InvalidAssetLockProofCoreChainHeightError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs index 9b9cb76b123..65182936dfe 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use bincode::{Decode, Encode}; )] #[error("Core chain locked height {proof_core_chain_locked_height:?} must be higher than block {transaction_height:?} with Asset Lock transaction")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidAssetLockProofTransactionHeightError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - proof_core_chain_locked_height: u32, - transaction_height: Option, + pub proof_core_chain_locked_height: u32, + pub transaction_height: Option, } impl InvalidAssetLockProofTransactionHeightError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size.rs index d0967509242..26fe64ebf27 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,13 +12,14 @@ use thiserror::Error; "Asset Lock output {output_index} has invalid public key hash. Must be 20 length bytes hash" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidAssetLockTransactionOutputReturnSizeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - output_index: usize, + pub output_index: usize, } impl InvalidAssetLockTransactionOutputReturnSizeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs index d8ddeb3f628..f06a7313fbc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs @@ -9,11 +9,12 @@ use thiserror::Error; )] #[error("`Chain Locked transaction {transaction_id:?} could not be validated for the given height {height_reported_not_locked}`")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityAssetLockProofChainLockValidationError { #[platform_serialize(with_serde)] #[bincode(with_serde)] - transaction_id: Txid, - height_reported_not_locked: u32, + pub transaction_id: Txid, + pub height_reported_not_locked: u32, } impl InvalidIdentityAssetLockProofChainLockValidationError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs index 344a55633df..11f7a104792 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use bincode::{Decode, Encode}; )] #[error("Invalid asset lock transaction: {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityAssetLockTransactionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - message: String, + pub message: String, } impl InvalidIdentityAssetLockTransactionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs index 495f8d7e494..c7e6c625a2c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Asset lock output {output_index} is not a valid standard OP_RETURN output")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityAssetLockTransactionOutputError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - output_index: usize, + pub output_index: usize, } impl InvalidIdentityAssetLockTransactionOutputError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs index 7099006d3aa..7fe546c2579 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,6 +12,7 @@ use bincode::{Decode, Encode}; )] #[error("Credit transfer amount {amount} must be greater or equal to {min_amount}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityCreditTransferAmountError { /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_amount_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_amount_error.rs index 11b91aba7e7..3c85a36cd79 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_amount_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_amount_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,6 +12,7 @@ use bincode::{Decode, Encode}; )] #[error("Credit withdrawal amount {amount} must be greater or equal to {min_amount} and less than {max_amount}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityCreditWithdrawalTransitionAmountError { /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs index 2c3be767a38..4784a090882 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use bincode::{Decode, Encode}; )] #[error("Core fee per byte {core_fee_per_byte:?} must be part of fibonacci sequence and not less than {min_core_fee_per_byte:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityCreditWithdrawalTransitionCoreFeeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - core_fee_per_byte: u32, - min_core_fee_per_byte: u32, + pub core_fee_per_byte: u32, + pub min_core_fee_per_byte: u32, } impl InvalidIdentityCreditWithdrawalTransitionCoreFeeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs index 9af57eb8be4..480713b07fc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs @@ -2,8 +2,8 @@ use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::identity::core_script::CoreScript; use bincode::{Decode, Encode}; @@ -13,8 +13,9 @@ use bincode::{Decode, Encode}; )] #[error("Output script must be either p2pkh or p2sh")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityCreditWithdrawalTransitionOutputScriptError { - output_script: CoreScript, + pub output_script: CoreScript, } /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs index cd61cf61fdf..e32dc6487e9 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; @@ -13,13 +13,14 @@ use bincode::{Decode, Encode}; )] #[error("Identity key {public_key_id} has invalid signature")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityKeySignatureError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_id: KeyID, + pub public_key_id: KeyID, } impl InvalidIdentityKeySignatureError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs index 5e051fbe5f1..564e12c7076 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use crate::PublicKeyValidationError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,14 +12,15 @@ use thiserror::Error; )] #[error("Invalid identity public key {public_key_id:?} data: {validation_error:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityPublicKeyDataError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_id: KeyID, - validation_error: String, + pub public_key_id: KeyID, + pub validation_error: String, } impl InvalidIdentityPublicKeyDataError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs index 0ee3d80b8d0..9a3fa05b32c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::identity::{KeyID, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; use bincode::{Decode, Encode}; @@ -13,16 +13,17 @@ use bincode::{Decode, Encode}; )] #[error("Invalid identity public key {public_key_id:?} security level: purpose {purpose:?} allows only for {allowed_security_levels:?} security levels, but got {security_level:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityPublicKeySecurityLevelError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_id: KeyID, - purpose: Purpose, - security_level: SecurityLevel, - allowed_security_levels: String, + pub public_key_id: KeyID, + pub purpose: Purpose, + pub security_level: SecurityLevel, + pub allowed_security_levels: String, } impl InvalidIdentityPublicKeySecurityLevelError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs index 81bff1d14a2..d214ab051c4 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,6 +12,7 @@ use bincode::{Decode, Encode}; )] #[error("Identity Update Transition must specify timestamp when disabling keys")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityUpdateTransitionDisableKeysError; impl Default for InvalidIdentityUpdateTransitionDisableKeysError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs index 03048789878..c46804824ea 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -12,6 +12,7 @@ use bincode::{Decode, Encode}; )] #[error("Identity Update Transition neither contains new public keys or key ids to disable")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityUpdateTransitionEmptyError; impl Default for InvalidIdentityUpdateTransitionEmptyError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs index dabe336c605..2c303d1fd4c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,6 +10,7 @@ use thiserror::Error; )] #[error("Invalid instant lock proof: {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidInstantAssetLockProofError { /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs index 49403c91643..2416d2ef42e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,6 +20,7 @@ use bincode::{Decode, Encode}; )] #[error("Instant lock proof signature is invalid or wasn't created recently. Please try chain asset lock proof instead.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidInstantAssetLockProofSignatureError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs index aa1b95eccc7..0f29ffad25c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -22,6 +22,7 @@ use bincode::{Decode, Encode}; "Identity doesn't contain any master key, thus can not be updated. Please add a master key" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingMasterPublicKeyError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/mod.rs index 3b411457faa..3e09bee01fb 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/mod.rs @@ -1,66 +1,66 @@ -pub use data_contract_bounds_not_present_error::*; +pub use data_contract_bounds_not_present_error::DataContractBoundsNotPresentError; pub use disabling_key_id_also_being_added_in_same_transition_error::*; -pub use duplicated_identity_public_key_basic_error::*; -pub use duplicated_identity_public_key_id_basic_error::*; -pub use identity_asset_lock_proof_locked_transaction_mismatch_error::*; -pub use identity_asset_lock_state_transition_replay_error::*; -pub use identity_asset_lock_transaction_is_not_found_error::*; -pub use identity_asset_lock_transaction_out_point_already_consumed_error::*; -pub use identity_asset_lock_transaction_out_point_not_enough_balance_error::*; -pub use identity_asset_lock_transaction_output_not_found_error::*; -pub use identity_credit_transfer_to_self_error::*; -pub use invalid_asset_lock_proof_core_chain_height_error::*; -pub use invalid_asset_lock_proof_transaction_height_error::*; -pub use invalid_asset_lock_transaction_output_return_size::*; -pub use invalid_identity_asset_lock_proof_chain_lock_validation_error::*; -pub use invalid_identity_asset_lock_transaction_error::*; -pub use invalid_identity_asset_lock_transaction_output_error::*; -pub use invalid_identity_credit_transfer_amount_error::*; -pub use invalid_identity_credit_withdrawal_transition_amount_error::*; -pub use invalid_identity_credit_withdrawal_transition_core_fee_error::*; -pub use invalid_identity_credit_withdrawal_transition_output_script_error::*; -pub use invalid_identity_key_signature_error::*; -pub use invalid_identity_public_key_data_error::*; -pub use invalid_identity_public_key_security_level_error::*; -pub use invalid_identity_update_transition_disable_keys_error::*; -pub use invalid_identity_update_transition_empty_error::*; -pub use invalid_instant_asset_lock_proof_error::*; -pub use invalid_instant_asset_lock_proof_signature_error::*; -pub use missing_master_public_key_error::*; -pub use not_implemented_identity_credit_withdrawal_transition_pooling_error::*; -pub use too_many_master_public_key_error::*; -pub use withdrawal_output_script_not_allowed_when_signing_with_owner_key::*; +pub use duplicated_identity_public_key_basic_error::DuplicatedIdentityPublicKeyBasicError; +pub use duplicated_identity_public_key_id_basic_error::DuplicatedIdentityPublicKeyIdBasicError; +pub use identity_asset_lock_proof_locked_transaction_mismatch_error::IdentityAssetLockProofLockedTransactionMismatchError; +pub use identity_asset_lock_state_transition_replay_error::IdentityAssetLockStateTransitionReplayError; +pub use identity_asset_lock_transaction_is_not_found_error::IdentityAssetLockTransactionIsNotFoundError; +pub use identity_asset_lock_transaction_out_point_already_consumed_error::IdentityAssetLockTransactionOutPointAlreadyConsumedError; +pub use identity_asset_lock_transaction_out_point_not_enough_balance_error::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; +pub use identity_asset_lock_transaction_output_not_found_error::IdentityAssetLockTransactionOutputNotFoundError; +pub use identity_credit_transfer_to_self_error::IdentityCreditTransferToSelfError; +pub use invalid_asset_lock_proof_core_chain_height_error::InvalidAssetLockProofCoreChainHeightError; +pub use invalid_asset_lock_proof_transaction_height_error::InvalidAssetLockProofTransactionHeightError; +pub use invalid_asset_lock_transaction_output_return_size::InvalidAssetLockTransactionOutputReturnSizeError; +pub use invalid_identity_asset_lock_proof_chain_lock_validation_error::InvalidIdentityAssetLockProofChainLockValidationError; +pub use invalid_identity_asset_lock_transaction_error::InvalidIdentityAssetLockTransactionError; +pub use invalid_identity_asset_lock_transaction_output_error::InvalidIdentityAssetLockTransactionOutputError; +pub use invalid_identity_credit_transfer_amount_error::InvalidIdentityCreditTransferAmountError; +pub use invalid_identity_credit_withdrawal_transition_amount_error::InvalidIdentityCreditWithdrawalTransitionAmountError; +pub use invalid_identity_credit_withdrawal_transition_core_fee_error::InvalidIdentityCreditWithdrawalTransitionCoreFeeError; +pub use invalid_identity_credit_withdrawal_transition_output_script_error::InvalidIdentityCreditWithdrawalTransitionOutputScriptError; +pub use invalid_identity_key_signature_error::InvalidIdentityKeySignatureError; +pub use invalid_identity_public_key_data_error::InvalidIdentityPublicKeyDataError; +pub use invalid_identity_public_key_security_level_error::InvalidIdentityPublicKeySecurityLevelError; +pub use invalid_identity_update_transition_disable_keys_error::InvalidIdentityUpdateTransitionDisableKeysError; +pub use invalid_identity_update_transition_empty_error::InvalidIdentityUpdateTransitionEmptyError; +pub use invalid_instant_asset_lock_proof_error::InvalidInstantAssetLockProofError; +pub use invalid_instant_asset_lock_proof_signature_error::InvalidInstantAssetLockProofSignatureError; +pub use missing_master_public_key_error::MissingMasterPublicKeyError; +pub use not_implemented_identity_credit_withdrawal_transition_pooling_error::NotImplementedIdentityCreditWithdrawalTransitionPoolingError; +pub use too_many_master_public_key_error::TooManyMasterPublicKeyError; +pub use withdrawal_output_script_not_allowed_when_signing_with_owner_key::WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError; -mod data_contract_bounds_not_present_error; -mod disabling_key_id_also_being_added_in_same_transition_error; -mod duplicated_identity_public_key_basic_error; -mod duplicated_identity_public_key_id_basic_error; -mod identity_asset_lock_proof_locked_transaction_mismatch_error; -mod identity_asset_lock_transaction_is_not_found_error; -mod identity_asset_lock_transaction_out_point_already_consumed_error; +pub mod data_contract_bounds_not_present_error; +pub mod disabling_key_id_also_being_added_in_same_transition_error; +pub mod duplicated_identity_public_key_basic_error; +pub mod duplicated_identity_public_key_id_basic_error; +pub mod identity_asset_lock_proof_locked_transaction_mismatch_error; +pub mod identity_asset_lock_transaction_is_not_found_error; +pub mod identity_asset_lock_transaction_out_point_already_consumed_error; -mod identity_asset_lock_state_transition_replay_error; -mod identity_asset_lock_transaction_out_point_not_enough_balance_error; -mod identity_asset_lock_transaction_output_not_found_error; -mod identity_credit_transfer_to_self_error; -mod invalid_asset_lock_proof_core_chain_height_error; -mod invalid_asset_lock_proof_transaction_height_error; -mod invalid_asset_lock_transaction_output_return_size; -mod invalid_identity_asset_lock_proof_chain_lock_validation_error; -mod invalid_identity_asset_lock_transaction_error; -mod invalid_identity_asset_lock_transaction_output_error; -mod invalid_identity_credit_transfer_amount_error; -mod invalid_identity_credit_withdrawal_transition_amount_error; -mod invalid_identity_credit_withdrawal_transition_core_fee_error; -mod invalid_identity_credit_withdrawal_transition_output_script_error; -mod invalid_identity_key_signature_error; -mod invalid_identity_public_key_data_error; -mod invalid_identity_public_key_security_level_error; -mod invalid_identity_update_transition_disable_keys_error; -mod invalid_identity_update_transition_empty_error; -mod invalid_instant_asset_lock_proof_error; -mod invalid_instant_asset_lock_proof_signature_error; -mod missing_master_public_key_error; -mod not_implemented_identity_credit_withdrawal_transition_pooling_error; -mod too_many_master_public_key_error; -mod withdrawal_output_script_not_allowed_when_signing_with_owner_key; +pub mod identity_asset_lock_state_transition_replay_error; +pub mod identity_asset_lock_transaction_out_point_not_enough_balance_error; +pub mod identity_asset_lock_transaction_output_not_found_error; +pub mod identity_credit_transfer_to_self_error; +pub mod invalid_asset_lock_proof_core_chain_height_error; +pub mod invalid_asset_lock_proof_transaction_height_error; +pub mod invalid_asset_lock_transaction_output_return_size; +pub mod invalid_identity_asset_lock_proof_chain_lock_validation_error; +pub mod invalid_identity_asset_lock_transaction_error; +pub mod invalid_identity_asset_lock_transaction_output_error; +pub mod invalid_identity_credit_transfer_amount_error; +pub mod invalid_identity_credit_withdrawal_transition_amount_error; +pub mod invalid_identity_credit_withdrawal_transition_core_fee_error; +pub mod invalid_identity_credit_withdrawal_transition_output_script_error; +pub mod invalid_identity_key_signature_error; +pub mod invalid_identity_public_key_data_error; +pub mod invalid_identity_public_key_security_level_error; +pub mod invalid_identity_update_transition_disable_keys_error; +pub mod invalid_identity_update_transition_empty_error; +pub mod invalid_instant_asset_lock_proof_error; +pub mod invalid_instant_asset_lock_proof_signature_error; +pub mod missing_master_public_key_error; +pub mod not_implemented_identity_credit_withdrawal_transition_pooling_error; +pub mod too_many_master_public_key_error; +pub mod withdrawal_output_script_not_allowed_when_signing_with_owner_key; diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/not_implemented_identity_credit_withdrawal_transition_pooling_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/not_implemented_identity_credit_withdrawal_transition_pooling_error.rs index bd3b92d5301..7714cc50bb2 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/not_implemented_identity_credit_withdrawal_transition_pooling_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/not_implemented_identity_credit_withdrawal_transition_pooling_error.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; @@ -14,13 +14,14 @@ use bincode::{Decode, Encode}; "pooling {pooling:?} should be equal to 0. Other pooling mechanism are not implemented yet" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NotImplementedIdentityCreditWithdrawalTransitionPoolingError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pooling: u8, + pub pooling: u8, } impl NotImplementedIdentityCreditWithdrawalTransitionPoolingError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/too_many_master_public_key_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/too_many_master_public_key_error.rs index 0b8bda2d2c0..c3fd55f39f4 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/too_many_master_public_key_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/too_many_master_public_key_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -22,6 +22,7 @@ use bincode::{Decode, Encode}; "Identity is trying to be created with more than one master key. Please only use one master key." )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TooManyMasterPublicKeyError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/withdrawal_output_script_not_allowed_when_signing_with_owner_key.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/withdrawal_output_script_not_allowed_when_signing_with_owner_key.rs index 70f4c68b5dc..49e24e301df 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/withdrawal_output_script_not_allowed_when_signing_with_owner_key.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/withdrawal_output_script_not_allowed_when_signing_with_owner_key.rs @@ -2,8 +2,8 @@ use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::identity::core_script::CoreScript; use crate::identity::KeyID; @@ -14,9 +14,10 @@ use bincode::{Decode, Encode}; )] #[error("Withdrawal output script not allowed when signing with owner key {key_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError { - output_script: CoreScript, - key_id: KeyID, + pub output_script: CoreScript, + pub key_id: KeyID, } /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs b/packages/rs-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs index 19a781fc37e..d1fbd1bbf05 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Protocol version {parsed_protocol_version:?} is not supported. Minimal supported protocol version is {minimal_protocol_version:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IncompatibleProtocolVersionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - parsed_protocol_version: u32, - minimal_protocol_version: u32, + pub parsed_protocol_version: u32, + pub minimal_protocol_version: u32, } impl IncompatibleProtocolVersionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/invalid_identifier_error.rs b/packages/rs-dpp/src/errors/consensus/basic/invalid_identifier_error.rs index 72f9562a985..47538958644 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/invalid_identifier_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/invalid_identifier_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("Invalid {identifier_name}: {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentifierError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identifier_name: String, - message: String, + pub identifier_name: String, + pub message: String, } impl InvalidIdentifierError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs b/packages/rs-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs index 5b40054e7f2..babf1501559 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("JsonSchema compilation error: {compilation_error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct JsonSchemaCompilationError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - compilation_error: String, + pub compilation_error: String, } impl JsonSchemaCompilationError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/error.rs b/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/error.rs index 780998dc297..a4f04e2fd02 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/error.rs @@ -1,15 +1,14 @@ #[cfg(feature = "json-schema-validation")] -use crate::consensus::basic::json_schema_error::error_data::JsonSchemaErrorData; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::json_schema_error::error_data::JsonSchemaErrorData; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; #[cfg(feature = "json-schema-validation")] use jsonschema::ValidationError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Value; -#[cfg(feature = "json-schema-validation")] -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use thiserror::Error; #[derive( @@ -17,18 +16,19 @@ use thiserror::Error; )] #[error("JsonSchemaError: {error_summary}, path: {instance_path}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct JsonSchemaError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - error_summary: String, - keyword: String, - instance_path: String, - schema_path: String, - params: Value, - property_name: String, + pub error_summary: String, + pub keyword: String, + pub instance_path: String, + pub schema_path: String, + pub params: Value, + pub property_name: String, } #[cfg(feature = "json-schema-validation")] @@ -46,7 +46,7 @@ impl<'a> From> for JsonSchemaError { error_summary: error_message, instance_path: validation_error.instance_path.to_string(), schema_path: validation_error.schema_path.to_string(), - params: JsonValue::Object(params).into(), + params: serde_json::Value::Object(params).into(), property_name, } } diff --git a/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/mod.rs index 9e36fd33e9f..5ae5988a51a 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/json_schema_error/mod.rs @@ -1,4 +1,4 @@ pub mod error; -mod error_data; +pub mod error_data; -pub use error::*; +pub use error::JsonSchemaError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/mod.rs index d046f9dccd0..a43c7497dac 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/mod.rs @@ -1,8 +1,8 @@ -pub use basic_error::*; -pub use incompatible_protocol_version_error::*; -pub use unsupported_feature_error::*; -pub use unsupported_protocol_version_error::*; -pub use unsupported_version_error::*; +pub use basic_error::BasicError; +pub use incompatible_protocol_version_error::IncompatibleProtocolVersionError; +pub use unsupported_feature_error::UnsupportedFeatureError; +pub use unsupported_protocol_version_error::UnsupportedProtocolVersionError; +pub use unsupported_version_error::UnsupportedVersionError; pub mod data_contract; pub mod decode; diff --git a/packages/rs-dpp/src/errors/consensus/basic/overflow_error.rs b/packages/rs-dpp/src/errors/consensus/basic/overflow_error.rs index 9d478a9123b..be93125d6c9 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/overflow_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/overflow_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Overflow error")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct OverflowError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - message: String, + pub message: String, } impl OverflowError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs index 0059dbcb1a6..b9abe32e2e1 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Invalid State Transition type {transition_type}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidStateTransitionTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - transition_type: u8, + pub transition_type: u8, } impl InvalidStateTransitionTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs b/packages/rs-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs index 54e6ebc6dac..4933cb3feb2 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,6 +20,7 @@ use bincode::{Decode, Encode}; )] #[error("State transition type is not present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingStateTransitionTypeError; /* diff --git a/packages/rs-dpp/src/errors/consensus/basic/state_transition/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/state_transition/mod.rs index d40fd421f65..ea1afeb414e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/state_transition/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/state_transition/mod.rs @@ -1,7 +1,7 @@ -mod invalid_state_transition_type_error; -mod missing_state_transition_type_error; -mod state_transition_max_size_exceeded_error; +pub mod invalid_state_transition_type_error; +pub mod missing_state_transition_type_error; +pub mod state_transition_max_size_exceeded_error; -pub use invalid_state_transition_type_error::*; -pub use missing_state_transition_type_error::*; -pub use state_transition_max_size_exceeded_error::*; +pub use invalid_state_transition_type_error::InvalidStateTransitionTypeError; +pub use missing_state_transition_type_error::MissingStateTransitionTypeError; +pub use state_transition_max_size_exceeded_error::StateTransitionMaxSizeExceededError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs b/packages/rs-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs index 8d33a1999d1..a1fc2ff6e7e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,14 +10,15 @@ use thiserror::Error; )] #[error("State transition size {actual_size_bytes} is more than maximum {max_size_bytes}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct StateTransitionMaxSizeExceededError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - actual_size_bytes: u64, - max_size_bytes: u64, + pub actual_size_bytes: u64, + pub max_size_bytes: u64, } impl StateTransitionMaxSizeExceededError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/choosing_token_mint_recipient_not_allowed_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/choosing_token_mint_recipient_not_allowed_error.rs index 9d5f2dfc901..4bef93b7910 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/choosing_token_mint_recipient_not_allowed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/choosing_token_mint_recipient_not_allowed_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Choosing token mint recipient not allowed for token {}", token_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ChoosingTokenMintRecipientNotAllowedError { - token_id: Identifier, + pub token_id: Identifier, } impl ChoosingTokenMintRecipientNotAllowedError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/contract_has_no_tokens_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/contract_has_no_tokens_error.rs index 3fc49a2600a..26a46faf804 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/contract_has_no_tokens_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/contract_has_no_tokens_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Contract {} has no tokens", contract_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContractHasNoTokensError { - contract_id: Identifier, + pub contract_id: Identifier, } impl ContractHasNoTokensError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/destination_identity_for_token_minting_not_set_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/destination_identity_for_token_minting_not_set_error.rs index 7136a46e66f..5cd733a5418 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/destination_identity_for_token_minting_not_set_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/destination_identity_for_token_minting_not_set_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Destination identity for minting not set for token {}", token_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DestinationIdentityForTokenMintingNotSetError { - token_id: Identifier, + pub token_id: Identifier, } impl DestinationIdentityForTokenMintingNotSetError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_action_id_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_action_id_error.rs index 51587ab3926..7fc03c49f00 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_action_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_action_id_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use platform_value::Identifier; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,9 +14,10 @@ use thiserror::Error; expected_action_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidActionIdError { - expected_action_id: Identifier, - invalid_action_id: Identifier, + pub expected_action_id: Identifier, + pub invalid_action_id: Identifier, } impl InvalidActionIdError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_amount_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_amount_error.rs index 4cb99622467..cbbc8216a8f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_amount_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_amount_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,9 +14,10 @@ use thiserror::Error; max_token_amount )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenAmountError { - max_token_amount: u64, - token_amount: u64, + pub max_token_amount: u64, + pub token_amount: u64, } impl InvalidTokenAmountError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_config_update_no_change_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_config_update_no_change_error.rs index cb20e90e5b1..628ccce04da 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_config_update_no_change_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_config_update_no_change_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,6 +10,7 @@ use thiserror::Error; )] #[error("Invalid token configuration update: no changes were made")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenConfigUpdateNoChangeError; impl Default for InvalidTokenConfigUpdateNoChangeError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_id_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_id_error.rs index 635f126158f..ecaee3d7a7f 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_id_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use platform_value::Identifier; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,9 +14,10 @@ use thiserror::Error; expected_token_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenIdError { - expected_token_id: Identifier, - invalid_token_id: Identifier, + pub expected_token_id: Identifier, + pub invalid_token_id: Identifier, } impl InvalidTokenIdError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_note_too_big_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_note_too_big_error.rs index 30e289021c8..097f4255331 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_note_too_big_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_note_too_big_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,10 +15,11 @@ use thiserror::Error; max_note_length )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenNoteTooBigError { - max_note_length: u32, - note_type: String, - note_length: u32, + pub max_note_length: u32, + pub note_type: String, + pub note_length: u32, } impl InvalidTokenNoteTooBigError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_position_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_position_error.rs index e131d553cd1..7d2af0f9c0e 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_position_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_position_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -18,9 +18,10 @@ use thiserror::Error; } )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenPositionError { - max_token_position: Option, - invalid_token_position: TokenContractPosition, + pub max_token_position: Option, + pub invalid_token_position: TokenContractPosition, } impl InvalidTokenPositionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/missing_default_localization.rs b/packages/rs-dpp/src/errors/consensus/basic/token/missing_default_localization.rs index 71e444a26a2..821f202a72c 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/missing_default_localization.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/missing_default_localization.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -9,6 +9,7 @@ use thiserror::Error; )] #[error("Missing english ('en') localization which is using by default")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingDefaultLocalizationError {} impl Default for MissingDefaultLocalizationError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/token/mod.rs index 85a180d7609..5739087ffbc 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/mod.rs @@ -1,25 +1,25 @@ -mod choosing_token_mint_recipient_not_allowed_error; -mod contract_has_no_tokens_error; -mod destination_identity_for_token_minting_not_set_error; -mod invalid_action_id_error; -mod invalid_token_amount_error; -mod invalid_token_config_update_no_change_error; -mod invalid_token_id_error; -mod invalid_token_note_too_big_error; -mod invalid_token_position_error; -mod missing_default_localization; -mod token_note_only_allowed_on_proposer_error; -mod token_transfer_to_ourselves_error; +pub mod choosing_token_mint_recipient_not_allowed_error; +pub mod contract_has_no_tokens_error; +pub mod destination_identity_for_token_minting_not_set_error; +pub mod invalid_action_id_error; +pub mod invalid_token_amount_error; +pub mod invalid_token_config_update_no_change_error; +pub mod invalid_token_id_error; +pub mod invalid_token_note_too_big_error; +pub mod invalid_token_position_error; +pub mod missing_default_localization; +pub mod token_note_only_allowed_on_proposer_error; +pub mod token_transfer_to_ourselves_error; -pub use choosing_token_mint_recipient_not_allowed_error::*; -pub use contract_has_no_tokens_error::*; -pub use destination_identity_for_token_minting_not_set_error::*; -pub use invalid_action_id_error::*; -pub use invalid_token_amount_error::*; -pub use invalid_token_config_update_no_change_error::*; -pub use invalid_token_id_error::*; -pub use invalid_token_note_too_big_error::*; -pub use invalid_token_position_error::*; -pub use missing_default_localization::*; -pub use token_note_only_allowed_on_proposer_error::*; -pub use token_transfer_to_ourselves_error::*; +pub use choosing_token_mint_recipient_not_allowed_error::ChoosingTokenMintRecipientNotAllowedError; +pub use contract_has_no_tokens_error::ContractHasNoTokensError; +pub use destination_identity_for_token_minting_not_set_error::DestinationIdentityForTokenMintingNotSetError; +pub use invalid_action_id_error::InvalidActionIdError; +pub use invalid_token_amount_error::InvalidTokenAmountError; +pub use invalid_token_config_update_no_change_error::InvalidTokenConfigUpdateNoChangeError; +pub use invalid_token_id_error::InvalidTokenIdError; +pub use invalid_token_note_too_big_error::InvalidTokenNoteTooBigError; +pub use invalid_token_position_error::InvalidTokenPositionError; +pub use missing_default_localization::MissingDefaultLocalizationError; +pub use token_note_only_allowed_on_proposer_error::TokenNoteOnlyAllowedWhenProposerError; +pub use token_transfer_to_ourselves_error::TokenTransferToOurselfError; diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/token_note_only_allowed_on_proposer_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/token_note_only_allowed_on_proposer_error.rs index e4fe3991767..78efbbc7988 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/token_note_only_allowed_on_proposer_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/token_note_only_allowed_on_proposer_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -10,6 +10,7 @@ use thiserror::Error; )] #[error("Token note is only allowed when the signer is the proposer")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenNoteOnlyAllowedWhenProposerError; impl TokenNoteOnlyAllowedWhenProposerError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/token/token_transfer_to_ourselves_error.rs b/packages/rs-dpp/src/errors/consensus/basic/token/token_transfer_to_ourselves_error.rs index dbd1ee747c1..702b301d340 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/token/token_transfer_to_ourselves_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/token/token_transfer_to_ourselves_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,9 +15,10 @@ use thiserror::Error; identity_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenTransferToOurselfError { - token_id: Identifier, - identity_id: Identifier, + pub token_id: Identifier, + pub identity_id: Identifier, } impl TokenTransferToOurselfError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/unsupported_feature_error.rs b/packages/rs-dpp/src/errors/consensus/basic/unsupported_feature_error.rs index 0a0c542e2b8..f52700a26d5 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/unsupported_feature_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/unsupported_feature_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("feature {feature_name} is not supported. This validation was done in protocol version {current_protocol_version}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnsupportedFeatureError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - feature_name: String, - current_protocol_version: u32, + pub feature_name: String, + pub current_protocol_version: u32, } impl UnsupportedFeatureError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs b/packages/rs-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs index 9021c8df0e3..4b766aacf20 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Protocol version {parsed_protocol_version:?} is not supported. Latest supported version is {latest_version:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnsupportedProtocolVersionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - parsed_protocol_version: u32, - latest_version: u32, + pub parsed_protocol_version: u32, + pub latest_version: u32, } impl UnsupportedProtocolVersionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/unsupported_version_error.rs b/packages/rs-dpp/src/errors/consensus/basic/unsupported_version_error.rs index cba93d0a35c..04a99666dfa 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/unsupported_version_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/unsupported_version_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,15 +11,16 @@ use thiserror::Error; )] #[error("version {received_version:?} is not supported. Supported versions are {min_version:?} to {max_version:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnsupportedVersionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - received_version: u16, - min_version: u16, - max_version: u16, + pub received_version: u16, + pub min_version: u16, + pub max_version: u16, } impl UnsupportedVersionError { diff --git a/packages/rs-dpp/src/errors/consensus/basic/value_error.rs b/packages/rs-dpp/src/errors/consensus/basic/value_error.rs index 83f1b85cdb5..ac380823922 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/value_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/value_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Error as PlatformValueError; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("{value_error}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ValueError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - value_error: String, + pub value_error: String, } impl ValueError { diff --git a/packages/rs-dpp/src/errors/consensus/codes.rs b/packages/rs-dpp/src/errors/consensus/codes.rs index 48dfdc59a6d..b2e9ebbf447 100644 --- a/packages/rs-dpp/src/errors/consensus/codes.rs +++ b/packages/rs-dpp/src/errors/consensus/codes.rs @@ -1,5 +1,5 @@ -use crate::consensus::signature::SignatureError; -use crate::consensus::state::data_trigger::DataTriggerError; +use crate::errors::consensus::signature::SignatureError; +use crate::errors::consensus::state::data_trigger::DataTriggerError; use crate::data_contract::errors::DataContractError; use crate::errors::consensus::{ diff --git a/packages/rs-dpp/src/errors/consensus/consensus_error.rs b/packages/rs-dpp/src/errors/consensus/consensus_error.rs index 72d41d4aa3d..a099fa8538b 100644 --- a/packages/rs-dpp/src/errors/consensus/consensus_error.rs +++ b/packages/rs-dpp/src/errors/consensus/consensus_error.rs @@ -3,13 +3,13 @@ use bincode; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; -use crate::consensus::state::state_error::StateError; +use crate::errors::consensus::state::state_error::StateError; -use crate::consensus::fee::fee_error::FeeError; -use crate::consensus::signature::SignatureError; +use crate::errors::consensus::fee::fee_error::FeeError; +use crate::errors::consensus::signature::SignatureError; #[cfg(test)] -use crate::consensus::test_consensus_error::TestConsensusError; +use crate::errors::consensus::test_consensus_error::TestConsensusError; use crate::errors::consensus::basic::BasicError; @@ -27,6 +27,7 @@ use crate::errors::consensus::basic::BasicError; )] #[platform_serialize(limit = 2000)] #[error(transparent)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ConsensusError { /* diff --git a/packages/rs-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs b/packages/rs-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs index ceeb12ac2d0..d436d9c1d59 100644 --- a/packages/rs-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs +++ b/packages/rs-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::fee::fee_error::FeeError; -use crate::consensus::ConsensusError; -use crate::fee::Credits; +use crate::balances::credits::Credits; +use crate::errors::consensus::fee::fee_error::FeeError; +use crate::errors::consensus::ConsensusError; use thiserror::Error; use crate::errors::ProtocolError; @@ -13,14 +13,15 @@ use bincode::{Decode, Encode}; )] #[error("Current credits balance {balance} is not enough to pay {fee} fee")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BalanceIsNotEnoughError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - balance: Credits, - fee: Credits, + pub balance: Credits, + pub fee: Credits, } impl BalanceIsNotEnoughError { diff --git a/packages/rs-dpp/src/errors/consensus/fee/fee_error.rs b/packages/rs-dpp/src/errors/consensus/fee/fee_error.rs index cc19ca60f2f..726cb0c1987 100644 --- a/packages/rs-dpp/src/errors/consensus/fee/fee_error.rs +++ b/packages/rs-dpp/src/errors/consensus/fee/fee_error.rs @@ -9,6 +9,7 @@ use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; #[derive( Error, Debug, PartialEq, Encode, Decode, PlatformSerialize, PlatformDeserialize, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum FeeError { /* diff --git a/packages/rs-dpp/src/errors/consensus/mod.rs b/packages/rs-dpp/src/errors/consensus/mod.rs index 3c02c63841e..870051b54b7 100644 --- a/packages/rs-dpp/src/errors/consensus/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/mod.rs @@ -1,5 +1,5 @@ -pub use consensus_error::*; - +// pub use consensus_error::*; +pub use consensus_error::ConsensusError; pub mod basic; pub mod codes; pub mod consensus_error; diff --git a/packages/rs-dpp/src/errors/consensus/signature/basic_bls_error.rs b/packages/rs-dpp/src/errors/consensus/signature/basic_bls_error.rs index dead2aff6dc..f8122606c89 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/basic_bls_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/basic_bls_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,8 +20,9 @@ use bincode::{Decode, Encode}; )] #[error("bls signing error {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BasicBLSError { - message: String, + pub message: String, } /* diff --git a/packages/rs-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs b/packages/rs-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs index eb1ea64348e..e0cfcf2010c 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,8 +20,9 @@ use bincode::{Decode, Encode}; )] #[error("ecdsa signing error {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BasicECDSAError { - message: String, + pub message: String, } /* diff --git a/packages/rs-dpp/src/errors/consensus/signature/identity_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/signature/identity_not_found_error.rs index daf90820bdd..074a6fe9646 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/identity_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/identity_not_found_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use platform_value::Identifier; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,13 +14,14 @@ use bincode::{Decode, Encode}; )] #[error("Identity {identity_id} not found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, + pub identity_id: Identifier, } impl IdentityNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/invalid_identity_public_key_type_error.rs b/packages/rs-dpp/src/errors/consensus/signature/invalid_identity_public_key_type_error.rs index b5b8365e731..0bf0aff3e26 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/invalid_identity_public_key_type_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/invalid_identity_public_key_type_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::KeyType; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::KeyType; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,13 +14,14 @@ use bincode::{Decode, Encode}; )] #[error("Unsupported signature type {public_key_type}. Please use ECDSA (0), BLS (1) or ECDSA_HASH160 (2) keys to sign the state transition")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityPublicKeyTypeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_type: KeyType, + pub public_key_type: KeyType, } impl InvalidIdentityPublicKeyTypeError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_purpose_error.rs b/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_purpose_error.rs index 1477f7b1d9d..2a04c00e58c 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_purpose_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_purpose_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::Purpose; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::Purpose; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,14 +15,15 @@ use itertools::Itertools; )] #[error("Invalid public key purpose {public_key_purpose}. The state transition requires {}", allowed_key_purposes.iter().map(|s| s.to_string()).join(" | "))] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidSignaturePublicKeyPurposeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_purpose: Purpose, - allowed_key_purposes: Vec, + pub public_key_purpose: Purpose, + pub allowed_key_purposes: Vec, } impl InvalidSignaturePublicKeyPurposeError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_security_level_error.rs b/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_security_level_error.rs index cb295903a38..5763be28bf8 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_security_level_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/invalid_signature_public_key_security_level_error.rs @@ -1,9 +1,9 @@ use itertools::Itertools; use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::SecurityLevel; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::SecurityLevel; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,14 +15,15 @@ use bincode::{Decode, Encode}; )] #[error("Invalid public key security level {public_key_security_level}. The state transition requires one of {}", allowed_key_security_levels.iter().map(|s| s.to_string()).join(" | "))] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidSignaturePublicKeySecurityLevelError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_security_level: SecurityLevel, - allowed_key_security_levels: Vec, + pub public_key_security_level: SecurityLevel, + pub allowed_key_security_levels: Vec, } impl InvalidSignaturePublicKeySecurityLevelError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/invalid_state_transition_signature_error.rs b/packages/rs-dpp/src/errors/consensus/signature/invalid_state_transition_signature_error.rs index 4c179a63f3d..6b73fe4c41a 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/invalid_state_transition_signature_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/invalid_state_transition_signature_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -19,8 +19,9 @@ use thiserror::Error; )] #[error("Invalid State Transition signature")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidStateTransitionSignatureError { - message: String, + pub message: String, } /* diff --git a/packages/rs-dpp/src/errors/consensus/signature/missing_public_key_error.rs b/packages/rs-dpp/src/errors/consensus/signature/missing_public_key_error.rs index 10775e1ea69..3584bc69b8a 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/missing_public_key_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/missing_public_key_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::KeyID; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::KeyID; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,13 +14,14 @@ use bincode::{Decode, Encode}; )] #[error("Public key {public_key_id} doesn't exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingPublicKeyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_id: KeyID, + pub public_key_id: KeyID, } impl MissingPublicKeyError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/mod.rs b/packages/rs-dpp/src/errors/consensus/signature/mod.rs index 46c0b6282af..a97364f08c7 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/mod.rs @@ -1,27 +1,27 @@ -mod basic_bls_error; -mod basic_ecdsa_error; -mod identity_not_found_error; -mod invalid_identity_public_key_type_error; -mod invalid_signature_public_key_purpose_error; -mod invalid_signature_public_key_security_level_error; -mod invalid_state_transition_signature_error; -mod missing_public_key_error; -mod public_key_is_disabled_error; -mod public_key_security_level_not_met_error; -mod signature_error; -mod signature_should_not_be_present_error; -mod wrong_public_key_purpose_error; +pub mod basic_bls_error; +pub mod basic_ecdsa_error; +pub mod identity_not_found_error; +pub mod invalid_identity_public_key_type_error; +pub mod invalid_signature_public_key_purpose_error; +pub mod invalid_signature_public_key_security_level_error; +pub mod invalid_state_transition_signature_error; +pub mod missing_public_key_error; +pub mod public_key_is_disabled_error; +pub mod public_key_security_level_not_met_error; +pub mod signature_error; +pub mod signature_should_not_be_present_error; +pub mod wrong_public_key_purpose_error; -pub use crate::consensus::signature::basic_bls_error::BasicBLSError; -pub use crate::consensus::signature::basic_ecdsa_error::BasicECDSAError; -pub use crate::consensus::signature::identity_not_found_error::IdentityNotFoundError; -pub use crate::consensus::signature::invalid_identity_public_key_type_error::InvalidIdentityPublicKeyTypeError; -pub use crate::consensus::signature::invalid_signature_public_key_purpose_error::InvalidSignaturePublicKeyPurposeError; -pub use crate::consensus::signature::invalid_signature_public_key_security_level_error::InvalidSignaturePublicKeySecurityLevelError; -pub use crate::consensus::signature::invalid_state_transition_signature_error::InvalidStateTransitionSignatureError; -pub use crate::consensus::signature::missing_public_key_error::MissingPublicKeyError; -pub use crate::consensus::signature::public_key_is_disabled_error::PublicKeyIsDisabledError; -pub use crate::consensus::signature::public_key_security_level_not_met_error::PublicKeySecurityLevelNotMetError; -pub use crate::consensus::signature::signature_error::SignatureError; -pub use crate::consensus::signature::signature_should_not_be_present_error::SignatureShouldNotBePresentError; -pub use crate::consensus::signature::wrong_public_key_purpose_error::WrongPublicKeyPurposeError; +pub use crate::errors::consensus::signature::basic_bls_error::BasicBLSError; +pub use crate::errors::consensus::signature::basic_ecdsa_error::BasicECDSAError; +pub use crate::errors::consensus::signature::identity_not_found_error::IdentityNotFoundError; +pub use crate::errors::consensus::signature::invalid_identity_public_key_type_error::InvalidIdentityPublicKeyTypeError; +pub use crate::errors::consensus::signature::invalid_signature_public_key_purpose_error::InvalidSignaturePublicKeyPurposeError; +pub use crate::errors::consensus::signature::invalid_signature_public_key_security_level_error::InvalidSignaturePublicKeySecurityLevelError; +pub use crate::errors::consensus::signature::invalid_state_transition_signature_error::InvalidStateTransitionSignatureError; +pub use crate::errors::consensus::signature::missing_public_key_error::MissingPublicKeyError; +pub use crate::errors::consensus::signature::public_key_is_disabled_error::PublicKeyIsDisabledError; +pub use crate::errors::consensus::signature::public_key_security_level_not_met_error::PublicKeySecurityLevelNotMetError; +pub use crate::errors::consensus::signature::signature_error::SignatureError; +pub use crate::errors::consensus::signature::signature_should_not_be_present_error::SignatureShouldNotBePresentError; +pub use crate::errors::consensus::signature::wrong_public_key_purpose_error::WrongPublicKeyPurposeError; diff --git a/packages/rs-dpp/src/errors/consensus/signature/public_key_is_disabled_error.rs b/packages/rs-dpp/src/errors/consensus/signature/public_key_is_disabled_error.rs index 16408ff1586..1c7d64291c2 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/public_key_is_disabled_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/public_key_is_disabled_error.rs @@ -1,9 +1,9 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use bincode::{Decode, Encode}; @@ -13,13 +13,14 @@ use bincode::{Decode, Encode}; )] #[error("Identity key {public_key_id} is disabled")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeyIsDisabledError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_id: KeyID, + pub public_key_id: KeyID, } impl PublicKeyIsDisabledError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/public_key_security_level_not_met_error.rs b/packages/rs-dpp/src/errors/consensus/signature/public_key_security_level_not_met_error.rs index 96382271ef8..fb552ccb0d1 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/public_key_security_level_not_met_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/public_key_security_level_not_met_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::SecurityLevel; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::SecurityLevel; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,14 +14,15 @@ use bincode::{Decode, Encode}; )] #[error("Invalid security level {public_key_security_level}. This state transition requires at least {required_security_level}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeySecurityLevelNotMetError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_security_level: SecurityLevel, - required_security_level: SecurityLevel, + pub public_key_security_level: SecurityLevel, + pub required_security_level: SecurityLevel, } impl PublicKeySecurityLevelNotMetError { diff --git a/packages/rs-dpp/src/errors/consensus/signature/signature_error.rs b/packages/rs-dpp/src/errors/consensus/signature/signature_error.rs index f4d9811f099..28980b7734b 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/signature_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/signature_error.rs @@ -1,20 +1,21 @@ -use crate::consensus::signature::{ +use crate::errors::consensus::signature::{ BasicBLSError, BasicECDSAError, IdentityNotFoundError, InvalidIdentityPublicKeyTypeError, InvalidSignaturePublicKeySecurityLevelError, InvalidStateTransitionSignatureError, MissingPublicKeyError, PublicKeyIsDisabledError, PublicKeySecurityLevelNotMetError, SignatureShouldNotBePresentError, WrongPublicKeyPurposeError, }; -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use bincode::{Decode, Encode}; use thiserror::Error; -use crate::consensus::signature::invalid_signature_public_key_purpose_error::InvalidSignaturePublicKeyPurposeError; +use crate::errors::consensus::signature::invalid_signature_public_key_purpose_error::InvalidSignaturePublicKeyPurposeError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; #[derive( Error, Debug, PartialEq, Encode, Decode, PlatformSerialize, PlatformDeserialize, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum SignatureError { /* diff --git a/packages/rs-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs b/packages/rs-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs index f96c9d05a84..962d5d727dd 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,8 +20,9 @@ use bincode::{Decode, Encode}; )] #[error("signature should be empty {message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SignatureShouldNotBePresentError { - message: String, + pub message: String, } /* diff --git a/packages/rs-dpp/src/errors/consensus/signature/wrong_public_key_purpose_error.rs b/packages/rs-dpp/src/errors/consensus/signature/wrong_public_key_purpose_error.rs index 4ea2b0c246c..26cec2503c2 100644 --- a/packages/rs-dpp/src/errors/consensus/signature/wrong_public_key_purpose_error.rs +++ b/packages/rs-dpp/src/errors/consensus/signature/wrong_public_key_purpose_error.rs @@ -1,8 +1,8 @@ use thiserror::Error; -use crate::consensus::signature::signature_error::SignatureError; -use crate::consensus::ConsensusError; -use crate::identity::Purpose; +use crate::errors::consensus::signature::signature_error::SignatureError; +use crate::errors::consensus::ConsensusError; +use crate::identity::identity_public_key::Purpose; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,14 +15,15 @@ use itertools::Itertools; )] #[error("Invalid identity key purpose {public_key_purpose}. This state transition requires {}", allowed_key_purposes.iter().map(|s| s.to_string()).join(" | "))] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct WrongPublicKeyPurposeError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_purpose: Purpose, - allowed_key_purposes: Vec, + pub public_key_purpose: Purpose, + pub allowed_key_purposes: Vec, } impl WrongPublicKeyPurposeError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs index a24ee194136..b7e963db597 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Data Contract {data_contract_id} is already present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractAlreadyPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractAlreadyPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs index 19ad1b90754..08bf4d8ec65 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Can't update Data Contract {data_contract_id} config: {additional_message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractConfigUpdateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - additional_message: String, + pub data_contract_id: Identifier, + pub additional_message: String, } impl DataContractConfigUpdateError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs index fded770a5fc..afa5b18c525 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Can't update document schemas in the Data Contract {data_contract_id}: Data Contract is readonly")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractIsReadonlyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractIsReadonlyError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_not_found_error.rs index 1f11adbf086..e30b8845aa6 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[platform_serialize(unversioned)] #[error("Data contract not found for id: {data_contract_id}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractNotFoundError { - data_contract_id: Identifier, + pub data_contract_id: Identifier, } impl DataContractNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_action_not_allowed_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_action_not_allowed_error.rs index 0064bc5923a..fd0e51d355a 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_action_not_allowed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_action_not_allowed_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Action '{action}' is not allowed on Data Contract {data_contract_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractUpdateActionNotAllowedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - action: String, + pub data_contract_id: Identifier, + pub action: String, } impl DataContractUpdateActionNotAllowedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs index 73cafe6de32..a64dd1fd8d4 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -13,14 +13,15 @@ use thiserror::Error; "Identity {identity_id} doesn't have permissions to update Data Contract {data_contract_id}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractUpdatePermissionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - identity_id: Identifier, + pub data_contract_id: Identifier, + pub identity_id: Identifier, } impl DataContractUpdatePermissionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_contract/document_type_update_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_contract/document_type_update_error.rs index a18c21f0c71..eb06033f21e 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_contract/document_type_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_contract/document_type_update_error.rs @@ -1,11 +1,10 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; use thiserror::Error; - #[derive( Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] @@ -13,15 +12,16 @@ use thiserror::Error; "Can't update Document Type {data_contract_id}::{document_type_name}: {additional_message}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTypeUpdateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - document_type_name: String, - additional_message: String, + pub data_contract_id: Identifier, + pub document_type_name: String, + pub additional_message: String, } impl DocumentTypeUpdateError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_condition_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_condition_error.rs index 9f0c216588e..4ea8672aae0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_condition_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_condition_error.rs @@ -1,11 +1,11 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; use thiserror::Error; -use crate::consensus::state::data_trigger::DataTriggerError; +use crate::errors::consensus::state::data_trigger::DataTriggerError; use bincode::{Decode, Encode}; #[derive( @@ -13,15 +13,16 @@ use bincode::{Decode, Encode}; )] #[error("{message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataTriggerConditionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - document_id: Identifier, - message: String, + pub data_contract_id: Identifier, + pub document_id: Identifier, + pub message: String, } impl DataTriggerConditionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_execution_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_execution_error.rs index f8bc1b46cf2..85fc35f8888 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_execution_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_execution_error.rs @@ -1,11 +1,11 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; use thiserror::Error; -use crate::consensus::state::data_trigger::DataTriggerError; +use crate::errors::consensus::state::data_trigger::DataTriggerError; use bincode::{Decode, Encode}; #[derive( @@ -13,15 +13,16 @@ use bincode::{Decode, Encode}; )] #[error("{message}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataTriggerExecutionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - document_id: Identifier, - message: String, + pub data_contract_id: Identifier, + pub document_id: Identifier, + pub message: String, } impl DataTriggerExecutionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_invalid_result_error.rs b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_invalid_result_error.rs index 35f06d3ff93..40d1e477951 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_invalid_result_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_trigger/data_trigger_invalid_result_error.rs @@ -1,11 +1,11 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; use thiserror::Error; -use crate::consensus::state::data_trigger::DataTriggerError; +use crate::errors::consensus::state::data_trigger::DataTriggerError; use bincode::{Decode, Encode}; #[derive( @@ -13,14 +13,15 @@ use bincode::{Decode, Encode}; )] #[error("Data trigger have not returned any result")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataTriggerInvalidResultError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - data_contract_id: Identifier, - document_id: Identifier, + pub data_contract_id: Identifier, + pub document_id: Identifier, } impl DataTriggerInvalidResultError { diff --git a/packages/rs-dpp/src/errors/consensus/state/data_trigger/mod.rs b/packages/rs-dpp/src/errors/consensus/state/data_trigger/mod.rs index e43de444588..6baf990e2a5 100644 --- a/packages/rs-dpp/src/errors/consensus/state/data_trigger/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/state/data_trigger/mod.rs @@ -1,8 +1,8 @@ -use crate::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; -use crate::consensus::state::data_trigger::data_trigger_execution_error::DataTriggerExecutionError; -use crate::consensus::state::data_trigger::data_trigger_invalid_result_error::DataTriggerInvalidResultError; -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; +use crate::errors::consensus::state::data_trigger::data_trigger_execution_error::DataTriggerExecutionError; +use crate::errors::consensus::state::data_trigger::data_trigger_invalid_result_error::DataTriggerInvalidResultError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,6 +15,7 @@ pub mod data_trigger_invalid_result_error; #[derive( Error, Debug, PartialEq, Encode, Decode, PlatformSerialize, PlatformDeserialize, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataTriggerError { /* diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_already_present_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_already_present_error.rs index 05a91fd4e4c..d4f9d4a3118 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_already_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_already_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Document {document_id} is already present")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentAlreadyPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentAlreadyPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_currently_locked_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_currently_locked_error.rs index 289d21a357a..b010bc7980c 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_currently_locked_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_currently_locked_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::voting::vote_info_storage::contested_document_vote_poll_stored_info::ContestedDocumentVotePollStoredInfo; use crate::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; @@ -12,15 +12,16 @@ use thiserror::Error; )] #[error("Document Contest for vote_poll {vote_poll} is currently already locked {stored_info}, unlocking is possible by paying {unlock_cost} credits")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentContestCurrentlyLockedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - vote_poll: ContestedDocumentResourceVotePoll, - stored_info: ContestedDocumentVotePollStoredInfo, - unlock_cost: u64, + pub vote_poll: ContestedDocumentResourceVotePoll, + pub stored_info: ContestedDocumentVotePollStoredInfo, + pub unlock_cost: u64, } impl DocumentContestCurrentlyLockedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_document_with_same_id_already_present_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_document_with_same_id_already_present_error.rs index 7ddd37b52f3..d53bea6fce3 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_document_with_same_id_already_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_document_with_same_id_already_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Document {document_id} is already present in a contest, entropy might be being reused")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentContestDocumentWithSameIdAlreadyPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentContestDocumentWithSameIdAlreadyPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_identity_already_contestant.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_identity_already_contestant.rs index 1f2cf0a14dc..f7a71f13c0b 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_identity_already_contestant.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_identity_already_contestant.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; use bincode::{Decode, Encode}; @@ -14,14 +14,15 @@ use thiserror::Error; "An Identity with the id {identity_id} is already a contestant for the vote_poll {vote_poll}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentContestIdentityAlreadyContestantError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - vote_poll: ContestedDocumentResourceVotePoll, - identity_id: Identifier, + pub vote_poll: ContestedDocumentResourceVotePoll, + pub identity_id: Identifier, } impl DocumentContestIdentityAlreadyContestantError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_joinable_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_joinable_error.rs index 01abd52d675..5f4265c9a35 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_joinable_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_joinable_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::prelude::TimestampMillis; use crate::voting::vote_info_storage::contested_document_vote_poll_stored_info::ContestedDocumentVotePollStoredInfo; @@ -13,17 +13,18 @@ use thiserror::Error; )] #[error("Document Contest for vote_poll {vote_poll} is not joinable {stored_info}, it started {start_time} and it is now {current_time}, and you can only join for {joinable_time}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentContestNotJoinableError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - vote_poll: ContestedDocumentResourceVotePoll, - stored_info: ContestedDocumentVotePollStoredInfo, - start_time: TimestampMillis, - current_time: TimestampMillis, - joinable_time: TimestampMillis, + pub vote_poll: ContestedDocumentResourceVotePoll, + pub stored_info: ContestedDocumentVotePollStoredInfo, + pub start_time: TimestampMillis, + pub current_time: TimestampMillis, + pub joinable_time: TimestampMillis, } impl DocumentContestNotJoinableError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_paid_for_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_paid_for_error.rs index 9e6138c7a5d..5716fd2b6a5 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_paid_for_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_contest_not_paid_for_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::balances::credits::Credits; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::fee::Credits; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -12,17 +12,18 @@ use thiserror::Error; )] #[error("Contest for document {document_id} was not paid for, needs payment of {expected_amount} Credits")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentContestNotPaidForError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, - expected_amount: Credits, + pub expected_amount: Credits, - paid_amount: Credits, + pub paid_amount: Credits, } impl DocumentContestNotPaidForError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_incorrect_purchase_price_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_incorrect_purchase_price_error.rs index 5e726c5cbef..eb20fe897c6 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_incorrect_purchase_price_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_incorrect_purchase_price_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::balances::credits::Credits; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::fee::Credits; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -12,17 +12,18 @@ use thiserror::Error; )] #[error("{document_id} document can not be purchased for {trying_to_purchase_at_price}, it's sale price is {actual_price} (in credits)")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentIncorrectPurchasePriceError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, - trying_to_purchase_at_price: Credits, + pub trying_to_purchase_at_price: Credits, - actual_price: Credits, + pub actual_price: Credits, } impl DocumentIncorrectPurchasePriceError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_not_for_sale_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_not_for_sale_error.rs index 1304477355f..2579dadf56a 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_not_for_sale_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_not_for_sale_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("{document_id} document not for sale")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentNotForSaleError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentNotForSaleError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_not_found_error.rs index 81f284a70c6..67306ddba24 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("{document_id} document not found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs index ee71485e4c5..030a3028cf0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,15 +11,16 @@ use thiserror::Error; )] #[error("Provided document {document_id} owner ID {document_owner_id} mismatch with existing {existing_document_owner_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentOwnerIdMismatchError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, - document_owner_id: Identifier, - existing_document_owner_id: Identifier, + pub document_id: Identifier, + pub document_owner_id: Identifier, + pub existing_document_owner_id: Identifier, } impl DocumentOwnerIdMismatchError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs index 174bc1243d6..9910c0b99f5 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,17 +11,18 @@ use thiserror::Error; )] #[error("Document {document_id} {timestamp_name} timestamp {timestamp} are out of block time window from {time_window_start} and {time_window_end}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTimestampWindowViolationError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - timestamp_name: String, - document_id: Identifier, - timestamp: i64, - time_window_start: i64, - time_window_end: i64, + pub timestamp_name: String, + pub document_id: Identifier, + pub timestamp: i64, + pub time_window_start: i64, + pub time_window_end: i64, } impl DocumentTimestampWindowViolationError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs index 5ee92b503a6..a12d8671cf9 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Document {document_id} createdAt and updatedAt should not be equal")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTimestampsAreEqualError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentTimestampsAreEqualError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs index 5ccf950b2b5..8047bf48646 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Document {document_id} createdAt and updatedAt timestamps are not equal")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTimestampsMismatchError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, + pub document_id: Identifier, } impl DocumentTimestampsMismatchError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs index 60b704b4b2b..63fa361cca2 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,14 +11,15 @@ use thiserror::Error; )] #[error("Document {document_id} has duplicate unique properties {duplicating_properties:?} with other documents")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicateUniqueIndexError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, - duplicating_properties: Vec, + pub document_id: Identifier, + pub duplicating_properties: Vec, } impl DuplicateUniqueIndexError { diff --git a/packages/rs-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs b/packages/rs-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs index ea88528c893..4c19e063224 100644 --- a/packages/rs-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::prelude::Revision; use bincode::{Decode, Encode}; @@ -14,15 +14,16 @@ use thiserror::Error; "Document {document_id} has invalid revision {previous_revision:?}. The desired revision is {desired_revision}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidDocumentRevisionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - document_id: Identifier, - previous_revision: Option, - desired_revision: Revision, + pub document_id: Identifier, + pub previous_revision: Option, + pub desired_revision: Revision, } impl InvalidDocumentRevisionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_completed_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_completed_error.rs index 2d700d72a3f..f8bb22242b0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_completed_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_completed_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -16,10 +16,11 @@ use thiserror::Error; action_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupActionAlreadyCompletedError { - data_contract_id: Identifier, - group_contract_position: GroupContractPosition, - action_id: Identifier, + pub data_contract_id: Identifier, + pub group_contract_position: GroupContractPosition, + pub action_id: Identifier, } impl GroupActionAlreadyCompletedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_signed_by_identity_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_signed_by_identity_error.rs index 1fcdbf0419c..1fe340c4d2d 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_signed_by_identity_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/group_action_already_signed_by_identity_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -18,11 +18,12 @@ use thiserror::Error; group_contract_position )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupActionAlreadySignedByIdentityError { - identity_id: Identifier, - data_contract_id: Identifier, - group_contract_position: GroupContractPosition, - action_id: Identifier, + pub identity_id: Identifier, + pub data_contract_id: Identifier, + pub group_contract_position: GroupContractPosition, + pub action_id: Identifier, } impl GroupActionAlreadySignedByIdentityError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/group_action_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/group_action_does_not_exist_error.rs index c57af3cc4d2..4c97896d47f 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/group_action_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/group_action_does_not_exist_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -17,10 +17,11 @@ use thiserror::Error; action_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupActionDoesNotExistError { - data_contract_id: Identifier, - group_contract_position: GroupContractPosition, - action_id: Identifier, + pub data_contract_id: Identifier, + pub group_contract_position: GroupContractPosition, + pub action_id: Identifier, } impl GroupActionDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/identity_for_group_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/identity_for_group_not_found_error.rs index bbede322c3b..2393d432eb0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/identity_for_group_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/identity_for_group_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,10 +11,11 @@ use thiserror::Error; )] #[error("identity {member_id} was not found in group at position {group_position} in contract {contract_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityMemberOfGroupNotFoundError { - contract_id: Identifier, - group_position: u16, - member_id: Identifier, + pub contract_id: Identifier, + pub group_position: u16, + pub member_id: Identifier, } impl IdentityMemberOfGroupNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/identity_not_member_of_group_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/identity_not_member_of_group_error.rs index afd5bf06ffb..8525c8c0045 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/identity_not_member_of_group_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/identity_not_member_of_group_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -17,10 +17,11 @@ use thiserror::Error; group_contract_position )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityNotMemberOfGroupError { - identity_id: Identifier, - data_contract_id: Identifier, - group_contract_position: GroupContractPosition, + pub identity_id: Identifier, + pub data_contract_id: Identifier, + pub group_contract_position: GroupContractPosition, } impl IdentityNotMemberOfGroupError { diff --git a/packages/rs-dpp/src/errors/consensus/state/group/mod.rs b/packages/rs-dpp/src/errors/consensus/state/group/mod.rs index 9c1a52c1b79..338553f6011 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/mod.rs @@ -1,14 +1,14 @@ -mod group_action_already_completed_error; -mod group_action_already_signed_by_identity_error; -mod group_action_does_not_exist_error; -mod identity_not_member_of_group_error; +pub mod group_action_already_completed_error; +pub mod group_action_already_signed_by_identity_error; +pub mod group_action_does_not_exist_error; +pub mod identity_not_member_of_group_error; -mod identity_for_group_not_found_error; -mod modification_of_group_action_main_parameters_not_permitted_error; +pub mod identity_for_group_not_found_error; +pub mod modification_of_group_action_main_parameters_not_permitted_error; -pub use group_action_already_completed_error::*; -pub use group_action_already_signed_by_identity_error::*; -pub use group_action_does_not_exist_error::*; -pub use identity_for_group_not_found_error::*; -pub use identity_not_member_of_group_error::*; -pub use modification_of_group_action_main_parameters_not_permitted_error::*; +pub use group_action_already_completed_error::GroupActionAlreadyCompletedError; +pub use group_action_already_signed_by_identity_error::GroupActionAlreadySignedByIdentityError; +pub use group_action_does_not_exist_error::GroupActionDoesNotExistError; +pub use identity_for_group_not_found_error::IdentityMemberOfGroupNotFoundError; +pub use identity_not_member_of_group_error::IdentityNotMemberOfGroupError; +pub use modification_of_group_action_main_parameters_not_permitted_error::ModificationOfGroupActionMainParametersNotPermittedError; diff --git a/packages/rs-dpp/src/errors/consensus/state/group/modification_of_group_action_main_parameters_not_permitted_error.rs b/packages/rs-dpp/src/errors/consensus/state/group/modification_of_group_action_main_parameters_not_permitted_error.rs index ff710ddb376..62cd97bb411 100644 --- a/packages/rs-dpp/src/errors/consensus/state/group/modification_of_group_action_main_parameters_not_permitted_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/group/modification_of_group_action_main_parameters_not_permitted_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,10 +15,11 @@ use thiserror::Error; Modified event type: {modified}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ModificationOfGroupActionMainParametersNotPermittedError { - original: String, - modified: String, - changed_internal_fields: Vec, + pub original: String, + pub modified: String, + pub changed_internal_fields: Vec, } impl ModificationOfGroupActionMainParametersNotPermittedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs index a4903455884..32f1bd9f4e2 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Duplicated public keys ids {duplicated_ids:?} found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicatedIdentityPublicKeyIdStateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - duplicated_ids: Vec, + pub duplicated_ids: Vec, } impl DuplicatedIdentityPublicKeyIdStateError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs index f8631cb2e86..22d36ae2663 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Duplicated public keys {duplicated_public_key_ids:?} found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DuplicatedIdentityPublicKeyStateError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - duplicated_public_key_ids: Vec, + pub duplicated_public_key_ids: Vec, } impl DuplicatedIdentityPublicKeyStateError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs index b07f91df7a2..c3dcf5b4a56 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity {identity_id:?} already exists")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityAlreadyExistsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, + pub identity_id: Identifier, } impl IdentityAlreadyExistsError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_for_token_configuration_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_for_token_configuration_not_found_error.rs index 374a33f56b8..590613e1819 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_for_token_configuration_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_for_token_configuration_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -8,6 +8,7 @@ use thiserror::Error; #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenConfigurationIdentityContext { ChangeControlRule(String), DefaultMintingRecipient, @@ -20,11 +21,12 @@ pub enum TokenConfigurationIdentityContext { )] #[error("Identity {identity_id} required in token position {token_position} of contract {contract_id} for {context:?} does not exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityInTokenConfigurationNotFoundError { - contract_id: Identifier, - token_position: u16, - context: TokenConfigurationIdentityContext, - identity_id: Identifier, + pub contract_id: Identifier, + pub token_position: u16, + pub context: TokenConfigurationIdentityContext, + pub identity_id: Identifier, } impl IdentityInTokenConfigurationNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_insufficient_balance_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_insufficient_balance_error.rs index 0d308f7981a..e41181b02e3 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_insufficient_balance_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_insufficient_balance_error.rs @@ -1,11 +1,10 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; -use crate::prelude::Identifier; - use bincode::{Decode, Encode}; #[derive( @@ -13,6 +12,7 @@ use bincode::{Decode, Encode}; )] #[error("Insufficient identity {identity_id} balance {balance} required {required_balance}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityInsufficientBalanceError { /* diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_already_exists_for_unique_contract_bounds_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_already_exists_for_unique_contract_bounds_error.rs index ec206efcac6..aef9c15ec6d 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_already_exists_for_unique_contract_bounds_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_already_exists_for_unique_contract_bounds_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::{KeyID, Purpose}; +use crate::identity::identity_public_key::{KeyID, Purpose}; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -12,21 +12,22 @@ use thiserror::Error; )] #[error("Identity Public Key with id {new_key_id} for identity {identity_id:?} conflicts for purpose {purpose} with key {old_key_id} in the contract bounds of {contract_id:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, + pub identity_id: Identifier, - contract_id: Identifier, + pub contract_id: Identifier, - purpose: Purpose, + pub purpose: Purpose, - new_key_id: KeyID, + pub new_key_id: KeyID, - old_key_id: KeyID, + pub old_key_id: KeyID, } impl IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs index efbaff0629d..d35cdfa4048 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity Public Key #{public_key_index} is disabled")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityPublicKeyIsDisabledError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_index: KeyID, + pub public_key_index: KeyID, } impl IdentityPublicKeyIsDisabledError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs index d60d5250b0e..caad27ca7cf 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity Public Key #{public_key_index} is read only")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityPublicKeyIsReadOnlyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - public_key_index: KeyID, + pub public_key_index: KeyID, } impl IdentityPublicKeyIsReadOnlyError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/identity_to_freeze_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/identity_to_freeze_does_not_exist_error.rs index 6e5f1d9aedd..f67563c9d2b 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/identity_to_freeze_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/identity_to_freeze_does_not_exist_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Identity to freeze {} does not exist", identity_to_freeze_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityToFreezeDoesNotExistError { - identity_to_freeze_id: Identifier, + pub identity_to_freeze_id: Identifier, } impl IdentityToFreezeDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs index 39bbbfaaaf5..c8e52a58aae 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs @@ -1,19 +1,20 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; // needed for PlatformDeserialize and PlatformSerialize use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use std::fmt::{Display, Formatter}; use thiserror::Error; -use crate::prelude::{Identifier, IdentityNonce}; +use crate::prelude::IdentityNonce; use crate::identity::identity_nonce::MergeIdentityNonceResult; use bincode::{Decode, Encode}; - +use platform_value::Identifier; #[derive( Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityNonceError { /* diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs index 8e6171579bf..22533ecfaba 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity Public Key with Id {id} does not exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityPublicKeyIdError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - id: KeyID, + pub id: KeyID, } impl InvalidIdentityPublicKeyIdError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs index 1deb1de9aca..50b2a2af094 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs @@ -1,10 +1,11 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; -use crate::prelude::{Identifier, Revision}; +use crate::prelude::Revision; use bincode::{Decode, Encode}; @@ -13,14 +14,15 @@ use bincode::{Decode, Encode}; )] #[error("Identity {identity_id} has invalid revision. The current revision is {current_revision}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityRevisionError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, - current_revision: Revision, + pub identity_id: Identifier, + pub current_revision: Revision, } impl InvalidIdentityRevisionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/master_public_key_update_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/master_public_key_update_error.rs index bde78547a79..bd67ced6134 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/master_public_key_update_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/master_public_key_update_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -20,10 +20,11 @@ use bincode::{Decode, Encode}; )] #[error("Failed to update the master public key: {description}. Ensure the operation is valid and permissible under current system rules.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasterPublicKeyUpdateError { - adding: usize, - removing: usize, - description: String, + pub adding: usize, + pub removing: usize, + pub description: String, } /* diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs index f33d5b32c93..8aad3113d09 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -10,13 +10,14 @@ use thiserror::Error; )] #[error("Identity cannot contain more than {max_items} public keys")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MaxIdentityPublicKeyLimitReachedError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - max_items: usize, + pub max_items: usize, } impl MaxIdentityPublicKeyLimitReachedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs index 25ac3bd2763..e5b66685ee5 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity Public Key with Ids {} do not exist", ids.iter().map(|id| id.to_string()).collect::>().join(", "))] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingIdentityPublicKeyIdsError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - ids: Vec, + pub ids: Vec, } impl MissingIdentityPublicKeyIdsError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/missing_transfer_key_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/missing_transfer_key_error.rs index 2f14ccacbce..adc9806d5e1 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/missing_transfer_key_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/missing_transfer_key_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Identity {identity_id} does not have a key for transferring funds")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MissingTransferKeyError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, + pub identity_id: Identifier, } impl MissingTransferKeyError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/mod.rs b/packages/rs-dpp/src/errors/consensus/state/identity/mod.rs index 9622475f272..300d301cd9f 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/mod.rs @@ -1,10 +1,10 @@ -pub use identity_already_exists_error::*; -pub use identity_insufficient_balance_error::*; +pub use identity_already_exists_error::IdentityAlreadyExistsError; +pub use identity_insufficient_balance_error::IdentityInsufficientBalanceError; pub mod duplicated_identity_public_key_id_state_error; pub mod duplicated_identity_public_key_state_error; -mod identity_already_exists_error; -mod identity_insufficient_balance_error; +pub mod identity_already_exists_error; +pub mod identity_insufficient_balance_error; pub mod identity_public_key_already_exists_for_unique_contract_bounds_error; pub mod identity_public_key_is_disabled_error; pub mod identity_public_key_is_read_only_error; @@ -19,6 +19,6 @@ pub mod no_transfer_key_for_core_withdrawal_available_error; pub mod identity_for_token_configuration_not_found_error; pub mod identity_to_freeze_does_not_exist_error; -mod recipient_identity_does_not_exist_error; +pub mod recipient_identity_does_not_exist_error; -pub use recipient_identity_does_not_exist_error::*; +pub use recipient_identity_does_not_exist_error::RecipientIdentityDoesNotExistError; diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/no_transfer_key_for_core_withdrawal_available_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/no_transfer_key_for_core_withdrawal_available_error.rs index 77f5d52305a..2ebd021df08 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/no_transfer_key_for_core_withdrawal_available_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/no_transfer_key_for_core_withdrawal_available_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("There is no transfer key that can be used for a withdrawal")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NoTransferKeyForCoreWithdrawalAvailableError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - identity_id: Identifier, + pub identity_id: Identifier, } impl NoTransferKeyForCoreWithdrawalAvailableError { diff --git a/packages/rs-dpp/src/errors/consensus/state/identity/recipient_identity_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/identity/recipient_identity_does_not_exist_error.rs index dc6a838f76f..1ee88d3d95e 100644 --- a/packages/rs-dpp/src/errors/consensus/state/identity/recipient_identity_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/identity/recipient_identity_does_not_exist_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Recipient identity {} does not exist", recipient_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct RecipientIdentityDoesNotExistError { - recipient_id: Identifier, + pub recipient_id: Identifier, } impl RecipientIdentityDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_insufficient_error.rs b/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_insufficient_error.rs index 05bbb113249..b7052124a11 100644 --- a/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_insufficient_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_insufficient_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::prelude::Identifier; +use platform_value::Identifier; use bincode::{Decode, Encode}; @@ -15,6 +15,7 @@ use bincode::{Decode, Encode}; "Insufficient specialized balance {balance_id} balance {balance} required {required_balance}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PrefundedSpecializedBalanceInsufficientError { /* diff --git a/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_not_found_error.rs index bf8f4bc1002..52f81caf7fa 100644 --- a/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/prefunded_specialized_balances/prefunded_specialized_balance_not_found_error.rs @@ -1,10 +1,10 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::prelude::Identifier; +use platform_value::Identifier; use bincode::{Decode, Encode}; @@ -13,6 +13,7 @@ use bincode::{Decode, Encode}; )] #[error("Did not find a specialized balance with id: {balance_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PrefundedSpecializedBalanceNotFoundError { /* diff --git a/packages/rs-dpp/src/errors/consensus/state/state_error.rs b/packages/rs-dpp/src/errors/consensus/state/state_error.rs index 2ca6422d827..4216dc227aa 100644 --- a/packages/rs-dpp/src/errors/consensus/state/state_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/state_error.rs @@ -3,61 +3,91 @@ use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; -use crate::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; -use crate::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; -use crate::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; -use crate::consensus::state::data_trigger::DataTriggerError; -use crate::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; -use crate::consensus::state::document::document_not_found_error::DocumentNotFoundError; -use crate::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; -use crate::consensus::state::document::document_timestamp_window_violation_error::DocumentTimestampWindowViolationError; -use crate::consensus::state::document::document_timestamps_mismatch_error::DocumentTimestampsMismatchError; -use crate::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; -use crate::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; -use crate::consensus::state::identity::duplicated_identity_public_key_id_state_error::DuplicatedIdentityPublicKeyIdStateError; -use crate::consensus::state::identity::duplicated_identity_public_key_state_error::DuplicatedIdentityPublicKeyStateError; -use crate::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; -use crate::consensus::state::identity::identity_public_key_is_read_only_error::IdentityPublicKeyIsReadOnlyError; -use crate::consensus::state::identity::invalid_identity_public_key_id_error::InvalidIdentityPublicKeyIdError; -use crate::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; -use crate::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; -use crate::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; -use crate::consensus::state::identity::{IdentityAlreadyExistsError, IdentityInsufficientBalanceError, RecipientIdentityDoesNotExistError}; -use crate::consensus::ConsensusError; -use crate::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; -use crate::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; -use crate::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; -use crate::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; -use crate::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; -use crate::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; -use crate::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; -use crate::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; -use crate::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; -use crate::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; -use crate::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; -use crate::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionAlreadySignedByIdentityError, GroupActionDoesNotExistError, IdentityMemberOfGroupNotFoundError, IdentityNotMemberOfGroupError, ModificationOfGroupActionMainParametersNotPermittedError}; -use crate::consensus::state::identity::identity_for_token_configuration_not_found_error::IdentityInTokenConfigurationNotFoundError; -use crate::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; -use crate::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; -use crate::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; -use crate::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; -use crate::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; -use crate::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; -use crate::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; -use crate::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountFrozenError, IdentityTokenAccountNotFrozenError, InvalidGroupPositionError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, NewTokensDestinationIdentityDoesNotExistError, TokenMintPastMaxSupplyError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, UnauthorizedTokenActionError, IdentityTokenAccountAlreadyFrozenError, TokenAlreadyPausedError, TokenIsPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, PreProgrammedDistributionTimestampInPastError, TokenTransferRecipientIdentityNotExistError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError, IdentityTryingToPayWithWrongTokenError, TokenDirectPurchaseUserPriceTooLow, TokenAmountUnderMinimumSaleAmount, TokenNotForDirectSale, InvalidTokenPositionStateError}; -use crate::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; -use crate::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; -use crate::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; -use crate::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; -use crate::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; -use crate::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; -use crate::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; - -use super::document::document_timestamps_are_equal_error::DocumentTimestampsAreEqualError; +use crate::errors::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; +use crate::errors::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; +use crate::errors::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; +#[cfg(feature = "state-transition-validation")] +use crate::errors::consensus::state::data_trigger::DataTriggerError; +use crate::errors::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; +use crate::errors::consensus::state::document::document_not_found_error::DocumentNotFoundError; +use crate::errors::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; +use crate::errors::consensus::state::document::document_timestamp_window_violation_error::DocumentTimestampWindowViolationError; +use crate::errors::consensus::state::document::document_timestamps_mismatch_error::DocumentTimestampsMismatchError; +use crate::errors::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; +use crate::errors::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; +use crate::errors::consensus::state::identity::duplicated_identity_public_key_id_state_error::DuplicatedIdentityPublicKeyIdStateError; +use crate::errors::consensus::state::identity::duplicated_identity_public_key_state_error::DuplicatedIdentityPublicKeyStateError; +use crate::errors::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; +use crate::errors::consensus::state::identity::identity_public_key_is_read_only_error::IdentityPublicKeyIsReadOnlyError; +use crate::errors::consensus::state::identity::invalid_identity_public_key_id_error::InvalidIdentityPublicKeyIdError; +use crate::errors::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; +use crate::errors::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; +use crate::errors::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; +use crate::errors::consensus::state::identity::{IdentityAlreadyExistsError, IdentityInsufficientBalanceError, RecipientIdentityDoesNotExistError}; +use crate::errors::consensus::ConsensusError; +use crate::errors::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; +use crate::errors::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; +use crate::errors::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; +use crate::errors::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; +use crate::errors::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; +use crate::errors::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; +use crate::errors::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; +use crate::errors::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; +use crate::errors::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; +use crate::errors::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; +use crate::errors::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; +use crate::errors::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionAlreadySignedByIdentityError, GroupActionDoesNotExistError, IdentityNotMemberOfGroupError, ModificationOfGroupActionMainParametersNotPermittedError}; +use crate::errors::consensus::state::group::identity_for_group_not_found_error::IdentityMemberOfGroupNotFoundError; +use crate::errors::consensus::state::identity::identity_for_token_configuration_not_found_error::IdentityInTokenConfigurationNotFoundError; +use crate::errors::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; +use crate::errors::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; +use crate::errors::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; +use crate::errors::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; +use crate::errors::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; +use crate::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; +use crate::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; +use crate::errors::consensus::state::token::identity_does_not_have_enough_token_balance_error::IdentityDoesNotHaveEnoughTokenBalanceError; +use crate::errors::consensus::state::token::identity_has_not_agreed_to_pay_required_token_amount_error::IdentityHasNotAgreedToPayRequiredTokenAmountError; +use crate::errors::consensus::state::token::identity_token_account_already_frozen_error::IdentityTokenAccountAlreadyFrozenError; +use crate::errors::consensus::state::token::identity_token_account_frozen_error::IdentityTokenAccountFrozenError; +use crate::errors::consensus::state::token::identity_token_account_not_frozen_error::IdentityTokenAccountNotFrozenError; +use crate::errors::consensus::state::token::identity_trying_to_pay_with_wrong_token_error::IdentityTryingToPayWithWrongTokenError; +use crate::errors::consensus::state::token::invalid_group_position_error::InvalidGroupPositionError; +use crate::errors::consensus::state::token::invalid_token_claim_no_current_rewards::InvalidTokenClaimNoCurrentRewards; +use crate::errors::consensus::state::token::invalid_token_claim_property_mismatch::InvalidTokenClaimPropertyMismatch; +use crate::errors::consensus::state::token::invalid_token_claim_wrong_claimant::InvalidTokenClaimWrongClaimant; +use crate::errors::consensus::state::token::invalid_token_position_error::InvalidTokenPositionStateError; +use crate::errors::consensus::state::token::new_authorized_action_taker_group_does_not_exist_error::NewAuthorizedActionTakerGroupDoesNotExistError; +use crate::errors::consensus::state::token::new_authorized_action_taker_identity_does_not_exist_error::NewAuthorizedActionTakerIdentityDoesNotExistError; +use crate::errors::consensus::state::token::new_authorized_action_taker_main_group_not_set_error::NewAuthorizedActionTakerMainGroupNotSetError; +use crate::errors::consensus::state::token::new_tokens_destination_identity_does_not_exist_error::NewTokensDestinationIdentityDoesNotExistError; +use crate::errors::consensus::state::token::pre_programmed_distribution_timestamp_in_past_error::PreProgrammedDistributionTimestampInPastError; +use crate::errors::consensus::state::token::required_token_payment_info_not_set_error::RequiredTokenPaymentInfoNotSetError; +use crate::errors::consensus::state::token::token_already_paused_error::TokenAlreadyPausedError; +use crate::errors::consensus::state::token::token_amount_under_minimum_sale_amount::TokenAmountUnderMinimumSaleAmount; +use crate::errors::consensus::state::token::token_direct_purchase_user_price_too_low::TokenDirectPurchaseUserPriceTooLow; +use crate::errors::consensus::state::token::token_is_paused_error::TokenIsPausedError; +use crate::errors::consensus::state::token::token_mint_past_max_supply_error::TokenMintPastMaxSupplyError; +use crate::errors::consensus::state::token::token_not_for_direct_sale::TokenNotForDirectSale; +use crate::errors::consensus::state::token::token_not_paused_error::TokenNotPausedError; +use crate::errors::consensus::state::token::token_setting_max_supply_to_less_than_current_supply_error::TokenSettingMaxSupplyToLessThanCurrentSupplyError; +use crate::errors::consensus::state::token::token_transfer_recipient_identity_not_exist_error::TokenTransferRecipientIdentityNotExistError; +use crate::errors::consensus::state::token::unauthorized_token_action_error::UnauthorizedTokenActionError; +use crate::errors::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; +use crate::errors::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; +use crate::errors::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; +use crate::errors::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; +use crate::errors::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; +use crate::errors::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; +use crate::errors::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; + +// use super::document::document_timestamps_are_equal_error::DocumentTimestampsAreEqualError; +use crate::errors::consensus::state::document::document_timestamps_are_equal_error::DocumentTimestampsAreEqualError; #[derive( Error, Debug, PartialEq, Encode, Decode, PlatformSerialize, PlatformDeserialize, Clone, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StateError { /* @@ -328,3 +358,57 @@ impl From for ConsensusError { Self::StateError(error) } } + +pub enum TestStateError { + Empty, + #[cfg(feature = "state-transition-validation")] + Conditional, +} + +#[cfg(feature = "ferment")] +pub mod fermented { + use ferment::{boxed, FFIConversionFrom, FFIConversionTo}; + + #[repr(C)] + #[derive(Clone)] + pub enum TestStateError { + Empty, + #[cfg(feature = "state-transition-validation")] + Conditional, + } + + impl FFIConversionFrom for TestStateError { + unsafe fn ffi_from_const(ffi: *const Self) -> super::TestStateError { + let ffi_ref = &*ffi; + match ffi_ref { + TestStateError::Empty => super::TestStateError::Empty, + #[cfg(feature = "state-transition-validation")] + TestStateError::Conditional => super::TestStateError::Conditional, + } + } + } + impl FFIConversionTo for TestStateError { + unsafe fn ffi_to_const(obj: super::TestStateError) -> *const Self { + boxed(match obj { + super::TestStateError::Empty => TestStateError::Empty, + #[cfg(feature = "state-transition-validation")] + super::TestStateError::Conditional => TestStateError::Conditional, + }) + } + } + + impl Drop for TestStateError { + fn drop(&mut self) {} + } + #[no_mangle] + pub unsafe extern "C" fn dpp_errors_consensus_state_state_error_TestStateError_Empty_ctor( + ) -> *mut TestStateError { + boxed(TestStateError::Empty) + } + #[cfg(feature = "state-transition-validation")] + #[no_mangle] + pub unsafe extern "C" fn dpp_errors_consensus_state_state_error_TestStateError_Conditional_ctor( + ) -> *mut TestStateError { + boxed(TestStateError::Conditional) + } +} diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_does_not_have_enough_token_balance_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_does_not_have_enough_token_balance_error.rs index ba1c5b7fd61..c8af551c10d 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_does_not_have_enough_token_balance_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_does_not_have_enough_token_balance_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -18,12 +18,13 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityDoesNotHaveEnoughTokenBalanceError { - token_id: Identifier, - identity_id: Identifier, - required_balance: u64, - actual_balance: u64, - action: String, + pub token_id: Identifier, + pub identity_id: Identifier, + pub required_balance: u64, + pub actual_balance: u64, + pub action: String, } impl IdentityDoesNotHaveEnoughTokenBalanceError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_has_not_agreed_to_pay_required_token_amount_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_has_not_agreed_to_pay_required_token_amount_error.rs index 1096cbf929e..147553f34dc 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_has_not_agreed_to_pay_required_token_amount_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_has_not_agreed_to_pay_required_token_amount_error.rs @@ -1,6 +1,6 @@ use crate::balances::credits::TokenAmount; -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -19,12 +19,13 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityHasNotAgreedToPayRequiredTokenAmountError { - token_id: Identifier, - required_amount: u64, - identity_min_offer: Option, - identity_max_offer: Option, - action: String, + pub token_id: Identifier, + pub required_amount: u64, + pub identity_min_offer: Option, + pub identity_max_offer: Option, + pub action: String, } impl IdentityHasNotAgreedToPayRequiredTokenAmountError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_already_frozen_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_already_frozen_error.rs index c894e465b70..b5e9c6aa9db 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_already_frozen_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_already_frozen_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -16,10 +16,11 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTokenAccountAlreadyFrozenError { - token_id: Identifier, - identity_id: Identifier, - action: String, + pub token_id: Identifier, + pub identity_id: Identifier, + pub action: String, } impl IdentityTokenAccountAlreadyFrozenError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_frozen_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_frozen_error.rs index 6d4a55e6092..b74f3919222 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_frozen_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_frozen_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -16,10 +16,11 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTokenAccountFrozenError { - token_id: Identifier, - identity_id: Identifier, - action: String, + pub token_id: Identifier, + pub identity_id: Identifier, + pub action: String, } impl IdentityTokenAccountFrozenError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_not_frozen_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_not_frozen_error.rs index 479fcc1a500..19dd3737ead 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_not_frozen_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_token_account_not_frozen_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -16,10 +16,11 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTokenAccountNotFrozenError { - token_id: Identifier, - identity_id: Identifier, - action: String, + pub token_id: Identifier, + pub identity_id: Identifier, + pub action: String, } impl IdentityTokenAccountNotFrozenError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/identity_trying_to_pay_with_wrong_token_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/identity_trying_to_pay_with_wrong_token_error.rs index 89e2e730562..33dc5af4653 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/identity_trying_to_pay_with_wrong_token_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/identity_trying_to_pay_with_wrong_token_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -8,14 +8,15 @@ use platform_value::Identifier; #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTryingToPayWithWrongTokenError { - expected_contract_id: Option, - expected_token_contract_position: TokenContractPosition, - expected_token_id: Identifier, + pub expected_contract_id: Option, + pub expected_token_contract_position: TokenContractPosition, + pub expected_token_id: Identifier, - actual_contract_id: Option, - actual_token_contract_position: TokenContractPosition, - actual_token_id: Identifier, + pub actual_contract_id: Option, + pub actual_token_contract_position: TokenContractPosition, + pub actual_token_id: Identifier, } impl IdentityTryingToPayWithWrongTokenError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/invalid_group_position_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/invalid_group_position_error.rs index e93459d0365..c0ed88726d4 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/invalid_group_position_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/invalid_group_position_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -18,9 +18,10 @@ use thiserror::Error; } )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidGroupPositionError { - max_group_position: Option, - invalid_group_position: GroupContractPosition, + pub max_group_position: Option, + pub invalid_group_position: GroupContractPosition, } impl InvalidGroupPositionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_no_current_rewards.rs b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_no_current_rewards.rs index 19e133903c0..0b7faf8a7a4 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_no_current_rewards.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_no_current_rewards.rs @@ -1,10 +1,10 @@ -use crate::prelude::Identifier; use crate::data_contract::associated_token::token_perpetual_distribution::reward_distribution_moment::RewardDistributionMoment; -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; #[derive( @@ -18,11 +18,12 @@ use thiserror::Error; last_claimed_moment.as_ref().map_or("Never claimed before".to_string(), |moment| moment.to_string()) )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenClaimNoCurrentRewards { - token_id: Identifier, - recipient_id: Identifier, - current_moment: RewardDistributionMoment, - last_claimed_moment: Option, + pub token_id: Identifier, + pub recipient_id: Identifier, + pub current_moment: RewardDistributionMoment, + pub last_claimed_moment: Option, } impl InvalidTokenClaimNoCurrentRewards { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_property_mismatch.rs b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_property_mismatch.rs index f6261f1e549..ad26ae7ab41 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_property_mismatch.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_property_mismatch.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use platform_value::Identifier; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -15,9 +15,10 @@ use thiserror::Error; token_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenClaimPropertyMismatch { - property: String, - token_id: Identifier, + pub property: String, + pub token_id: Identifier, } impl InvalidTokenClaimPropertyMismatch { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_wrong_claimant.rs b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_wrong_claimant.rs index 57e48ed141d..dfcaca14a48 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_wrong_claimant.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_claim_wrong_claimant.rs @@ -1,9 +1,9 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::prelude::Identifier; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_value::Identifier; use thiserror::Error; #[derive( @@ -16,10 +16,11 @@ use thiserror::Error; expected_claimant_id )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenClaimWrongClaimant { - token_id: Identifier, - expected_claimant_id: Identifier, - claimant_id: Identifier, + pub token_id: Identifier, + pub expected_claimant_id: Identifier, + pub claimant_id: Identifier, } impl InvalidTokenClaimWrongClaimant { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_position_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_position_error.rs index faac2df3c1c..814a4263d86 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_position_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/invalid_token_position_error.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use thiserror::Error; @@ -18,9 +18,10 @@ use thiserror::Error; } )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidTokenPositionStateError { - max_token_position: Option, - invalid_token_position: TokenContractPosition, + pub max_token_position: Option, + pub invalid_token_position: TokenContractPosition, } impl InvalidTokenPositionStateError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/mod.rs b/packages/rs-dpp/src/errors/consensus/state/token/mod.rs index adf7b6eb25b..00ed8eaf841 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/mod.rs @@ -1,55 +1,55 @@ -mod identity_does_not_have_enough_token_balance_error; -mod identity_has_not_agreed_to_pay_required_token_amount_error; -mod identity_token_account_already_frozen_error; -mod identity_token_account_frozen_error; -mod identity_token_account_not_frozen_error; -mod identity_trying_to_pay_with_wrong_token_error; -mod invalid_group_position_error; -mod invalid_token_claim_no_current_rewards; -mod invalid_token_claim_property_mismatch; -mod invalid_token_claim_wrong_claimant; -mod invalid_token_position_error; -mod new_authorized_action_taker_group_does_not_exist_error; -mod new_authorized_action_taker_identity_does_not_exist_error; -mod new_authorized_action_taker_main_group_not_set_error; -mod new_tokens_destination_identity_does_not_exist_error; -mod pre_programmed_distribution_timestamp_in_past_error; -mod required_token_payment_info_not_set_error; -mod token_already_paused_error; -mod token_amount_under_minimum_sale_amount; -mod token_direct_purchase_user_price_too_low; -mod token_is_paused_error; -mod token_mint_past_max_supply_error; -mod token_not_for_direct_sale; -mod token_not_paused_error; -mod token_setting_max_supply_to_less_than_current_supply_error; -mod token_transfer_recipient_identity_not_exist_error; -mod unauthorized_token_action_error; +pub mod identity_does_not_have_enough_token_balance_error; +pub mod identity_has_not_agreed_to_pay_required_token_amount_error; +pub mod identity_token_account_already_frozen_error; +pub mod identity_token_account_frozen_error; +pub mod identity_token_account_not_frozen_error; +pub mod identity_trying_to_pay_with_wrong_token_error; +pub mod invalid_group_position_error; +pub mod invalid_token_claim_no_current_rewards; +pub mod invalid_token_claim_property_mismatch; +pub mod invalid_token_claim_wrong_claimant; +pub mod invalid_token_position_error; +pub mod new_authorized_action_taker_group_does_not_exist_error; +pub mod new_authorized_action_taker_identity_does_not_exist_error; +pub mod new_authorized_action_taker_main_group_not_set_error; +pub mod new_tokens_destination_identity_does_not_exist_error; +pub mod pre_programmed_distribution_timestamp_in_past_error; +pub mod required_token_payment_info_not_set_error; +pub mod token_already_paused_error; +pub mod token_amount_under_minimum_sale_amount; +pub mod token_direct_purchase_user_price_too_low; +pub mod token_is_paused_error; +pub mod token_mint_past_max_supply_error; +pub mod token_not_for_direct_sale; +pub mod token_not_paused_error; +pub mod token_setting_max_supply_to_less_than_current_supply_error; +pub mod token_transfer_recipient_identity_not_exist_error; +pub mod unauthorized_token_action_error; -pub use identity_does_not_have_enough_token_balance_error::*; +pub use identity_does_not_have_enough_token_balance_error::IdentityDoesNotHaveEnoughTokenBalanceError; pub use identity_has_not_agreed_to_pay_required_token_amount_error::*; -pub use identity_token_account_already_frozen_error::*; -pub use identity_token_account_frozen_error::*; -pub use identity_token_account_not_frozen_error::*; +pub use identity_token_account_already_frozen_error::IdentityTokenAccountAlreadyFrozenError; +pub use identity_token_account_frozen_error::IdentityTokenAccountFrozenError; +pub use identity_token_account_not_frozen_error::IdentityTokenAccountNotFrozenError; pub use identity_trying_to_pay_with_wrong_token_error::*; -pub use invalid_group_position_error::*; -pub use invalid_token_claim_no_current_rewards::*; -pub use invalid_token_claim_property_mismatch::*; -pub use invalid_token_claim_wrong_claimant::*; -pub use invalid_token_position_error::*; -pub use new_authorized_action_taker_group_does_not_exist_error::*; -pub use new_authorized_action_taker_identity_does_not_exist_error::*; -pub use new_authorized_action_taker_main_group_not_set_error::*; -pub use new_tokens_destination_identity_does_not_exist_error::*; +pub use invalid_group_position_error::InvalidGroupPositionError; +pub use invalid_token_claim_no_current_rewards::InvalidTokenClaimNoCurrentRewards; +pub use invalid_token_claim_property_mismatch::InvalidTokenClaimPropertyMismatch; +pub use invalid_token_claim_wrong_claimant::InvalidTokenClaimWrongClaimant; +pub use invalid_token_position_error::InvalidTokenPositionStateError; +pub use new_authorized_action_taker_group_does_not_exist_error::NewAuthorizedActionTakerGroupDoesNotExistError; +pub use new_authorized_action_taker_identity_does_not_exist_error::NewAuthorizedActionTakerIdentityDoesNotExistError; +pub use new_authorized_action_taker_main_group_not_set_error::NewAuthorizedActionTakerMainGroupNotSetError; +pub use new_tokens_destination_identity_does_not_exist_error::NewTokensDestinationIdentityDoesNotExistError; pub use pre_programmed_distribution_timestamp_in_past_error::*; pub use required_token_payment_info_not_set_error::*; -pub use token_already_paused_error::*; +pub use token_already_paused_error::TokenAlreadyPausedError; pub use token_amount_under_minimum_sale_amount::*; pub use token_direct_purchase_user_price_too_low::*; -pub use token_is_paused_error::*; -pub use token_mint_past_max_supply_error::*; +pub use token_is_paused_error::TokenIsPausedError; +pub use token_mint_past_max_supply_error::TokenMintPastMaxSupplyError; pub use token_not_for_direct_sale::*; -pub use token_not_paused_error::*; -pub use token_setting_max_supply_to_less_than_current_supply_error::*; +pub use token_not_paused_error::TokenNotPausedError; +pub use token_setting_max_supply_to_less_than_current_supply_error::TokenSettingMaxSupplyToLessThanCurrentSupplyError; pub use token_transfer_recipient_identity_not_exist_error::*; -pub use unauthorized_token_action_error::*; +pub use unauthorized_token_action_error::UnauthorizedTokenActionError; diff --git a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_group_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_group_does_not_exist_error.rs index 2ea523ddbbf..9251243634b 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_group_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_group_does_not_exist_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::GroupContractPosition; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("The specified new authorized action taker group {group_contract_position} does not exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NewAuthorizedActionTakerGroupDoesNotExistError { - group_contract_position: GroupContractPosition, + pub group_contract_position: GroupContractPosition, } impl NewAuthorizedActionTakerGroupDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_identity_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_identity_does_not_exist_error.rs index 9f02bc0117c..870c5310656 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_identity_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_identity_does_not_exist_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("The specified new authorized action taker identity {identity_id} does not exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NewAuthorizedActionTakerIdentityDoesNotExistError { - identity_id: Identifier, + pub identity_id: Identifier, } impl NewAuthorizedActionTakerIdentityDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_main_group_not_set_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_main_group_not_set_error.rs index db4e45c0af3..0d0c72de6f5 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_main_group_not_set_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/new_authorized_action_taker_main_group_not_set_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -12,6 +12,7 @@ use thiserror::Error; "The specified new authorized action taker main group is not set in the token configuration" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NewAuthorizedActionTakerMainGroupNotSetError {} impl Default for NewAuthorizedActionTakerMainGroupNotSetError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/new_tokens_destination_identity_does_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/new_tokens_destination_identity_does_not_exist_error.rs index ae18548891a..b1ea81b1207 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/new_tokens_destination_identity_does_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/new_tokens_destination_identity_does_not_exist_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("The specified new tokens destination identity {identity_id} does not exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct NewTokensDestinationIdentityDoesNotExistError { - identity_id: Identifier, + pub identity_id: Identifier, } impl NewTokensDestinationIdentityDoesNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/pre_programmed_distribution_timestamp_in_past_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/pre_programmed_distribution_timestamp_in_past_error.rs index 9b13ea8df43..44968004005 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/pre_programmed_distribution_timestamp_in_past_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/pre_programmed_distribution_timestamp_in_past_error.rs @@ -1,8 +1,8 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; use crate::identity::TimestampMillis; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -15,11 +15,12 @@ use thiserror::Error; "Pre-programmed token distribution time {pre_programmed_timestamp}ms is in the past for token {token_position} in data contract {data_contract_id}. Current block time is {current_timestamp}.", )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PreProgrammedDistributionTimestampInPastError { - data_contract_id: Identifier, - token_position: TokenContractPosition, - pre_programmed_timestamp: TimestampMillis, - current_timestamp: TimestampMillis, + pub data_contract_id: Identifier, + pub token_position: TokenContractPosition, + pub pre_programmed_timestamp: TimestampMillis, + pub current_timestamp: TimestampMillis, } impl PreProgrammedDistributionTimestampInPastError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/required_token_payment_info_not_set_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/required_token_payment_info_not_set_error.rs index f1a76fe8ab1..03281588c76 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/required_token_payment_info_not_set_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/required_token_payment_info_not_set_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -15,9 +15,10 @@ use thiserror::Error; action )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct RequiredTokenPaymentInfoNotSetError { - token_id: Identifier, - action: String, + pub token_id: Identifier, + pub action: String, } impl RequiredTokenPaymentInfoNotSetError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_already_paused_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_already_paused_error.rs index 4560e3fc4de..dc7088328ba 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_already_paused_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_already_paused_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,9 +11,10 @@ use thiserror::Error; )] #[error("Token {} is already paused. Action attempted: {}", token_id, action)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenAlreadyPausedError { - token_id: Identifier, - action: String, + pub token_id: Identifier, + pub action: String, } impl TokenAlreadyPausedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_amount_under_minimum_sale_amount.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_amount_under_minimum_sale_amount.rs index 921050fff49..300c79798ac 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_amount_under_minimum_sale_amount.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_amount_under_minimum_sale_amount.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -13,10 +13,11 @@ use thiserror::Error; "Requested token amount {desired_amount} is below the minimum sale amount {minimum_amount} for token {token_id}." )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenAmountUnderMinimumSaleAmount { - token_id: Identifier, - desired_amount: u64, - minimum_amount: u64, + pub token_id: Identifier, + pub desired_amount: u64, + pub minimum_amount: u64, } impl TokenAmountUnderMinimumSaleAmount { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_direct_purchase_user_price_too_low.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_direct_purchase_user_price_too_low.rs index 4824eeb5b9a..5132a6455f0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_direct_purchase_user_price_too_low.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_direct_purchase_user_price_too_low.rs @@ -1,7 +1,7 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::fee::Credits; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::balances::credits::Credits; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -14,10 +14,11 @@ use thiserror::Error; "Provided direct purchase price {user_price} is below the required price {required_price} for token {token_id}." )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenDirectPurchaseUserPriceTooLow { - token_id: Identifier, - user_price: Credits, - required_price: Credits, + pub token_id: Identifier, + pub user_price: Credits, + pub required_price: Credits, } impl TokenDirectPurchaseUserPriceTooLow { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_is_paused_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_is_paused_error.rs index 5681940847f..a58d4b7e045 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_is_paused_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_is_paused_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Token {} is paused.", token_id)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenIsPausedError { - token_id: Identifier, + pub token_id: Identifier, } impl TokenIsPausedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_mint_past_max_supply_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_mint_past_max_supply_error.rs index c97a2d0830e..9a4ca1036f6 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_mint_past_max_supply_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_mint_past_max_supply_error.rs @@ -1,6 +1,6 @@ use crate::balances::credits::TokenAmount; -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,11 +14,12 @@ use thiserror::Error; "Token {token_id} attempted to mint {amount}, which exceeds the max supply {max_supply}, current supply is {current_supply}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenMintPastMaxSupplyError { - token_id: Identifier, - amount: TokenAmount, - current_supply: TokenAmount, - max_supply: TokenAmount, + pub token_id: Identifier, + pub amount: TokenAmount, + pub current_supply: TokenAmount, + pub max_supply: TokenAmount, } impl TokenMintPastMaxSupplyError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_not_for_direct_sale.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_not_for_direct_sale.rs index 7eb0921798b..8b9f6d628cd 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_not_for_direct_sale.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_not_for_direct_sale.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Token {token_id} is not available for direct sale.")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenNotForDirectSale { - token_id: Identifier, + pub token_id: Identifier, } impl TokenNotForDirectSale { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_not_paused_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_not_paused_error.rs index 63cf71d4f10..0f224a305de 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_not_paused_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_not_paused_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,9 +11,10 @@ use thiserror::Error; )] #[error("Token {} is not paused. Action attempted: {}", token_id, action)] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenNotPausedError { - token_id: Identifier, - action: String, + pub token_id: Identifier, + pub action: String, } impl TokenNotPausedError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_setting_max_supply_to_less_than_current_supply_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_setting_max_supply_to_less_than_current_supply_error.rs index 511263c695f..655f6537595 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_setting_max_supply_to_less_than_current_supply_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_setting_max_supply_to_less_than_current_supply_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -13,10 +13,11 @@ use thiserror::Error; "Token {token_id} attempted to set max supply to {max_supply}, which is less than the current supply {current_supply}" )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenSettingMaxSupplyToLessThanCurrentSupplyError { - token_id: Identifier, - max_supply: u64, - current_supply: u64, + pub token_id: Identifier, + pub max_supply: u64, + pub current_supply: u64, } impl TokenSettingMaxSupplyToLessThanCurrentSupplyError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/token_transfer_recipient_identity_not_exist_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/token_transfer_recipient_identity_not_exist_error.rs index d88d5695b6f..264f208a8b8 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/token_transfer_recipient_identity_not_exist_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/token_transfer_recipient_identity_not_exist_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; @@ -11,8 +11,9 @@ use thiserror::Error; )] #[error("Token transfer recipient identity {recipient_id} doesn't exist")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenTransferRecipientIdentityNotExistError { - recipient_id: Identifier, + pub recipient_id: Identifier, } impl TokenTransferRecipientIdentityNotExistError { diff --git a/packages/rs-dpp/src/errors/consensus/state/token/unauthorized_token_action_error.rs b/packages/rs-dpp/src/errors/consensus/state/token/unauthorized_token_action_error.rs index ac5dca1ef05..b62027b9775 100644 --- a/packages/rs-dpp/src/errors/consensus/state/token/unauthorized_token_action_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/token/unauthorized_token_action_error.rs @@ -1,6 +1,6 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; use crate::data_contract::change_control_rules::authorized_action_takers::AuthorizedActionTakers; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -14,11 +14,12 @@ use thiserror::Error; "Identity {identity_id} is not authorized to perform action: {action} on token: {token_id}. Authorized action takers: {authorized_action_takers:?}", )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnauthorizedTokenActionError { - token_id: Identifier, - identity_id: Identifier, - action: String, - authorized_action_takers: AuthorizedActionTakers, + pub token_id: Identifier, + pub identity_id: Identifier, + pub action: String, + pub authorized_action_takers: AuthorizedActionTakers, } impl UnauthorizedTokenActionError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voter_identity_id_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voter_identity_id_error.rs index 4219e0df96c..8d7d73b4df0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voter_identity_id_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voter_identity_id_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,17 +11,18 @@ use thiserror::Error; )] #[error("Masternode {pro_tx_hash} voter identity id is incorrect, expected is {expected_voter_identity_id}, provided is {provided_voter_identity_id}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeIncorrectVoterIdentityIdError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pro_tx_hash: Identifier, + pub pro_tx_hash: Identifier, - expected_voter_identity_id: Identifier, + pub expected_voter_identity_id: Identifier, - provided_voter_identity_id: Identifier, + pub provided_voter_identity_id: Identifier, } impl MasternodeIncorrectVoterIdentityIdError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voting_address_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voting_address_error.rs index 5953eb86d39..2e0a61defbf 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voting_address_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_incorrect_voting_address_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,17 +11,18 @@ use thiserror::Error; )] #[error("Masternode {pro_tx_hash} voting address is incorrect, current is {current_voting_address}, given is {given_voting_address}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeIncorrectVotingAddressError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pro_tx_hash: Identifier, + pub pro_tx_hash: Identifier, - current_voting_address: Bytes20, + pub current_voting_address: Bytes20, - given_voting_address: Bytes20, + pub given_voting_address: Bytes20, } impl MasternodeIncorrectVotingAddressError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_not_found_error.rs index f004cfe79d4..e7830a60b87 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("Masternode {pro_tx_hash} not found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pro_tx_hash: Identifier, + pub pro_tx_hash: Identifier, } impl MasternodeNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_vote_already_present_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_vote_already_present_error.rs index 7526eba2172..439b4eafbbb 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_vote_already_present_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_vote_already_present_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::voting::vote_polls::VotePoll; use bincode::{Decode, Encode}; @@ -12,14 +12,15 @@ use thiserror::Error; )] #[error("Masternode vote is already present for masternode {pro_tx_hash} voting for {vote_poll}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeVoteAlreadyPresentError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pro_tx_hash: Identifier, - vote_poll: VotePoll, + pub pro_tx_hash: Identifier, + pub vote_poll: VotePoll, } impl MasternodeVoteAlreadyPresentError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_voted_too_many_times.rs b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_voted_too_many_times.rs index d1b167320a2..f255682a3f0 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/masternode_voted_too_many_times.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/masternode_voted_too_many_times.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; @@ -11,17 +11,18 @@ use thiserror::Error; )] #[error("Masternode with id: {pro_tx_hash} already voted {times_already_voted} times and is trying to vote again, they can only vote {max_times_allowed} times")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeVotedTooManyTimesError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - pro_tx_hash: Identifier, + pub pro_tx_hash: Identifier, - times_already_voted: u16, + pub times_already_voted: u16, - max_times_allowed: u16, + pub max_times_allowed: u16, } impl MasternodeVotedTooManyTimesError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_available_for_voting_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_available_for_voting_error.rs index 26341b31d4d..f7a8f6fffe9 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_available_for_voting_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_available_for_voting_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::voting::vote_info_storage::contested_document_vote_poll_stored_info::ContestedDocumentVotePollStatus; use crate::voting::vote_polls::VotePoll; @@ -12,14 +12,15 @@ use thiserror::Error; )] #[error("VotePoll {vote_poll} not available for voting: {status}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct VotePollNotAvailableForVotingError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - vote_poll: VotePoll, - status: ContestedDocumentVotePollStatus, + pub vote_poll: VotePoll, + pub status: ContestedDocumentVotePollStatus, } impl VotePollNotAvailableForVotingError { diff --git a/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_found_error.rs b/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_found_error.rs index 77a6c62bdde..3b331ac8043 100644 --- a/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_found_error.rs +++ b/packages/rs-dpp/src/errors/consensus/state/voting/vote_poll_not_found_error.rs @@ -1,5 +1,5 @@ -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::errors::ProtocolError; use crate::voting::vote_polls::VotePoll; use bincode::{Decode, Encode}; @@ -11,13 +11,14 @@ use thiserror::Error; )] #[error("VotePoll {vote_poll} not found")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct VotePollNotFoundError { /* DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION */ - vote_poll: VotePoll, + pub vote_poll: VotePoll, } impl VotePollNotFoundError { diff --git a/packages/rs-dpp/src/errors/consensus/test_consensus_error.rs b/packages/rs-dpp/src/errors/consensus/test_consensus_error.rs index cfc240f21dc..24f63185c85 100644 --- a/packages/rs-dpp/src/errors/consensus/test_consensus_error.rs +++ b/packages/rs-dpp/src/errors/consensus/test_consensus_error.rs @@ -8,6 +8,7 @@ use thiserror::Error; )] #[error("{message:?}")] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TestConsensusError { pub message: String, } diff --git a/packages/rs-dpp/src/errors/dpp_error.rs b/packages/rs-dpp/src/errors/dpp_error.rs index 3fb869791d4..bce7ec0e306 100644 --- a/packages/rs-dpp/src/errors/dpp_error.rs +++ b/packages/rs-dpp/src/errors/dpp_error.rs @@ -4,6 +4,7 @@ use crate::identity::errors::{AssetLockOutputNotFoundError, AssetLockTransaction #[derive(Error, Debug)] #[error("{0}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DPPError { AssetLockOutputNotFoundError(AssetLockOutputNotFoundError), AssetLockTransactionIsNotFoundError(AssetLockTransactionIsNotFoundError), diff --git a/packages/rs-dpp/src/errors/dpp_init_error.rs b/packages/rs-dpp/src/errors/dpp_init_error.rs index baf41047c23..dbaf0e4ec92 100644 --- a/packages/rs-dpp/src/errors/dpp_init_error.rs +++ b/packages/rs-dpp/src/errors/dpp_init_error.rs @@ -1,7 +1,8 @@ -use crate::version::FeatureVersion; use thiserror::Error; +use versioned_feature_core::FeatureVersion; #[derive(Error, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DashPlatformProtocolInitError { #[error(transparent)] SchemaDeserializationError(serde_json::Error), diff --git a/packages/rs-dpp/src/errors/invalid_vector_size_error.rs b/packages/rs-dpp/src/errors/invalid_vector_size_error.rs index df9fd674ec0..48ced41c9f1 100644 --- a/packages/rs-dpp/src/errors/invalid_vector_size_error.rs +++ b/packages/rs-dpp/src/errors/invalid_vector_size_error.rs @@ -2,9 +2,10 @@ use thiserror::Error; #[derive(Debug, Error, Clone, Eq, PartialEq)] #[error("Failed to covert vector to array of size {expected_size:?}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidVectorSizeError { - expected_size: usize, - actual_size: usize, + pub expected_size: usize, + pub actual_size: usize, } impl InvalidVectorSizeError { diff --git a/packages/rs-dpp/src/errors/mod.rs b/packages/rs-dpp/src/errors/mod.rs index 26de616c111..bcb7eaae7a2 100644 --- a/packages/rs-dpp/src/errors/mod.rs +++ b/packages/rs-dpp/src/errors/mod.rs @@ -1,20 +1,21 @@ -pub use compatible_protocol_version_is_not_defined_error::*; -pub use dpp_error::*; -pub use dpp_init_error::*; -pub use invalid_vector_size_error::*; -pub use non_consensus_error::*; -pub use protocol_error::*; -pub use public_key_validation_error::*; -pub use serde_parsing_error::*; +pub use compatible_protocol_version_is_not_defined_error::CompatibleProtocolVersionIsNotDefinedError; +pub use dpp_error::DPPError; +pub use dpp_init_error::DashPlatformProtocolInitError; +pub use invalid_vector_size_error::InvalidVectorSizeError; +pub use non_consensus_error::object_names::STATE_TRANSITION; +pub use non_consensus_error::NonConsensusError; +pub use protocol_error::ProtocolError; +pub use public_key_validation_error::PublicKeyValidationError; +pub use serde_parsing_error::SerdeParsingError; -mod compatible_protocol_version_is_not_defined_error; +pub mod compatible_protocol_version_is_not_defined_error; pub mod consensus; -mod dpp_init_error; -mod invalid_vector_size_error; -mod non_consensus_error; -mod public_key_validation_error; -mod serde_parsing_error; +pub mod dpp_init_error; +pub mod invalid_vector_size_error; +pub mod non_consensus_error; +pub mod public_key_validation_error; +pub mod serde_parsing_error; pub mod protocol_error; -mod dpp_error; +pub mod dpp_error; diff --git a/packages/rs-dpp/src/errors/non_consensus_error.rs b/packages/rs-dpp/src/errors/non_consensus_error.rs index 908506a216d..b853ecb386e 100644 --- a/packages/rs-dpp/src/errors/non_consensus_error.rs +++ b/packages/rs-dpp/src/errors/non_consensus_error.rs @@ -1,16 +1,18 @@ -use platform_value::Error as ValueError; -use thiserror::Error; +// use platform_value::Error as ValueError; +use crate::errors::compatible_protocol_version_is_not_defined_error::CompatibleProtocolVersionIsNotDefinedError; +use crate::errors::dpp_error::DPPError; +use crate::errors::invalid_vector_size_error::InvalidVectorSizeError; +use crate::errors::serde_parsing_error::SerdeParsingError; +use platform_value::Error; +use thiserror::Error as ThisError; +use versioned_feature_core::FeatureVersion; -use crate::version::FeatureVersion; -use crate::{ - CompatibleProtocolVersionIsNotDefinedError, DPPError, InvalidVectorSizeError, SerdeParsingError, -}; - -#[derive(Debug, Error)] +#[derive(Debug, ThisError)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum NonConsensusError { /// Value error #[error("value error: {0}")] - ValueError(#[from] ValueError), + ValueError(#[from] Error), /// Platform expected some specific versions #[error("non consensus unknown version on {method}, received: {received}")] UnknownVersionMismatch { diff --git a/packages/rs-dpp/src/errors/protocol_error.rs b/packages/rs-dpp/src/errors/protocol_error.rs index e9acd8d26a3..02a0e6a875d 100644 --- a/packages/rs-dpp/src/errors/protocol_error.rs +++ b/packages/rs-dpp/src/errors/protocol_error.rs @@ -1,23 +1,20 @@ -use thiserror::Error; - -use crate::consensus::basic::state_transition::InvalidStateTransitionTypeError; -use crate::consensus::signature::{ +use crate::data_contract::errors::{ + contract::DataContractError, DataContractNotPresentError, IdentityNotPresentError, + InvalidDocumentTypeError, +}; +use crate::document::errors::DocumentError; +use crate::errors::consensus::basic::state_transition::InvalidStateTransitionTypeError; +use crate::errors::consensus::signature::{ InvalidSignaturePublicKeySecurityLevelError, PublicKeyIsDisabledError, }; -use crate::consensus::ConsensusError; -use crate::data_contract::errors::*; -use crate::document::errors::*; - #[cfg(any( feature = "state-transition-validation", feature = "state-transition-signing" ))] use crate::state_transition::errors::InvalidIdentityPublicKeyTypeError; +use thiserror::Error as ThisError; -#[cfg(any( - all(feature = "state-transitions", feature = "validation"), - feature = "state-transition-validation" -))] +#[cfg(all(feature = "state-transitions", feature = "validation"))] use crate::state_transition::errors::StateTransitionError; #[cfg(any( @@ -33,19 +30,21 @@ use crate::state_transition::errors::{ InvalidSignaturePublicKeyError, PublicKeyMismatchError, PublicKeySecurityLevelNotMetError, StateTransitionIsNotSignedError, }; -use crate::{ - CompatibleProtocolVersionIsNotDefinedError, DashPlatformProtocolInitError, - InvalidVectorSizeError, NonConsensusError, SerdeParsingError, -}; - -use dashcore::consensus::encode::Error as DashCoreError; +use crate::errors::compatible_protocol_version_is_not_defined_error::CompatibleProtocolVersionIsNotDefinedError; +use crate::errors::consensus::ConsensusError; +use crate::errors::dpp_init_error::DashPlatformProtocolInitError; +use crate::errors::invalid_vector_size_error::InvalidVectorSizeError; +use crate::errors::non_consensus_error::NonConsensusError; +use crate::errors::serde_parsing_error::SerdeParsingError; use crate::tokens::errors::TokenError; -use crate::version::FeatureVersion; -use platform_value::{Error as ValueError, Value}; + +use platform_value::{Error, Value}; use platform_version::error::PlatformVersionError; +use versioned_feature_core::FeatureVersion; -#[derive(Error, Debug)] +#[derive(ThisError, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ProtocolError { #[error("Identifier Error: {0}")] IdentifierError(String), @@ -213,7 +212,7 @@ pub enum ProtocolError { /// Value error #[error("value error: {0}")] - ValueError(#[from] ValueError), + ValueError(#[from] Error), /// Value error #[error("platform serialization error: {0}")] @@ -225,7 +224,7 @@ pub enum ProtocolError { /// Dash core error #[error("dash core error: {0}")] - DashCoreError(#[from] DashCoreError), + DashCoreError(#[from] dashcore::consensus::encode::Error), #[error("Invalid Identity: {errors:?}")] InvalidIdentityError { diff --git a/packages/rs-dpp/src/errors/public_key_validation_error.rs b/packages/rs-dpp/src/errors/public_key_validation_error.rs index f400db1a4e1..0a23981a51b 100644 --- a/packages/rs-dpp/src/errors/public_key_validation_error.rs +++ b/packages/rs-dpp/src/errors/public_key_validation_error.rs @@ -2,8 +2,9 @@ use thiserror::Error; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Public key validation error: {message:?}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeyValidationError { - message: String, + pub message: String, } impl PublicKeyValidationError { diff --git a/packages/rs-dpp/src/errors/serde_parsing_error.rs b/packages/rs-dpp/src/errors/serde_parsing_error.rs index 3a0669ebbe7..b52faf3d8e9 100644 --- a/packages/rs-dpp/src/errors/serde_parsing_error.rs +++ b/packages/rs-dpp/src/errors/serde_parsing_error.rs @@ -5,8 +5,9 @@ use crate::InvalidVectorSizeError; #[derive(Debug, Error, Clone, Eq, PartialEq)] #[error("Serde parsing error: {message:?}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SerdeParsingError { - message: String, + pub message: String, } impl SerdeParsingError { diff --git a/packages/rs-dpp/src/fee/default_costs/constants.rs b/packages/rs-dpp/src/fee/default_costs/constants.rs index 12f76d39099..7d971588cdd 100644 --- a/packages/rs-dpp/src/fee/default_costs/constants.rs +++ b/packages/rs-dpp/src/fee/default_costs/constants.rs @@ -1,4 +1,4 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; pub const BASE_ST_PROCESSING_FEE: Credits = 10000; // 84000 pub const DEFAULT_USER_TIP: Credits = 0; diff --git a/packages/rs-dpp/src/fee/default_costs/mod.rs b/packages/rs-dpp/src/fee/default_costs/mod.rs index 59359361abc..0a0b568817e 100644 --- a/packages/rs-dpp/src/fee/default_costs/mod.rs +++ b/packages/rs-dpp/src/fee/default_costs/mod.rs @@ -3,8 +3,8 @@ //! Fee costs for Known Platform operations //! +use crate::balances::credits::Credits; use crate::block::epoch::{Epoch, EpochIndex}; -use crate::fee::Credits; use platform_version::version::fee::{ FeeVersion, FeeVersionFieldsBeforeVersion4, FeeVersionNumber, }; diff --git a/packages/rs-dpp/src/fee/epoch/distribution.rs b/packages/rs-dpp/src/fee/epoch/distribution.rs index 73d0b94ee99..98532dcd1bd 100644 --- a/packages/rs-dpp/src/fee/epoch/distribution.rs +++ b/packages/rs-dpp/src/fee/epoch/distribution.rs @@ -43,7 +43,7 @@ use rust_decimal_macros::dec; use std::cmp::Ordering; use crate::balances::credits::Credits; -use crate::ProtocolError; +use crate::errors::ProtocolError; use std::ops::Mul; // TODO: Should be updated from the doc diff --git a/packages/rs-dpp/src/fee/epoch/mod.rs b/packages/rs-dpp/src/fee/epoch/mod.rs index 0d76c2ed178..5e43fa440f5 100644 --- a/packages/rs-dpp/src/fee/epoch/mod.rs +++ b/packages/rs-dpp/src/fee/epoch/mod.rs @@ -37,9 +37,9 @@ use nohash_hasher::IntMap; #[cfg(feature = "fee-distribution")] pub mod distribution; +use crate::balances::credits::{Credits, SignedCredits}; /// Epoch index type use crate::block::epoch::EpochIndex; -use crate::fee::{Credits, SignedCredits}; /// Genesis epoch index pub const GENESIS_EPOCH_INDEX: EpochIndex = 0; diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index b87c9f77856..1ee756ba493 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -35,14 +35,14 @@ //! for removed data from the state. //! -use crate::consensus::fee::balance_is_not_enough_error::BalanceIsNotEnoughError; -use crate::consensus::fee::fee_error::FeeError; +use crate::errors::consensus::fee::balance_is_not_enough_error::BalanceIsNotEnoughError; +use crate::errors::consensus::fee::fee_error::FeeError; +use crate::balances::credits::Credits; +use crate::errors::ProtocolError; use crate::fee::fee_result::refunds::FeeRefunds; use crate::fee::fee_result::BalanceChange::{AddToBalance, NoBalanceChange, RemoveFromBalance}; -use crate::fee::Credits; use crate::prelude::UserFeeIncrease; -use crate::ProtocolError; use platform_value::Identifier; use std::cmp::Ordering; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/fee/fee_result/refunds.rs b/packages/rs-dpp/src/fee/fee_result/refunds.rs index ef2f220f363..b397dd0722b 100644 --- a/packages/rs-dpp/src/fee/fee_result/refunds.rs +++ b/packages/rs-dpp/src/fee/fee_result/refunds.rs @@ -3,15 +3,15 @@ //! Fee refunds are calculated based on removed bytes per epoch. //! +use crate::balances::credits::Credits; use crate::block::epoch::{Epoch, EpochIndex}; use crate::fee::default_costs::KnownCostItem::StorageDiskUsageCreditPerByte; use crate::fee::default_costs::{CachedEpochIndexFeeVersions, EpochCosts}; use crate::fee::epoch::distribution::calculate_storage_fee_refund_amount_and_leftovers; use crate::fee::epoch::{BytesPerEpoch, CreditsPerEpoch}; -use crate::fee::Credits; -use crate::ProtocolError; use bincode::{Decode, Encode}; +use crate::ProtocolError; use platform_value::Identifier; use serde::{Deserialize, Serialize}; use std::collections::btree_map::Iter; diff --git a/packages/rs-dpp/src/group/group_action_status.rs b/packages/rs-dpp/src/group/group_action_status.rs index 407d2a7c860..8578f63f29a 100644 --- a/packages/rs-dpp/src/group/group_action_status.rs +++ b/packages/rs-dpp/src/group/group_action_status.rs @@ -1,6 +1,7 @@ use anyhow::bail; #[derive(Debug, PartialEq, PartialOrd, Clone, Copy, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum GroupActionStatus { ActionActive, ActionClosed, diff --git a/packages/rs-dpp/src/group/mod.rs b/packages/rs-dpp/src/group/mod.rs index 427b62c7757..8cacc0c87ee 100644 --- a/packages/rs-dpp/src/group/mod.rs +++ b/packages/rs-dpp/src/group/mod.rs @@ -39,6 +39,7 @@ impl From for GroupStateTransitionInfo { serde(rename_all = "camelCase") )] #[display("ID: {}, Action ID: {}", "id", "action_id")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct GroupStateTransitionInfo { #[cfg_attr( feature = "state-transition-serde-conversion", diff --git a/packages/rs-dpp/src/identity/accessors/mod.rs b/packages/rs-dpp/src/identity/accessors/mod.rs index 2c95c36236f..861ff104f60 100644 --- a/packages/rs-dpp/src/identity/accessors/mod.rs +++ b/packages/rs-dpp/src/identity/accessors/mod.rs @@ -1,8 +1,9 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::identity::{Identity, IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{IdentityPublicKey, KeyID, KeyType, Purpose}; +use crate::identity::{identity_public_key::SecurityLevel, Identity}; +use crate::errors::ProtocolError; use crate::prelude::Revision; -use crate::ProtocolError; use platform_value::Identifier; use std::collections::{BTreeMap, HashSet}; pub use v0::{IdentityGettersV0, IdentitySettersV0}; diff --git a/packages/rs-dpp/src/identity/accessors/v0/mod.rs b/packages/rs-dpp/src/identity/accessors/v0/mod.rs index 41d17c3c5b3..9c5cadfcc80 100644 --- a/packages/rs-dpp/src/identity/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/identity/accessors/v0/mod.rs @@ -1,7 +1,9 @@ -use crate::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{ + IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel, +}; +use crate::errors::ProtocolError; use crate::prelude::Revision; -use crate::ProtocolError; use platform_value::Identifier; use std::collections::{BTreeMap, HashSet}; diff --git a/packages/rs-dpp/src/identity/conversion/cbor/v0/mod.rs b/packages/rs-dpp/src/identity/conversion/cbor/v0/mod.rs index 0a232ce2a80..e824ca52da5 100644 --- a/packages/rs-dpp/src/identity/conversion/cbor/v0/mod.rs +++ b/packages/rs-dpp/src/identity/conversion/cbor/v0/mod.rs @@ -1,5 +1,5 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; pub trait IdentityCborConversionMethodsV0 { /// Converts the identity to a cbor buffer diff --git a/packages/rs-dpp/src/identity/conversion/json/v0/mod.rs b/packages/rs-dpp/src/identity/conversion/json/v0/mod.rs index f8763d9623d..3cded8383f3 100644 --- a/packages/rs-dpp/src/identity/conversion/json/v0/mod.rs +++ b/packages/rs-dpp/src/identity/conversion/json/v0/mod.rs @@ -1,10 +1,10 @@ -use crate::ProtocolError; -use serde_json::Value as JsonValue; +use crate::errors::ProtocolError; +// use serde_json::Value as JsonValue; pub trait IdentityJsonConversionMethodsV0 { - fn to_json_object(&self) -> Result; - fn to_json(&self) -> Result; - fn from_json(json_object: JsonValue) -> Result + fn to_json_object(&self) -> Result; + fn to_json(&self) -> Result; + fn from_json(json_object: serde_json::Value) -> Result where Self: Sized; } diff --git a/packages/rs-dpp/src/identity/conversion/platform_value/mod.rs b/packages/rs-dpp/src/identity/conversion/platform_value/mod.rs index 8490a659730..e37f805242a 100644 --- a/packages/rs-dpp/src/identity/conversion/platform_value/mod.rs +++ b/packages/rs-dpp/src/identity/conversion/platform_value/mod.rs @@ -1,10 +1,10 @@ mod v0; -use crate::identity::{Identity, IdentityV0}; +use crate::errors::ProtocolError; +use crate::identity::{v0::IdentityV0, Identity}; use crate::serialization::ValueConvertible; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; use platform_version::TryFromPlatformVersioned; pub use v0::IdentityPlatformValueConversionMethodsV0; diff --git a/packages/rs-dpp/src/identity/conversion/platform_value/v0/mod.rs b/packages/rs-dpp/src/identity/conversion/platform_value/v0/mod.rs index 6c1c031a1c1..c5e8ee41b62 100644 --- a/packages/rs-dpp/src/identity/conversion/platform_value/v0/mod.rs +++ b/packages/rs-dpp/src/identity/conversion/platform_value/v0/mod.rs @@ -1,5 +1,5 @@ +use crate::errors::ProtocolError; use crate::serialization::ValueConvertible; -use crate::ProtocolError; use platform_value::Value; pub trait IdentityPlatformValueConversionMethodsV0<'a>: ValueConvertible<'a> { diff --git a/packages/rs-dpp/src/identity/core_script.rs b/packages/rs-dpp/src/identity/core_script.rs index 19380c8ab75..4da98784643 100644 --- a/packages/rs-dpp/src/identity/core_script.rs +++ b/packages/rs-dpp/src/identity/core_script.rs @@ -6,7 +6,7 @@ use dashcore::blockdata::opcodes; use std::fmt; use std::ops::Deref; -use dashcore::{ScriptBuf as DashcoreScript, ScriptBuf}; +use dashcore::ScriptBuf; use platform_value::string_encoding::{self, Encoding}; use rand::rngs::StdRng; use rand::Rng; @@ -14,14 +14,15 @@ use rand::Rng; use serde::de::Visitor; use serde::{Deserialize, Serialize}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::de::read::Reader; #[derive(Clone, Debug, Eq, PartialEq, Default)] -pub struct CoreScript(DashcoreScript); +#[cfg_attr(feature = "apple", ferment_macro::export)] +pub struct CoreScript(pub ScriptBuf); impl CoreScript { - pub fn new(script: DashcoreScript) -> Self { + pub fn new(script: ScriptBuf) -> Self { CoreScript(script) } @@ -77,7 +78,7 @@ impl From> for CoreScript { } impl Deref for CoreScript { - type Target = DashcoreScript; + type Target = ScriptBuf; fn deref(&self) -> &Self::Target { &self.0 @@ -130,7 +131,7 @@ impl<'de> BorrowDecode<'de> for CoreScript { } // Convert Vec to Box<[u8]> and create a DashCoreScript instance - let dash_core_script = DashcoreScript(bytes); + let dash_core_script = ScriptBuf(bytes); // Create a CoreScript instance using the decoded DashCoreScript Ok(CoreScript(dash_core_script)) diff --git a/packages/rs-dpp/src/identity/credits_converter.rs b/packages/rs-dpp/src/identity/credits_converter.rs index 590185006aa..50b4beec844 100644 --- a/packages/rs-dpp/src/identity/credits_converter.rs +++ b/packages/rs-dpp/src/identity/credits_converter.rs @@ -1,6 +1,6 @@ use crate::balances::credits::CREDITS_PER_DUFF; -use crate::fee::Credits; -use crate::ProtocolError; +use crate::balances::credits::Credits; +use crate::errors::ProtocolError; pub fn convert_duffs_to_credits(amount: u64) -> Result { amount diff --git a/packages/rs-dpp/src/identity/errors/asset_lock_output_not_found_error.rs b/packages/rs-dpp/src/identity/errors/asset_lock_output_not_found_error.rs index bee40db3920..2a0298c9112 100644 --- a/packages/rs-dpp/src/identity/errors/asset_lock_output_not_found_error.rs +++ b/packages/rs-dpp/src/identity/errors/asset_lock_output_not_found_error.rs @@ -4,6 +4,7 @@ use crate::DPPError; #[derive(Error, Debug, Clone, PartialEq, Eq, Default)] #[error("Asset Lock transaction output not found")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct AssetLockOutputNotFoundError {} impl AssetLockOutputNotFoundError { diff --git a/packages/rs-dpp/src/identity/errors/asset_lock_transaction_is_not_found_error.rs b/packages/rs-dpp/src/identity/errors/asset_lock_transaction_is_not_found_error.rs index 654aada7d4f..4875151768b 100644 --- a/packages/rs-dpp/src/identity/errors/asset_lock_transaction_is_not_found_error.rs +++ b/packages/rs-dpp/src/identity/errors/asset_lock_transaction_is_not_found_error.rs @@ -1,12 +1,13 @@ -use dashcore::Txid; +use dashcore::hash_types::Txid; use thiserror::Error; use crate::DPPError; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Asset Lock transaction {transaction_id:?} is not found")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct AssetLockTransactionIsNotFoundError { - transaction_id: Txid, + pub transaction_id: Txid, } impl AssetLockTransactionIsNotFoundError { diff --git a/packages/rs-dpp/src/identity/errors/mod.rs b/packages/rs-dpp/src/identity/errors/mod.rs index d4812382a93..16393161dc3 100644 --- a/packages/rs-dpp/src/identity/errors/mod.rs +++ b/packages/rs-dpp/src/identity/errors/mod.rs @@ -1,7 +1,7 @@ -pub use asset_lock_output_not_found_error::*; -pub use asset_lock_transaction_is_not_found_error::*; -pub use unknown_asset_lock_proof_type_error::*; +pub use asset_lock_output_not_found_error::AssetLockOutputNotFoundError; +pub use asset_lock_transaction_is_not_found_error::AssetLockTransactionIsNotFoundError; +pub use unknown_asset_lock_proof_type_error::UnknownAssetLockProofTypeError; -mod asset_lock_output_not_found_error; -mod asset_lock_transaction_is_not_found_error; -mod unknown_asset_lock_proof_type_error; +pub mod asset_lock_output_not_found_error; +pub mod asset_lock_transaction_is_not_found_error; +pub mod unknown_asset_lock_proof_type_error; diff --git a/packages/rs-dpp/src/identity/errors/unknown_asset_lock_proof_type_error.rs b/packages/rs-dpp/src/identity/errors/unknown_asset_lock_proof_type_error.rs index 8e42d49a268..fedfb4c282d 100644 --- a/packages/rs-dpp/src/identity/errors/unknown_asset_lock_proof_type_error.rs +++ b/packages/rs-dpp/src/identity/errors/unknown_asset_lock_proof_type_error.rs @@ -2,8 +2,9 @@ use thiserror::Error; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("'Unknown Asset lock proof type'")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct UnknownAssetLockProofTypeError { - asset_lock_type: Option, + pub asset_lock_type: Option, } impl UnknownAssetLockProofTypeError { diff --git a/packages/rs-dpp/src/identity/get_biggest_possible_identity.rs b/packages/rs-dpp/src/identity/get_biggest_possible_identity.rs index 42ad0469d37..d45939685d2 100644 --- a/packages/rs-dpp/src/identity/get_biggest_possible_identity.rs +++ b/packages/rs-dpp/src/identity/get_biggest_possible_identity.rs @@ -1,6 +1,6 @@ use getrandom::getrandom; -use crate::prelude::Identifier; +use platform_value::Identifier; fn generate_random_identifier_struct() -> Identifier { let mut buffer = [0u8; 32]; diff --git a/packages/rs-dpp/src/identity/identities_contract_keys.rs b/packages/rs-dpp/src/identity/identities_contract_keys.rs index 063b5dabc7f..8d1e281081b 100644 --- a/packages/rs-dpp/src/identity/identities_contract_keys.rs +++ b/packages/rs-dpp/src/identity/identities_contract_keys.rs @@ -1,4 +1,4 @@ -use crate::identity::{IdentityPublicKey, Purpose}; +use crate::identity::identity_public_key::{IdentityPublicKey, Purpose}; use platform_value::Identifier; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/identity/identity.rs b/packages/rs-dpp/src/identity/identity.rs index 1c8951d13b6..0c3ac18bfc2 100644 --- a/packages/rs-dpp/src/identity/identity.rs +++ b/packages/rs-dpp/src/identity/identity.rs @@ -1,14 +1,14 @@ +use crate::identity::identity_public_key::{IdentityPublicKey, KeyID}; use crate::identity::v0::IdentityV0; -use crate::identity::{IdentityPublicKey, KeyID}; use crate::prelude::Revision; #[cfg(feature = "identity-hashing")] use crate::serialization::PlatformSerializable; #[cfg(feature = "identity-hashing")] use crate::util::hash; -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; #[cfg(feature = "identity-serialization")] use bincode::{Decode, Encode}; use derive_more::From; @@ -16,7 +16,7 @@ use derive_more::From; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "identity-serde-conversion")] use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; @@ -36,6 +36,7 @@ use std::collections::{BTreeMap, BTreeSet}; derive(Encode, Decode, PlatformDeserialize, PlatformSerialize), platform_serialize(limit = 15000, unversioned) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Identity { #[cfg_attr(feature = "identity-serde-conversion", serde(rename = "0"))] V0(IdentityV0), @@ -43,6 +44,7 @@ pub enum Identity { /// An identity struct that represent partially set/loaded identity data. #[derive(Debug, Clone, Eq, PartialEq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PartialIdentity { pub id: Identifier, pub loaded_public_keys: BTreeMap, diff --git a/packages/rs-dpp/src/identity/identity_facade.rs b/packages/rs-dpp/src/identity/identity_facade.rs index 323fea838dd..dcccfb218e5 100644 --- a/packages/rs-dpp/src/identity/identity_facade.rs +++ b/packages/rs-dpp/src/identity/identity_facade.rs @@ -4,12 +4,16 @@ use std::collections::BTreeMap; use crate::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; use crate::identity::state_transition::asset_lock_proof::{AssetLockProof, InstantAssetLockProof}; -use crate::identity::{Identity, IdentityPublicKey, KeyID}; -use crate::prelude::{Identifier, IdentityNonce}; +use crate::identity::{ + identity_public_key::{IdentityPublicKey, KeyID}, + Identity, +}; +use crate::prelude::IdentityNonce; +use platform_value::Identifier; use crate::identity::identity_factory::IdentityFactory; #[cfg(feature = "state-transitions")] -use crate::state_transition::{ +use crate::state_transition::state_transitions::identity::{ identity_create_transition::IdentityCreateTransition, identity_credit_transfer_transition::IdentityCreditTransferTransition, identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition, @@ -18,9 +22,9 @@ use crate::state_transition::{ public_key_in_creation::IdentityPublicKeyInCreation, }; +use crate::errors::ProtocolError; use crate::identity::core_script::CoreScript; use crate::withdrawal::Pooling; -use crate::ProtocolError; #[derive(Clone)] pub struct IdentityFacade { @@ -93,6 +97,15 @@ impl IdentityFacade { self.factory .create_identity_create_transition(identity, asset_lock_proof) } + #[cfg(feature = "state-transitions")] + pub fn create_identity_create_transition_using_public_keys( + &self, + public_keys: BTreeMap, + asset_lock_proof: AssetLockProof, + ) -> Result<(Identity, IdentityCreateTransition), ProtocolError> { + self.factory + .create_identity_with_create_transition(public_keys, asset_lock_proof) + } #[cfg(feature = "state-transitions")] pub fn create_identity_topup_transition( diff --git a/packages/rs-dpp/src/identity/identity_factory.rs b/packages/rs-dpp/src/identity/identity_factory.rs index 2ec10511c20..94b4019cb6c 100644 --- a/packages/rs-dpp/src/identity/identity_factory.rs +++ b/packages/rs-dpp/src/identity/identity_factory.rs @@ -5,22 +5,25 @@ use crate::identity::state_transition::asset_lock_proof::InstantAssetLockProof; #[cfg(all(feature = "state-transitions", feature = "client"))] use crate::identity::state_transition::AssetLockProved; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::identity::IdentityV0; +use crate::identity::v0::IdentityV0; -use crate::identity::{Identity, IdentityPublicKey, KeyID}; +use crate::identity::{ + identity_public_key::{IdentityPublicKey, KeyID}, + Identity, +}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use dashcore::{InstantLock, Transaction}; use platform_value::Identifier; use std::collections::BTreeMap; #[cfg(all(feature = "identity-serialization", feature = "client"))] -use crate::consensus::basic::decode::SerializedObjectParsingError; +use crate::errors::consensus::basic::decode::SerializedObjectParsingError; #[cfg(all(feature = "identity-serialization", feature = "client"))] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; #[cfg(all(feature = "identity-serialization", feature = "client"))] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; #[cfg(all(feature = "state-transitions", feature = "client"))] use crate::identity::accessors::IdentityGettersV0; #[cfg(all( @@ -36,40 +39,41 @@ use crate::prelude::IdentityNonce; #[cfg(all(feature = "identity-serialization", feature = "client"))] use crate::serialization::PlatformDeserializable; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::version::PlatformVersion; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use platform_version::version::PlatformVersion; #[cfg(all(feature = "state-transitions", feature = "client"))] use crate::withdrawal::Pooling; #[cfg(any( all(feature = "identity-serialization", feature = "client"), feature = "identity-value-conversion" ))] +#[cfg(all(feature = "validation", feature = "identity-value-conversion"))] use platform_value::Value; pub const IDENTITY_PROTOCOL_VERSION: u32 = 1; diff --git a/packages/rs-dpp/src/identity/identity_nonce.rs b/packages/rs-dpp/src/identity/identity_nonce.rs index fd98642a972..d5c21815075 100644 --- a/packages/rs-dpp/src/identity/identity_nonce.rs +++ b/packages/rs-dpp/src/identity/identity_nonce.rs @@ -2,9 +2,9 @@ use crate::ProtocolError; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use std::fmt::{Debug, Display, Formatter}; -use crate::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; -use crate::consensus::state::state_error::StateError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; +use crate::errors::consensus::state::state_error::StateError; +use crate::errors::consensus::ConsensusError; use crate::prelude::IdentityNonce; use crate::validation::SimpleConsensusValidationResult; use bincode::{Decode, Encode}; @@ -20,6 +20,7 @@ pub const IDENTITY_NONCE_VALUE_FILTER_MAX_BYTES: u64 = 40; Debug, Clone, Copy, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] /// The result of the merge of the identity contract nonce +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum MergeIdentityNonceResult { /// The nonce is an invalid value /// This could be 0 @@ -165,8 +166,8 @@ pub fn validate_identity_nonce_update( #[cfg(test)] mod tests { - use crate::consensus::state::state_error::StateError; - use crate::consensus::ConsensusError; + use crate::errors::consensus::state::state_error::StateError; + use crate::errors::consensus::ConsensusError; use crate::identity::identity_nonce::{ validate_identity_nonce_update, MergeIdentityNonceResult, }; diff --git a/packages/rs-dpp/src/identity/identity_public_key/accessors/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/accessors/mod.rs index 14f90cc032f..be3e9ddd051 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/accessors/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/accessors/mod.rs @@ -1,11 +1,10 @@ -use crate::identity::contract_bounds::ContractBounds; use crate::identity::identity_public_key::accessors::v0::{ IdentityPublicKeyGettersV0, IdentityPublicKeySettersV0, }; -use crate::identity::KeyType; -use crate::identity::Purpose; -use crate::identity::SecurityLevel; -use crate::identity::{IdentityPublicKey, KeyID, TimestampMillis}; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; +use crate::identity::identity_public_key::{ + IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel, TimestampMillis, +}; use platform_value::BinaryData; pub mod v0; diff --git a/packages/rs-dpp/src/identity/identity_public_key/accessors/v0/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/accessors/v0/mod.rs index f5da4db8134..c5540fe6f57 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/accessors/v0/mod.rs @@ -1,9 +1,9 @@ -use crate::identity::contract_bounds::ContractBounds; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; use crate::identity::identity_public_key::KeyID; -use crate::identity::KeyType; -use crate::identity::Purpose; -use crate::identity::SecurityLevel; -use crate::identity::TimestampMillis; +use crate::identity::identity_public_key::KeyType; +use crate::identity::identity_public_key::Purpose; +use crate::identity::identity_public_key::SecurityLevel; +use crate::identity::identity_public_key::TimestampMillis; use platform_value::BinaryData; /// Trait for getters in IdentityPublicKeyV0 diff --git a/packages/rs-dpp/src/identity/identity_public_key/contract_bounds/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/contract_bounds/mod.rs index 2d400838b62..e61dc78c8f7 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/contract_bounds/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/contract_bounds/mod.rs @@ -1,9 +1,9 @@ -use crate::identifier::Identifier; +use crate::errors::ProtocolError; use crate::identity::identity_public_key::contract_bounds::ContractBounds::{ SingleContract, SingleContractDocumentType, }; -use crate::ProtocolError; use bincode::{Decode, Encode}; +use platform_value::Identifier; use serde::{Deserialize, Serialize}; pub type ContractBoundsType = u8; @@ -19,16 +19,17 @@ pub type ContractBoundsType = u8; Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Encode, Decode, Ord, PartialOrd, Hash, )] #[serde(tag = "type")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContractBounds { /// this key can only be used within a specific contract #[serde(rename = "singleContract")] - SingleContract { id: Identifier } = 0, + SingleContract { id: Identifier }, /// this key can only be used within a specific contract and for a specific document type #[serde(rename = "documentType")] SingleContractDocumentType { id: Identifier, document_type_name: String, - } = 1, + }, // /// this key can only be used within contracts owned by a specified owner // #[serde(rename = "multipleContractsOfSameOwner")] // MultipleContractsOfSameOwner { owner_id: Identifier } = 2, diff --git a/packages/rs-dpp/src/identity/identity_public_key/conversion/json/v0/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/conversion/json/v0/mod.rs index f27a7d7d7b8..b89f5e5dfb9 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/conversion/json/v0/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/conversion/json/v0/mod.rs @@ -1,12 +1,12 @@ -use crate::version::PlatformVersion; -use crate::ProtocolError; -use serde_json::Value as JsonValue; +use crate::errors::ProtocolError; +use platform_version::version::PlatformVersion; +// use serde_json::Value as JsonValue; pub trait IdentityPublicKeyJsonConversionMethodsV0 { - fn to_json(&self) -> Result; - fn to_json_object(&self) -> Result; + fn to_json(&self) -> Result; + fn to_json_object(&self) -> Result; fn from_json_object( - raw_object: JsonValue, + raw_object: serde_json::Value, platform_version: &PlatformVersion, ) -> Result where diff --git a/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/mod.rs index 6b680c64f0b..cdfa4efb946 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/mod.rs @@ -1,5 +1,5 @@ mod v0; -use crate::identity::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; use crate::serialization::ValueConvertible; pub use v0::*; diff --git a/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/v0/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/v0/mod.rs index 47ee14ddb7f..ffee2f76e64 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/v0/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/conversion/platform_value/v0/mod.rs @@ -1,7 +1,7 @@ +use crate::errors::ProtocolError; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; pub trait IdentityPublicKeyPlatformValueConversionMethodsV0 { fn to_object(&self) -> Result; diff --git a/packages/rs-dpp/src/identity/identity_public_key/key_type.rs b/packages/rs-dpp/src/identity/identity_public_key/key_type.rs index e87df348bb7..143cb891dcf 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/key_type.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/key_type.rs @@ -14,9 +14,9 @@ use lazy_static::lazy_static; #[cfg(feature = "bls-signatures")] use crate::bls_signatures::{self as bls_signatures, Bls12381G2Impl, BlsError}; +use crate::errors::ProtocolError; use crate::fee::Credits; use crate::version::PlatformVersion; -use crate::ProtocolError; #[cfg(feature = "random-public-keys")] use rand::rngs::StdRng; #[cfg(feature = "random-public-keys")] @@ -43,6 +43,7 @@ use std::convert::TryFrom; Default, strum::EnumIter, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum KeyType { #[default] ECDSA_SECP256K1 = 0, diff --git a/packages/rs-dpp/src/identity/identity_public_key/methods/hash/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/methods/hash/mod.rs index 5cc4828dd7e..4060c9ade95 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/methods/hash/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/methods/hash/mod.rs @@ -1,7 +1,7 @@ mod v0; -use crate::identity::IdentityPublicKey; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::IdentityPublicKey; use dashcore::Network; pub use v0::*; diff --git a/packages/rs-dpp/src/identity/identity_public_key/methods/hash/v0/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/methods/hash/v0/mod.rs index dd2b975e88f..a9373cb7dc5 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/methods/hash/v0/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/methods/hash/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::ProtocolError; +use crate::errors::ProtocolError; use dashcore::Network; pub trait IdentityPublicKeyHashMethodsV0 { diff --git a/packages/rs-dpp/src/identity/identity_public_key/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/mod.rs index 87ded0f5d51..d2e4471fbc7 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/mod.rs @@ -6,9 +6,9 @@ use bincode::{Decode, Encode}; use derive_more::From; use serde::{Deserialize, Serialize}; -mod key_type; -mod purpose; -mod security_level; +pub mod key_type; +pub mod purpose; +pub mod security_level; pub use key_type::KeyType; pub use purpose::Purpose; pub use security_level::SecurityLevel; @@ -16,10 +16,10 @@ pub mod accessors; pub(crate) mod conversion; pub mod fields; pub mod v0; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::errors::ProtocolError; pub use fields::*; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; +use platform_version::version::PlatformVersion; pub mod methods; pub use methods::*; @@ -27,8 +27,11 @@ pub mod contract_bounds; #[cfg(feature = "random-public-keys")] mod random; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type KeyID = u32; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type KeyCount = KeyID; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type TimestampMillis = u64; #[derive( @@ -49,6 +52,7 @@ pub type TimestampMillis = u64; )] #[platform_serialize(limit = 2000, unversioned)] //This is not platform versioned automatically #[serde(tag = "$version")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityPublicKey { #[serde(rename = "0")] V0(IdentityPublicKeyV0), diff --git a/packages/rs-dpp/src/identity/identity_public_key/purpose.rs b/packages/rs-dpp/src/identity/identity_public_key/purpose.rs index fbd5fcb1cb5..317a96ca58f 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/purpose.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/purpose.rs @@ -1,4 +1,4 @@ -use crate::identity::Purpose::{ +use crate::identity::identity_public_key::Purpose::{ AUTHENTICATION, DECRYPTION, ENCRYPTION, OWNER, SYSTEM, TRANSFER, VOTING, }; use anyhow::bail; @@ -25,6 +25,7 @@ use std::convert::TryFrom; Default, strum::EnumIter, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Purpose { /// at least one authentication key must be registered for all security levels #[default] diff --git a/packages/rs-dpp/src/identity/identity_public_key/random.rs b/packages/rs-dpp/src/identity/identity_public_key/random.rs index 6582a3567b9..5c80934a249 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/random.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/random.rs @@ -1,10 +1,10 @@ -use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::{ + contract_bounds::ContractBounds, v0::IdentityPublicKeyV0, IdentityPublicKey, KeyCount, KeyID, + KeyType, Purpose, SecurityLevel, +}; +use platform_version::version::PlatformVersion; -use crate::identity::{IdentityPublicKey, KeyCount, KeyID, KeyType, Purpose, SecurityLevel}; -use crate::version::PlatformVersion; -use crate::ProtocolError; - -use crate::identity::contract_bounds::ContractBounds; use rand::rngs::StdRng; use rand::SeedableRng; diff --git a/packages/rs-dpp/src/identity/identity_public_key/security_level.rs b/packages/rs-dpp/src/identity/identity_public_key/security_level.rs index 4cd9f0d2ed4..b37c77ad476 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/security_level.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/security_level.rs @@ -4,10 +4,10 @@ use ciborium::value::Value as CborValue; use serde_repr::{Deserialize_repr, Serialize_repr}; -use crate::consensus::basic::data_contract::UnknownSecurityLevelError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::data_contract::UnknownSecurityLevelError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use std::convert::TryFrom; #[repr(u8)] @@ -27,6 +27,7 @@ use std::convert::TryFrom; Default, strum::EnumIter, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum SecurityLevel { MASTER = 0, CRITICAL = 1, diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/accessors/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/accessors/mod.rs index eeba2df0b07..ea562f6e033 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/accessors/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/accessors/mod.rs @@ -1,12 +1,12 @@ -use crate::identity::contract_bounds::ContractBounds; use crate::identity::identity_public_key::accessors::v0::{ IdentityPublicKeyGettersV0, IdentityPublicKeySettersV0, }; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::identity::KeyType; -use crate::identity::Purpose; -use crate::identity::SecurityLevel; -use crate::identity::{KeyID, TimestampMillis}; +use crate::identity::identity_public_key::KeyType; +use crate::identity::identity_public_key::Purpose; +use crate::identity::identity_public_key::SecurityLevel; +use crate::identity::identity_public_key::{KeyID, TimestampMillis}; use platform_value::BinaryData; impl IdentityPublicKeyGettersV0 for IdentityPublicKeyV0 { diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/json.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/json.rs index ec0297e327d..c41668c9614 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/json.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/json.rs @@ -1,28 +1,28 @@ +use crate::errors::ProtocolError; use crate::identity::identity_public_key::conversion::json::IdentityPublicKeyJsonConversionMethodsV0; use crate::identity::identity_public_key::conversion::platform_value::IdentityPublicKeyPlatformValueConversionMethodsV0; use crate::identity::identity_public_key::fields::BINARY_DATA_FIELDS; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::{ReplacementType, Value}; -use serde_json::Value as JsonValue; +use platform_version::version::PlatformVersion; +// use serde_json::Value as JsonValue; use std::convert::{TryFrom, TryInto}; impl IdentityPublicKeyJsonConversionMethodsV0 for IdentityPublicKeyV0 { - fn to_json_object(&self) -> Result { + fn to_json_object(&self) -> Result { self.to_cleaned_object()? .try_into_validating_json() .map_err(ProtocolError::ValueError) } - fn to_json(&self) -> Result { + fn to_json(&self) -> Result { self.to_cleaned_object()? .try_into() .map_err(ProtocolError::ValueError) } fn from_json_object( - raw_object: JsonValue, + raw_object: serde_json::Value, platform_version: &PlatformVersion, ) -> Result { let mut value: Value = raw_object.into(); @@ -35,7 +35,7 @@ impl TryFrom<&str> for IdentityPublicKeyV0 { type Error = ProtocolError; fn try_from(value: &str) -> Result { - let mut platform_value: Value = serde_json::from_str::(value) + let mut platform_value: Value = serde_json::from_str::(value) .map_err(|e| ProtocolError::StringDecodeError(e.to_string()))? .into(); platform_value.replace_at_paths(BINARY_DATA_FIELDS, ReplacementType::BinaryBytes)?; diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/platform_value.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/platform_value.rs index ea2211f690d..27e821a6edb 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/platform_value.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/conversion/platform_value.rs @@ -1,8 +1,8 @@ +use crate::errors::ProtocolError; use crate::identity::identity_public_key::conversion::platform_value::IdentityPublicKeyPlatformValueConversionMethodsV0; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::version::PlatformVersion; -use crate::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; use std::convert::{TryFrom, TryInto}; impl IdentityPublicKeyPlatformValueConversionMethodsV0 for IdentityPublicKeyV0 { diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs index ea064e33b65..bf8ef0bdea9 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/methods/mod.rs @@ -1,8 +1,8 @@ +use crate::errors::ProtocolError; use crate::identity::identity_public_key::methods::hash::IdentityPublicKeyHashMethodsV0; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::identity::KeyType; +use crate::identity::identity_public_key::KeyType; use crate::util::hash::ripemd160_sha256; -use crate::ProtocolError; use anyhow::anyhow; #[cfg(feature = "ed25519-dalek")] use dashcore::ed25519_dalek; diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/mod.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/mod.rs index 0aa975dba75..37d9b202980 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/mod.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/mod.rs @@ -4,9 +4,9 @@ mod methods; #[cfg(feature = "random-public-keys")] mod random; -pub use crate::identity::KeyType; -pub use crate::identity::Purpose; -pub use crate::identity::SecurityLevel; +pub use crate::identity::identity_public_key::KeyType; +pub use crate::identity::identity_public_key::Purpose; +pub use crate::identity::identity_public_key::SecurityLevel; use bincode::{Decode, Encode}; @@ -15,11 +15,11 @@ use serde::{Deserialize, Serialize}; use crate::identity::identity_public_key::contract_bounds::ContractBounds; use crate::identity::identity_public_key::key_type::KEY_TYPE_MAX_SIZE_TYPE; -use crate::identity::Purpose::AUTHENTICATION; -use crate::identity::SecurityLevel::MASTER; -use crate::identity::{KeyID, TimestampMillis}; +use crate::identity::identity_public_key::Purpose::AUTHENTICATION; +use crate::identity::identity_public_key::SecurityLevel::MASTER; +use crate::identity::identity_public_key::{KeyID, TimestampMillis}; #[cfg(feature = "state-transitions")] -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; #[derive( Default, @@ -36,6 +36,7 @@ use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCrea Hash, )] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityPublicKeyV0 { pub id: KeyID, pub purpose: Purpose, diff --git a/packages/rs-dpp/src/identity/identity_public_key/v0/random.rs b/packages/rs-dpp/src/identity/identity_public_key/v0/random.rs index a7ba471b3ad..250399fa71e 100644 --- a/packages/rs-dpp/src/identity/identity_public_key/v0/random.rs +++ b/packages/rs-dpp/src/identity/identity_public_key/v0/random.rs @@ -1,12 +1,15 @@ -use crate::identity::contract_bounds::ContractBounds; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; +use crate::identity::identity_public_key::Purpose::{AUTHENTICATION, OWNER, TRANSFER, VOTING}; +use crate::identity::identity_public_key::SecurityLevel::{CRITICAL, HIGH, MASTER, MEDIUM}; use crate::identity::KeyType::{ECDSA_HASH160, ECDSA_SECP256K1}; -use crate::identity::Purpose::{AUTHENTICATION, OWNER, TRANSFER, VOTING}; -use crate::identity::SecurityLevel::{CRITICAL, HIGH, MASTER, MEDIUM}; -use crate::identity::{KeyCount, KeyID, KeyType, Purpose, SecurityLevel}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + KeyCount, KeyID, KeyType, +}; use platform_value::BinaryData; +use platform_version::version::PlatformVersion; use rand::rngs::StdRng; use rand::Rng; use std::convert::TryFrom; diff --git a/packages/rs-dpp/src/identity/methods/create_basic_identity/mod.rs b/packages/rs-dpp/src/identity/methods/create_basic_identity/mod.rs index 2da82b989ff..c982330564f 100644 --- a/packages/rs-dpp/src/identity/methods/create_basic_identity/mod.rs +++ b/packages/rs-dpp/src/identity/methods/create_basic_identity/mod.rs @@ -1,7 +1,7 @@ mod v0; -use crate::prelude::Identity; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::Identity; use platform_value::Identifier; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/identity/methods/create_basic_identity/v0/mod.rs b/packages/rs-dpp/src/identity/methods/create_basic_identity/v0/mod.rs index 638a8603379..cedc4507481 100644 --- a/packages/rs-dpp/src/identity/methods/create_basic_identity/v0/mod.rs +++ b/packages/rs-dpp/src/identity/methods/create_basic_identity/v0/mod.rs @@ -1,5 +1,5 @@ -use crate::identity::IdentityV0; -use crate::prelude::Identity; +use crate::identity::v0::IdentityV0; +use crate::identity::Identity; use platform_value::Identifier; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/identity/mod.rs b/packages/rs-dpp/src/identity/mod.rs index 917a23637f6..4d973f89d26 100644 --- a/packages/rs-dpp/src/identity/mod.rs +++ b/packages/rs-dpp/src/identity/mod.rs @@ -1,14 +1,18 @@ pub use credits_converter::*; -pub use identity::*; +pub use identity::{Identity, PartialIdentity}; #[cfg(feature = "client")] pub use identity_facade::*; -pub use identity_public_key::*; +pub use identity_public_key::contract_bounds::{ContractBounds, ContractBoundsType}; +pub use identity_public_key::fields::BINARY_DATA_FIELDS; +pub use identity_public_key::security_level::SecurityLevel; +pub use identity_public_key::v0::IdentityPublicKeyV0; +pub use identity_public_key::TimestampMillis; pub mod core_script; mod get_biggest_possible_identity; #[allow(clippy::module_inception)] -mod identity; +pub mod identity; pub mod identity_public_key; pub mod state_transition; @@ -32,5 +36,5 @@ pub mod random; pub mod v0; pub use fields::*; - -pub use v0::*; +pub use identity_public_key::{IdentityPublicKey, KeyCount, KeyID, KeyType, Purpose}; +pub use v0::IdentityV0; diff --git a/packages/rs-dpp/src/identity/random.rs b/packages/rs-dpp/src/identity/random.rs index c14525272c1..266d7816542 100644 --- a/packages/rs-dpp/src/identity/random.rs +++ b/packages/rs-dpp/src/identity/random.rs @@ -1,7 +1,10 @@ +use crate::errors::ProtocolError; use crate::identity::v0::IdentityV0; -use crate::identity::{Identity, IdentityPublicKey, KeyCount}; -use crate::version::PlatformVersion; -use crate::ProtocolError; +use crate::identity::{ + identity_public_key::{IdentityPublicKey, KeyCount}, + Identity, +}; +use platform_version::version::PlatformVersion; use rand::prelude::StdRng; use std::iter::FromIterator; diff --git a/packages/rs-dpp/src/identity/signer.rs b/packages/rs-dpp/src/identity/signer.rs index e069e43a118..fcb394f9e73 100644 --- a/packages/rs-dpp/src/identity/signer.rs +++ b/packages/rs-dpp/src/identity/signer.rs @@ -1,5 +1,5 @@ -use crate::prelude::IdentityPublicKey; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::IdentityPublicKey; use platform_value::BinaryData; use std::fmt::Debug; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs index 6829ea6eaf3..94d9f73a342 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/chain_asset_lock_proof.rs @@ -2,9 +2,10 @@ use ::serde::{Deserialize, Serialize}; use platform_value::Value; use std::convert::TryFrom; +use crate::errors::ProtocolError; use crate::util::hash::hash_double; -use crate::{identifier::Identifier, ProtocolError}; -use dashcore::OutPoint; +use dashcore::blockdata::transaction::OutPoint; +use platform_value::Identifier; /// Instant Asset Lock Proof is a part of Identity Create and Identity Topup /// transitions. It is a proof that specific output of dash is locked in credits @@ -12,6 +13,7 @@ use dashcore::OutPoint; /// To prove that the output is locked, a height where transaction was chain locked is provided. #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ChainAssetLockProof { /// Core height on which the asset lock transaction was chain locked or higher pub core_chain_locked_height: u32, diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/mod.rs index 5b19d827d02..16e71fe26f5 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/chain/mod.rs @@ -1,2 +1,2 @@ pub use chain_asset_lock_proof::*; -mod chain_asset_lock_proof; +pub mod chain_asset_lock_proof; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs index 4fad991e367..89421013f2c 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/instant_asset_lock_proof.rs @@ -1,8 +1,8 @@ use std::convert::{TryFrom, TryInto}; +use dashcore::blockdata::transaction::{OutPoint, Transaction, special_transaction::TransactionPayload, txin::TxIn, txout::TxOut}; use dashcore::consensus::{deserialize, Encodable}; -use dashcore::transaction::special_transaction::TransactionPayload; -use dashcore::{InstantLock, OutPoint, Transaction, TxIn, TxOut}; +use dashcore::ephemerealdata::instant_lock::InstantLock; use platform_value::{BinaryData, Value}; #[cfg(feature = "validation")] @@ -13,19 +13,20 @@ use serde::de::Error as DeError; use serde::ser::Error as SerError; use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use crate::prelude::Identifier; +use crate::errors::ProtocolError; #[cfg(feature = "cbor")] use crate::util::cbor_value::CborCanonicalMap; use crate::util::hash::hash_double; #[cfg(feature = "validation")] use crate::validation::SimpleConsensusValidationResult; -use crate::ProtocolError; +use platform_value::Identifier; /// Instant Asset Lock Proof is a part of Identity Create and Identity Topup /// transitions. It is a proof that specific output of dash is locked in credits /// pull and the transitions can mint credits and populate identity's balance. /// To prove that the output is locked, an Instant Lock is provided. #[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InstantAssetLockProof { /// The transaction's Instant Lock pub instant_lock: InstantLock, diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/methods/validate_structure/v0/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/methods/validate_structure/v0/mod.rs index 1ebf37418bd..7bf5213c12d 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/methods/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/methods/validate_structure/v0/mod.rs @@ -1,8 +1,8 @@ use platform_version::version::PlatformVersion; -use crate::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; +use crate::errors::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; use crate::identity::state_transition::asset_lock_proof::InstantAssetLockProof; use crate::identity::state_transition::asset_lock_proof::validate_asset_lock_transaction_structure::validate_asset_lock_transaction_structure; -use crate::ProtocolError; +use crate::errors::ProtocolError; use crate::validation::SimpleConsensusValidationResult; pub fn validate_instant_asset_lock_proof_structure_v0( diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/mod.rs index d259f39556c..119a09d0e5f 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/instant/mod.rs @@ -1,4 +1,4 @@ -pub use instant_asset_lock_proof::*; +pub use instant_asset_lock_proof::{InstantAssetLockProof, RawInstantLockProof}; -mod instant_asset_lock_proof; +pub mod instant_asset_lock_proof; mod methods; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs index 389736ec642..9cb36b507ea 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs @@ -1,19 +1,19 @@ use std::convert::{TryFrom, TryInto}; -use dashcore::{OutPoint, Transaction}; +use dashcore::blockdata::transaction::{OutPoint, Transaction}; use serde::{Deserialize, Deserializer, Serialize}; use bincode::{Decode, Encode}; -pub use instant::*; +pub use instant::{InstantAssetLockProof, RawInstantLockProof}; +use platform_value::Identifier; use platform_value::Value; #[cfg(feature = "validation")] use platform_version::version::PlatformVersion; use serde::de::Error; -use crate::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; -use crate::prelude::Identifier; +use crate::identity::state_transition::asset_lock_proof::chain::chain_asset_lock_proof::ChainAssetLockProof; #[cfg(feature = "validation")] use crate::validation::SimpleConsensusValidationResult; use crate::{ProtocolError, SerdeParsingError}; @@ -27,6 +27,7 @@ pub mod validate_asset_lock_transaction_structure; #[derive(Clone, Debug, Eq, PartialEq, Serialize, Encode, Decode)] #[serde(untagged)] #[allow(clippy::large_enum_variant)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum AssetLockProof { Instant(#[bincode(with_serde)] InstantAssetLockProof), Chain(#[bincode(with_serde)] ChainAssetLockProof), diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/mod.rs index 42255735b95..f5e38f20463 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/mod.rs @@ -1,5 +1,5 @@ +use crate::errors::ProtocolError; use crate::validation::ConsensusValidationResult; -use crate::ProtocolError; use dashcore::{Transaction, TxOut}; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/v0/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/v0/mod.rs index e55d94cc4b4..366b0b28d32 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/v0/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/validate_asset_lock_transaction_structure/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::consensus::basic::identity::{ +use crate::errors::consensus::basic::identity::{ IdentityAssetLockTransactionOutputNotFoundError, InvalidIdentityAssetLockTransactionError, InvalidIdentityAssetLockTransactionOutputError, }; diff --git a/packages/rs-dpp/src/identity/state_transition/mod.rs b/packages/rs-dpp/src/identity/state_transition/mod.rs index 874928f8c58..745854eabbf 100644 --- a/packages/rs-dpp/src/identity/state_transition/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/mod.rs @@ -1,7 +1,8 @@ // TODO: Move to state_transitions module +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::ProtocolError; -use asset_lock_proof::AssetLockProof; +// pub use asset_lock_proof::AssetLockProof; pub mod asset_lock_proof; diff --git a/packages/rs-dpp/src/identity/v0/conversion/json.rs b/packages/rs-dpp/src/identity/v0/conversion/json.rs index 98fb62cb705..f2048d14613 100644 --- a/packages/rs-dpp/src/identity/v0/conversion/json.rs +++ b/packages/rs-dpp/src/identity/v0/conversion/json.rs @@ -1,26 +1,26 @@ use crate::identity::conversion::json::IdentityJsonConversionMethodsV0; use crate::identity::conversion::platform_value::IdentityPlatformValueConversionMethodsV0; -use crate::identity::{identity_public_key, IdentityV0, IDENTIFIER_FIELDS_RAW_OBJECT}; +use crate::identity::{identity_public_key, v0::IdentityV0, IDENTIFIER_FIELDS_RAW_OBJECT}; use crate::ProtocolError; use platform_value::{ReplacementType, Value}; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; impl IdentityJsonConversionMethodsV0 for IdentityV0 { - fn to_json_object(&self) -> Result { + fn to_json_object(&self) -> Result { self.to_cleaned_object()? .try_into_validating_json() .map_err(ProtocolError::ValueError) } - fn to_json(&self) -> Result { + fn to_json(&self) -> Result { self.to_cleaned_object()? .try_into() .map_err(ProtocolError::ValueError) } /// Creates an identity from a json structure - fn from_json(json_object: JsonValue) -> Result { + fn from_json(json_object: serde_json::Value) -> Result { let mut platform_value: Value = json_object.into(); platform_value diff --git a/packages/rs-dpp/src/identity/v0/conversion/platform_value.rs b/packages/rs-dpp/src/identity/v0/conversion/platform_value.rs index c662298ca13..4c7cb45c429 100644 --- a/packages/rs-dpp/src/identity/v0/conversion/platform_value.rs +++ b/packages/rs-dpp/src/identity/v0/conversion/platform_value.rs @@ -1,5 +1,5 @@ use crate::identity::conversion::platform_value::IdentityPlatformValueConversionMethodsV0; -use crate::identity::{property_names, IdentityV0}; +use crate::identity::{property_names, v0::IdentityV0}; use crate::serialization::ValueConvertible; use crate::ProtocolError; diff --git a/packages/rs-dpp/src/identity/v0/mod.rs b/packages/rs-dpp/src/identity/v0/mod.rs index 47bd892074e..1e0fa070d2d 100644 --- a/packages/rs-dpp/src/identity/v0/mod.rs +++ b/packages/rs-dpp/src/identity/v0/mod.rs @@ -12,14 +12,15 @@ use platform_value::Value; #[cfg(feature = "identity-serde-conversion")] use serde::{Deserialize, Serialize}; -use crate::identity::{IdentityPublicKey, KeyID, PartialIdentity}; +use crate::identity::identity_public_key::{IdentityPublicKey, KeyID}; +use crate::identity::PartialIdentity; use crate::prelude::Revision; #[cfg(feature = "identity-value-conversion")] use crate::errors::ProtocolError; -use crate::identifier::Identifier; #[cfg(feature = "identity-serialization")] use bincode::{Decode, Encode}; +use platform_value::Identifier; /// Implement the Identity. Identity is a low-level construct that provides the foundation /// for user-facing functionality on the platform @@ -30,7 +31,7 @@ use bincode::{Decode, Encode}; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] - +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityV0 { pub id: Identifier, #[cfg_attr( @@ -50,7 +51,7 @@ impl Hash for IdentityV0 { mod public_key_serialization { use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; - use crate::identity::{IdentityPublicKey, KeyID}; + use crate::identity::identity_public_key::{IdentityPublicKey, KeyID}; use serde::ser::SerializeSeq; use serde::{Deserialize, Serializer}; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/identity/v0/random.rs b/packages/rs-dpp/src/identity/v0/random.rs index 5733aeda9ee..f701e5515c9 100644 --- a/packages/rs-dpp/src/identity/v0/random.rs +++ b/packages/rs-dpp/src/identity/v0/random.rs @@ -1,12 +1,11 @@ +use crate::identity::identity_public_key::{IdentityPublicKey, KeyID}; use crate::identity::v0::IdentityV0; -use crate::identity::{IdentityPublicKey, KeyID}; -use crate::prelude::Identifier; - use crate::ProtocolError; +use platform_value::Identifier; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use crate::identity::identity_public_key::KeyCount; -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; use rand::rngs::StdRng; use rand::{Rng, SeedableRng}; use std::collections::BTreeMap; diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index 66599277405..c80c4252384 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -1,6 +1,6 @@ #![cfg_attr(docsrs, feature(doc_cfg))] // Coding conventions . -#![forbid(unsafe_code)] +// #![forbid(unsafe_code)] //#![deny(missing_docs)] #![allow(dead_code)] @@ -10,7 +10,11 @@ pub use dashcore; #[cfg(feature = "client")] pub use dash_platform_protocol::DashPlatformProtocol; -pub use errors::*; +pub use errors::{ + CompatibleProtocolVersionIsNotDefinedError, DPPError, DashPlatformProtocolInitError, + InvalidVectorSizeError, NonConsensusError, ProtocolError, PublicKeyValidationError, + SerdeParsingError, +}; pub mod data_contract; pub mod document; @@ -66,48 +70,54 @@ pub use async_trait; pub use bls::*; pub mod prelude { - - pub use crate::data_contract::DataContract; - #[cfg(feature = "extended-document")] - pub use crate::document::ExtendedDocument; - pub use crate::errors::ProtocolError; pub use crate::identifier::Identifier; - pub use crate::identity::state_transition::asset_lock_proof::AssetLockProof; - pub use crate::identity::Identity; - pub use crate::identity::IdentityPublicKey; #[cfg(feature = "validation")] pub use crate::validation::ConsensusValidationResult; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type EpochInterval = u16; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type BlockHeight = u64; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type FeeMultiplier = u64; pub type BlockHeightInterval = u64; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type CoreBlockHeight = u32; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type TimestampMillis = u64; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type TimestampMillisInterval = u64; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type StartAtIncluded = bool; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type TimestampIncluded = bool; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type Revision = u64; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type IdentityNonce = u64; - + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type SenderKeyIndex = u32; + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type RecipientKeyIndex = u32; /// The index of the user's key that is used to derive keys that will be used to encrypt the contact's user id in encToUserId and the private data. + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type RootEncryptionKeyIndex = u32; /// The index at which to derive the root encryption key. + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type DerivationEncryptionKeyIndex = u32; /// UserFeeIncrease is the additional percentage of the processing fee. /// A 1 here means we pay 1% more in processing fees. A 100 means we pay 100% more. + #[cfg_attr(feature = "apple", ferment_macro::export)] pub type UserFeeIncrease = u16; } @@ -121,4 +131,5 @@ pub use data_contracts; #[cfg(feature = "jsonschema")] pub use jsonschema; pub use platform_serialization; +pub use platform_serialization_derive; pub use platform_value; diff --git a/packages/rs-dpp/src/metadata.rs b/packages/rs-dpp/src/metadata.rs index 16236aa0755..e31c4371bb6 100644 --- a/packages/rs-dpp/src/metadata.rs +++ b/packages/rs-dpp/src/metadata.rs @@ -8,6 +8,7 @@ use crate::{errors::ProtocolError, prelude::TimestampMillis, util::deserializer: Serialize, Deserialize, Encode, Decode, Debug, Default, Clone, Copy, PartialEq, PartialOrd, Eq, )] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Metadata { #[serde(default)] pub block_height: u64, diff --git a/packages/rs-dpp/src/nft/mod.rs b/packages/rs-dpp/src/nft/mod.rs index bec8e4742a3..147240d18bf 100644 --- a/packages/rs-dpp/src/nft/mod.rs +++ b/packages/rs-dpp/src/nft/mod.rs @@ -1,10 +1,11 @@ -use crate::consensus::basic::data_contract::UnknownTradeModeError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::data_contract::UnknownTradeModeError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::ProtocolError; use std::fmt; use std::fmt::{Display, Formatter}; #[derive(Debug, PartialEq, Clone, Copy)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TradeMode { None = 0, DirectPurchase = 1, diff --git a/packages/rs-dpp/src/schema/mod.rs b/packages/rs-dpp/src/schema/mod.rs index 92bc6186b45..de45e38f93c 100644 --- a/packages/rs-dpp/src/schema/mod.rs +++ b/packages/rs-dpp/src/schema/mod.rs @@ -1,22 +1,22 @@ use lazy_static::lazy_static; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; pub mod identity; lazy_static! { - pub static ref BASE_TRANSITION_SCHEMA: JsonValue = serde_json::from_str(include_str!( + pub static ref BASE_TRANSITION_SCHEMA: serde_json::Value = serde_json::from_str(include_str!( "./document/v0/stateTransition/documentTransition/base.json" )) .unwrap(); - pub static ref CREATE_TRANSITION_SCHEMA: JsonValue = serde_json::from_str(include_str!( + pub static ref CREATE_TRANSITION_SCHEMA: serde_json::Value = serde_json::from_str(include_str!( "./document/v0/stateTransition/documentTransition/create.json" )) .unwrap(); - pub static ref REPLACE_TRANSITION_SCHEMA: JsonValue = serde_json::from_str(include_str!( + pub static ref REPLACE_TRANSITION_SCHEMA: serde_json::Value = serde_json::from_str(include_str!( "./document/v0/stateTransition/documentTransition/replace.json" )) .unwrap(); - pub static ref DOCUMENTS_BATCH_TRANSITIONS_SCHEMA: JsonValue = serde_json::from_str( + pub static ref DOCUMENTS_BATCH_TRANSITIONS_SCHEMA: serde_json::Value = serde_json::from_str( include_str!("./document/v0/stateTransition/documentsBatch.json") ) .unwrap(); diff --git a/packages/rs-dpp/src/serialization/serialization_traits.rs b/packages/rs-dpp/src/serialization/serialization_traits.rs index 502d2a6eb65..fdea1c315e1 100644 --- a/packages/rs-dpp/src/serialization/serialization_traits.rs +++ b/packages/rs-dpp/src/serialization/serialization_traits.rs @@ -2,17 +2,17 @@ feature = "message-signature-verification", feature = "message-signing" ))] -use crate::identity::KeyType; +use crate::identity::identity_public_key::KeyType; use serde::{Deserialize, Serialize}; +use crate::errors::ProtocolError; #[cfg(feature = "message-signature-verification")] use crate::validation::SimpleConsensusValidationResult; -use crate::version::PlatformVersion; #[cfg(feature = "message-signing")] use crate::BlsModule; -use crate::ProtocolError; use platform_value::Value; +use platform_version::version::PlatformVersion; pub trait Signable { fn signable_bytes(&self) -> Result, ProtocolError>; diff --git a/packages/rs-dpp/src/signing.rs b/packages/rs-dpp/src/signing.rs index d637c0480b1..0cd5a758767 100644 --- a/packages/rs-dpp/src/signing.rs +++ b/packages/rs-dpp/src/signing.rs @@ -1,14 +1,14 @@ -use crate::identity::KeyType; +use crate::identity::identity_public_key::KeyType; use crate::serialization::PlatformMessageSignable; #[cfg(feature = "message-signature-verification")] use crate::{ - consensus::signature::{ + errors::consensus::signature::{ BasicBLSError, BasicECDSAError, SignatureError, SignatureShouldNotBePresentError, }, validation::SimpleConsensusValidationResult, }; #[cfg(feature = "message-signing")] -use crate::{BlsModule, ProtocolError}; +use crate::{errors::ProtocolError, BlsModule}; use dashcore::signer; #[cfg(feature = "bls-signatures")] use { diff --git a/packages/rs-dpp/src/state_transition/abstract_state_transition.rs b/packages/rs-dpp/src/state_transition/abstract_state_transition.rs index 7bd8e8f9f1f..28ee0df78d6 100644 --- a/packages/rs-dpp/src/state_transition/abstract_state_transition.rs +++ b/packages/rs-dpp/src/state_transition/abstract_state_transition.rs @@ -1,6 +1,4 @@ use serde::Serialize; -#[cfg(feature = "state-transition-json-conversion")] -use serde_json::Value as JsonValue; pub mod state_transition_helpers { use super::*; @@ -13,7 +11,7 @@ pub mod state_transition_helpers { pub fn to_json<'a, I: IntoIterator>( serializable: impl Serialize, skip_signature_paths: I, - ) -> Result { + ) -> Result { to_object(serializable, skip_signature_paths) .and_then(|v| v.try_into().map_err(ProtocolError::ValueError)) } diff --git a/packages/rs-dpp/src/state_transition/errors/invalid_identity_public_key_type_error.rs b/packages/rs-dpp/src/state_transition/errors/invalid_identity_public_key_type_error.rs index 7685a719849..2e6f6ad9115 100644 --- a/packages/rs-dpp/src/state_transition/errors/invalid_identity_public_key_type_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/invalid_identity_public_key_type_error.rs @@ -1,12 +1,13 @@ use thiserror::Error; -use crate::identity::KeyType; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::KeyType; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Invalid signature type")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidIdentityPublicKeyTypeError { - public_key_type: KeyType, + pub public_key_type: KeyType, } impl InvalidIdentityPublicKeyTypeError { diff --git a/packages/rs-dpp/src/state_transition/errors/invalid_signature_public_key_error.rs b/packages/rs-dpp/src/state_transition/errors/invalid_signature_public_key_error.rs index 9a4a60027d0..67e3eb325a6 100644 --- a/packages/rs-dpp/src/state_transition/errors/invalid_signature_public_key_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/invalid_signature_public_key_error.rs @@ -1,10 +1,11 @@ -use crate::ProtocolError; +use crate::errors::ProtocolError; use thiserror::Error; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Invalid signature public key")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct InvalidSignaturePublicKeyError { - public_key: Vec, + pub public_key: Vec, } impl InvalidSignaturePublicKeyError { diff --git a/packages/rs-dpp/src/state_transition/errors/mod.rs b/packages/rs-dpp/src/state_transition/errors/mod.rs index aa6cd9e5ed1..a9f2d02d354 100644 --- a/packages/rs-dpp/src/state_transition/errors/mod.rs +++ b/packages/rs-dpp/src/state_transition/errors/mod.rs @@ -2,56 +2,56 @@ feature = "state-transition-validation", feature = "state-transition-signing" ))] -mod invalid_identity_public_key_type_error; +pub mod invalid_identity_public_key_type_error; #[cfg(any( feature = "state-transition-validation", feature = "state-transition-signing" ))] -mod invalid_signature_public_key_error; +pub mod invalid_signature_public_key_error; #[cfg(feature = "state-transition-validation")] -mod public_key_mismatch_error; +pub mod public_key_mismatch_error; #[cfg(feature = "state-transition-validation")] -mod public_key_security_level_not_met_error; +pub mod public_key_security_level_not_met_error; #[cfg(any( all(feature = "state-transitions", feature = "validation"), feature = "state-transition-validation" ))] -mod state_transition_error; +pub mod state_transition_error; #[cfg(feature = "state-transition-validation")] -mod state_transition_is_not_signed_error; +pub mod state_transition_is_not_signed_error; #[cfg(any( all(feature = "state-transitions", feature = "validation"), feature = "state-transition-validation", feature = "state-transition-signing", feature = "state-transition-validation" ))] -mod wrong_public_key_purpose_error; +pub mod wrong_public_key_purpose_error; #[cfg(any( feature = "state-transition-validation", feature = "state-transition-signing" ))] -pub use invalid_identity_public_key_type_error::*; +pub use invalid_identity_public_key_type_error::InvalidIdentityPublicKeyTypeError; #[cfg(any( feature = "state-transition-validation", feature = "state-transition-signing" ))] -pub use invalid_signature_public_key_error::*; +pub use invalid_signature_public_key_error::InvalidSignaturePublicKeyError; #[cfg(feature = "state-transition-validation")] -pub use public_key_mismatch_error::*; +pub use public_key_mismatch_error::PublicKeyMismatchError; #[cfg(feature = "state-transition-validation")] -pub use public_key_security_level_not_met_error::*; +pub use public_key_security_level_not_met_error::PublicKeySecurityLevelNotMetError; #[cfg(any( all(feature = "state-transitions", feature = "validation"), feature = "state-transition-validation" ))] -pub use state_transition_error::*; +pub use state_transition_error::StateTransitionError; #[cfg(feature = "state-transition-validation")] -pub use state_transition_is_not_signed_error::*; +pub use state_transition_is_not_signed_error::StateTransitionIsNotSignedError; #[cfg(any( all(feature = "state-transitions", feature = "validation"), feature = "state-transition-validation", feature = "state-transition-signing", feature = "state-transition-validation" ))] -pub use wrong_public_key_purpose_error::*; +pub use wrong_public_key_purpose_error::WrongPublicKeyPurposeError; diff --git a/packages/rs-dpp/src/state_transition/errors/public_key_mismatch_error.rs b/packages/rs-dpp/src/state_transition/errors/public_key_mismatch_error.rs index 7716e98a963..39a8a04f33b 100644 --- a/packages/rs-dpp/src/state_transition/errors/public_key_mismatch_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/public_key_mismatch_error.rs @@ -1,12 +1,13 @@ use thiserror::Error; -use crate::identity::IdentityPublicKey; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::IdentityPublicKey; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Public key mismatched")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeyMismatchError { - public_key: IdentityPublicKey, + pub public_key: IdentityPublicKey, } impl PublicKeyMismatchError { diff --git a/packages/rs-dpp/src/state_transition/errors/public_key_security_level_not_met_error.rs b/packages/rs-dpp/src/state_transition/errors/public_key_security_level_not_met_error.rs index 898c22a30f8..1f8aca3055b 100644 --- a/packages/rs-dpp/src/state_transition/errors/public_key_security_level_not_met_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/public_key_security_level_not_met_error.rs @@ -1,13 +1,14 @@ use thiserror::Error; -use crate::identity::SecurityLevel; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::SecurityLevel; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Invalid key security level: {public_key_security_level}. The state transition requires at least: {required_security_level}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeySecurityLevelNotMetError { - public_key_security_level: SecurityLevel, - required_security_level: SecurityLevel, + pub public_key_security_level: SecurityLevel, + pub required_security_level: SecurityLevel, } impl PublicKeySecurityLevelNotMetError { diff --git a/packages/rs-dpp/src/state_transition/errors/state_transition_error.rs b/packages/rs-dpp/src/state_transition/errors/state_transition_error.rs index 3bdd8b32a3b..f78fbd48490 100644 --- a/packages/rs-dpp/src/state_transition/errors/state_transition_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/state_transition_error.rs @@ -1,10 +1,11 @@ -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use platform_value::Value; use platform_version::version::ProtocolVersion; use std::ops::RangeInclusive; use thiserror::Error; #[derive(Error, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StateTransitionError { #[error("Invalid State Transition: {errors:?}")] InvalidStateTransitionError { diff --git a/packages/rs-dpp/src/state_transition/errors/state_transition_is_not_signed_error.rs b/packages/rs-dpp/src/state_transition/errors/state_transition_is_not_signed_error.rs index cc126cdb956..536a98e63c6 100644 --- a/packages/rs-dpp/src/state_transition/errors/state_transition_is_not_signed_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/state_transition_is_not_signed_error.rs @@ -1,12 +1,13 @@ use thiserror::Error; +use crate::errors::ProtocolError; use crate::state_transition::StateTransition; -use crate::ProtocolError; #[derive(Error, Debug, Clone)] #[error("State Transition is not signed")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct StateTransitionIsNotSignedError { - state_transition: StateTransition, + pub state_transition: StateTransition, } impl StateTransitionIsNotSignedError { diff --git a/packages/rs-dpp/src/state_transition/errors/wrong_public_key_purpose_error.rs b/packages/rs-dpp/src/state_transition/errors/wrong_public_key_purpose_error.rs index 5b469e2fa9c..d07ccf66032 100644 --- a/packages/rs-dpp/src/state_transition/errors/wrong_public_key_purpose_error.rs +++ b/packages/rs-dpp/src/state_transition/errors/wrong_public_key_purpose_error.rs @@ -1,14 +1,15 @@ use thiserror::Error; -use crate::identity::Purpose; -use crate::ProtocolError; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::Purpose; use itertools::Itertools; #[derive(Error, Debug, Clone, PartialEq, Eq)] #[error("Invalid identity key purpose {public_key_purpose}. This state transition requires {}", allowed_key_purposes.iter().map(|s| s.to_string()).join(" | "))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct WrongPublicKeyPurposeError { - public_key_purpose: Purpose, - allowed_key_purposes: Vec, + pub public_key_purpose: Purpose, + pub allowed_key_purposes: Vec, } impl WrongPublicKeyPurposeError { diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index de8e0b4ec97..9792f0cca18 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -21,14 +21,14 @@ use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, Plat use platform_version::version::{PlatformVersion, ProtocolVersion, ALL_VERSIONS, LATEST_VERSION}; mod abstract_state_transition; +use crate::errors::ProtocolError; #[cfg(any( feature = "state-transition-signing", feature = "state-transition-validation" ))] use crate::BlsModule; -use crate::ProtocolError; -mod state_transition_types; +pub mod state_transition_types; pub mod state_transition_factory; @@ -45,46 +45,45 @@ mod traits; // pub mod state_transition_fee; #[cfg(feature = "state-transition-signing")] -use crate::consensus::signature::InvalidSignaturePublicKeySecurityLevelError; +use crate::errors::consensus::signature::InvalidSignaturePublicKeySecurityLevelError; #[cfg(feature = "state-transition-validation")] -use crate::consensus::signature::{ +use crate::errors::consensus::signature::{ InvalidStateTransitionSignatureError, PublicKeyIsDisabledError, SignatureError, }; #[cfg(feature = "state-transition-validation")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; pub use traits::*; +use crate::balances::credits::Credits; use crate::balances::credits::CREDITS_PER_DUFF; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::fee::Credits; #[cfg(any( feature = "state-transition-signing", feature = "state-transition-validation" ))] use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::state_transition::OptionallyAssetLockProved; -use crate::identity::Purpose; #[cfg(any( feature = "state-transition-signing", feature = "state-transition-validation" ))] use crate::identity::{IdentityPublicKey, KeyType}; -use crate::identity::{KeyID, SecurityLevel}; -use crate::prelude::{AssetLockProof, UserFeeIncrease}; use crate::serialization::{PlatformDeserializable, Signable}; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::batched_transition::BatchedTransitionRef; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; -use crate::state_transition::batch_transition::{BatchTransition, BatchTransitionSignable}; -use crate::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use crate::state_transition::data_contract_create_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::{BatchTransition, BatchTransitionSignable}; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::{ DataContractCreateTransition, DataContractCreateTransitionSignable, }; -use crate::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; -use crate::state_transition::data_contract_update_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionSignable, }; #[cfg(feature = "state-transition-signing")] @@ -97,28 +96,27 @@ use crate::state_transition::errors::WrongPublicKeyPurposeError; use crate::state_transition::errors::{ InvalidIdentityPublicKeyTypeError, PublicKeyMismatchError, StateTransitionIsNotSignedError, }; -use crate::state_transition::identity_create_transition::{ +use crate::state_transition::state_transitions::identity::identity_create_transition::{ IdentityCreateTransition, IdentityCreateTransitionSignable, }; -use crate::state_transition::identity_credit_transfer_transition::{ +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::{ IdentityCreditTransferTransition, IdentityCreditTransferTransitionSignable, }; -use crate::state_transition::identity_credit_withdrawal_transition::{ +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::{ IdentityCreditWithdrawalTransition, IdentityCreditWithdrawalTransitionSignable, }; -use crate::state_transition::identity_topup_transition::{ +use crate::state_transition::state_transitions::identity::identity_topup_transition::{ IdentityTopUpTransition, IdentityTopUpTransitionSignable, }; -use crate::state_transition::identity_update_transition::{ +use crate::state_transition::state_transitions::identity::identity_update_transition::{ IdentityUpdateTransition, IdentityUpdateTransitionSignable, }; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransitionSignable; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransitionSignable; #[cfg(feature = "state-transition-signing")] use crate::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use state_transitions::document::batch_transition::batched_transition::token_transition::TokenTransition; -pub use state_transitions::*; - +use crate::prelude::UserFeeIncrease; pub type GetDataContractSecurityLevelRequirementFn = fn(Identifier, String) -> Result; @@ -265,6 +263,7 @@ macro_rules! call_errorable_method_identity_signed { )] #[platform_serialize(unversioned)] //versioned directly, no need to use platform_version #[platform_serialize(limit = 100000)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StateTransition { DataContractCreate(DataContractCreateTransition), DataContractUpdate(DataContractUpdateTransition), diff --git a/packages/rs-dpp/src/state_transition/proof_result.rs b/packages/rs-dpp/src/state_transition/proof_result.rs index b35c3503309..063d68bbb99 100644 --- a/packages/rs-dpp/src/state_transition/proof_result.rs +++ b/packages/rs-dpp/src/state_transition/proof_result.rs @@ -12,6 +12,7 @@ use platform_value::Identifier; use std::collections::BTreeMap; #[derive(Debug, strum::Display, derive_more::TryInto)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StateTransitionProofResult { VerifiedDataContract(DataContract), VerifiedIdentity(Identity), diff --git a/packages/rs-dpp/src/state_transition/serialization.rs b/packages/rs-dpp/src/state_transition/serialization.rs index 998c0e017c7..c7a5087d77f 100644 --- a/packages/rs-dpp/src/state_transition/serialization.rs +++ b/packages/rs-dpp/src/state_transition/serialization.rs @@ -1,6 +1,6 @@ +use crate::errors::ProtocolError; use crate::serialization::PlatformDeserializable; use crate::state_transition::StateTransition; -use crate::ProtocolError; impl StateTransition { pub fn deserialize_many(raw_state_transitions: &[Vec]) -> Result, ProtocolError> { @@ -13,39 +13,39 @@ impl StateTransition { #[cfg(test)] mod tests { + use crate::state_transition::AssetLockProof; use crate::bls::native_bls::NativeBlsModule; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::identity::accessors::IdentityGettersV0; use crate::identity::core_script::CoreScript; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use crate::identity::Identity; - use crate::prelude::AssetLockProof; use crate::serialization::PlatformMessageSignable; use crate::serialization::Signable; use crate::serialization::{PlatformDeserializable, PlatformSerializable}; - use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; - use crate::state_transition::data_contract_update_transition::{ + use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; + use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, }; - use crate::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; - use crate::state_transition::batch_transition::{ + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; + use crate::state_transition::state_transitions::document::batch_transition::{ BatchTransition, BatchTransitionV1, }; - use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; - use crate::state_transition::identity_create_transition::IdentityCreateTransition; - use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; - use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; - use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; - use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; + use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; + use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; + use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; + use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; + use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; + use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; use crate::state_transition::StateTransition; use crate::tests::fixtures::{ get_data_contract_fixture, get_batched_transitions_fixture, get_extended_documents_fixture_with_owner_id_from_contract, raw_instant_asset_lock_proof_fixture, }; - use crate::version::PlatformVersion; + use platform_version::version::PlatformVersion; use crate::withdrawal::Pooling; - use crate::ProtocolError; + use crate::errors::ProtocolError; use platform_version::version::LATEST_PLATFORM_VERSION; use platform_version::TryIntoPlatformVersioned; use rand::rngs::StdRng; @@ -53,7 +53,6 @@ mod tests { use std::collections::BTreeMap; #[test] - #[cfg(feature = "random-identities")] fn identity_create_transition_ser_de() { let platform_version = LATEST_PLATFORM_VERSION; let identity = Identity::random_identity(5, Some(5), platform_version) @@ -79,7 +78,6 @@ mod tests { } #[test] - #[cfg(feature = "random-identities")] fn identity_topup_transition_ser_de() { let platform_version = PlatformVersion::latest(); let identity = Identity::random_identity(5, Some(5), platform_version) @@ -102,7 +100,6 @@ mod tests { } #[test] - #[cfg(feature = "random-identities")] fn identity_update_transition_add_keys_ser_de() { let mut rng = StdRng::seed_from_u64(5); let (identity, mut keys): (Identity, BTreeMap<_, _>) = @@ -169,7 +166,6 @@ mod tests { } #[test] - #[cfg(feature = "state-transition-signing")] fn identity_update_transition_disable_keys_ser_de() { let mut rng = StdRng::seed_from_u64(5); let (identity, mut keys): (Identity, BTreeMap<_, _>) = @@ -236,7 +232,6 @@ mod tests { } #[test] - #[cfg(feature = "random-identities")] fn identity_credit_withdrawal_transition_ser_de() { let platform_version = PlatformVersion::latest(); let identity = Identity::random_identity(5, Some(5), platform_version) @@ -262,7 +257,6 @@ mod tests { } #[test] - #[cfg(feature = "random-identities")] fn data_contract_create_ser_de() { let platform_version = LATEST_PLATFORM_VERSION; let identity = Identity::random_identity(5, Some(5), platform_version) @@ -285,7 +279,6 @@ mod tests { } #[test] - #[cfg(feature = "random-identities")] fn data_contract_update_ser_de() { let platform_version = PlatformVersion::latest(); let identity = Identity::random_identity(5, Some(5), platform_version) diff --git a/packages/rs-dpp/src/state_transition/state_transition_factory.rs b/packages/rs-dpp/src/state_transition/state_transition_factory.rs index d9dbf09d699..60d35dac4d0 100644 --- a/packages/rs-dpp/src/state_transition/state_transition_factory.rs +++ b/packages/rs-dpp/src/state_transition/state_transition_factory.rs @@ -1,6 +1,6 @@ -use crate::consensus::basic::decode::SerializedObjectParsingError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::decode::SerializedObjectParsingError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::serialization::PlatformDeserializable; use crate::state_transition::StateTransition; use crate::ProtocolError; diff --git a/packages/rs-dpp/src/state_transition/state_transition_types.rs b/packages/rs-dpp/src/state_transition/state_transition_types.rs index 574d18521ab..0ac1e4c70c6 100644 --- a/packages/rs-dpp/src/state_transition/state_transition_types.rs +++ b/packages/rs-dpp/src/state_transition/state_transition_types.rs @@ -18,6 +18,7 @@ use serde_repr::{Deserialize_repr, Serialize_repr}; Decode, Default, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum StateTransitionType { #[default] DataContractCreate = 0, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/accessors/mod.rs index 301bb1743ef..b23fe687397 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/accessors/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::prelude::IdentityNonce; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; pub use v0::*; impl DataContractCreateTransitionAccessorsV0 for DataContractCreateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/identity_signed.rs index 4b2704c07dd..68e0482766b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/identity_signed.rs @@ -1,5 +1,5 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for DataContractCreateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/json_conversion.rs index b7b51af827d..0161d33f222 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; -use crate::state_transition::state_transitions::data_contract_create_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for DataContractCreateTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { DataContractCreateTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } @@ -28,17 +28,20 @@ impl StateTransitionJsonConvert<'_> for DataContractCreateTransition { #[cfg(test)] mod test { - use crate::state_transition::state_transitions::data_contract_create_transition::fields::*; + use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::*; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::prelude::IdentityNonce; + use dpp::state_transition::state_transitions::identity::identity_update_transition::fields::{ + IDENTITY_NONCE, SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, + }; use dpp::util::json_value::JsonValueExt; #[test] fn should_return_state_transition_in_json_format() { - let data = crate::state_transition::data_contract_create_transition::test::get_test_data(); + let data = crate::state_transition::state_transitions::contract::data_contract_create_transition::test::get_test_data(); let mut json_object = data .state_transition .to_json(JsonStateTransitionSerializationOptions { @@ -53,7 +56,6 @@ mod test { .get_u64(STATE_TRANSITION_PROTOCOL_VERSION) .expect("the protocol version should be present") as u32 ); - assert_eq!( 0, json_object diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/mod.rs index b192abf21e2..50f1d61666f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/mod.rs @@ -4,15 +4,15 @@ pub use v0::*; use crate::data_contract::DataContract; use crate::identity::signer::Signer; -use crate::identity::{KeyID, PartialIdentity}; +use crate::identity::{identity_public_key::KeyID, PartialIdentity}; use crate::prelude::IdentityNonce; -use crate::state_transition::data_contract_create_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_create_transition::{ DataContractCreateTransition, DataContractCreateTransitionV0, }; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; use crate::ProtocolError; use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransition { fn new_from_data_contract( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/v0/mod.rs index 638a0d0295b..c20c77cc9b5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/methods/v0/mod.rs @@ -1,12 +1,13 @@ use crate::data_contract::DataContract; +use crate::identity::identity_public_key::KeyID; use crate::identity::signer::Signer; -use crate::identity::{KeyID, PartialIdentity}; +use crate::identity::PartialIdentity; use crate::prelude::IdentityNonce; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; use crate::ProtocolError; use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; pub trait DataContractCreateTransitionMethodsV0 { /// Creates a new instance of the DataContractCreateTransition from the provided data contract. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/mod.rs index eb9086fc6bb..bf5dab0a0c9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/mod.rs @@ -5,7 +5,7 @@ mod identity_signed; mod json_conversion; pub mod methods; mod state_transition_like; -mod v0; +pub mod v0; #[cfg(feature = "state-transition-value-conversion")] mod value_conversion; mod version; @@ -13,12 +13,12 @@ mod version; use fields::*; use crate::data_contract::DataContract; +use crate::errors::ProtocolError; use crate::state_transition::{StateTransition, StateTransitionFieldTypes}; -use crate::version::PlatformVersion; -use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, PlatformSignable}; +use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use platform_versioning::PlatformVersioned; @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::identity::state_transition::OptionallyAssetLockProved; -pub use v0::*; +pub use v0::{DataContractCreateTransitionV0, DataContractCreateTransitionV0Signable}; pub type DataContractCreateTransitionLatest = DataContractCreateTransitionV0; @@ -53,6 +53,7 @@ pub type DataContractCreateTransitionLatest = DataContractCreateTransitionV0; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.contract_create_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContractCreateTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(DataContractCreateTransitionV0), @@ -157,7 +158,7 @@ mod test { use super::*; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; - use crate::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; + use crate::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; use crate::state_transition::traits::StateTransitionLike; use crate::state_transition::{StateTransitionType, StateTransitionValueConvert}; use crate::tests::fixtures::get_data_contract_fixture; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/state_transition_like.rs index fd23f890b8b..f729087e52c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for DataContractCreateTransition { /// Returns ID of the created contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/identity_signed.rs index be2682bc82a..ed4b3cb252b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/identity_signed.rs @@ -1,6 +1,6 @@ -use crate::identity::SecurityLevel::{CRITICAL, HIGH}; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use crate::identity::identity_public_key::SecurityLevel::{CRITICAL, HIGH}; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for DataContractCreateTransitionV0 { @@ -8,7 +8,7 @@ impl StateTransitionIdentitySigned for DataContractCreateTransitionV0 { self.signature_public_key_id } - fn set_signature_public_key_id(&mut self, key_id: crate::identity::KeyID) { + fn set_signature_public_key_id(&mut self, key_id: KeyID) { self.signature_public_key_id = key_id } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/json_conversion.rs index a73694f0c3d..056ed184d54 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for DataContractCreateTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/mod.rs index 054004a6dc5..1da776fb75a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/mod.rs @@ -14,17 +14,18 @@ use platform_value::BinaryData; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; +use crate::identity::identity_public_key::KeyID; +use crate::{data_contract::DataContract, errors::protocol_error::ProtocolError}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::prelude::{IdentityNonce, UserFeeIncrease}; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use bincode::{Decode, Encode}; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::state_transition::StateTransition; -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; ///DataContractCreateTransitionV0 has the same encoding structure @@ -34,6 +35,7 @@ use crate::version::PlatformVersion; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractCreateTransitionV0 { pub data_contract: DataContractInSerializationFormat, pub identity_nonce: IdentityNonce, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/state_transition_like.rs index b3c96c455a1..2f27e65dd9a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/state_transition_like.rs @@ -1,15 +1,12 @@ -use platform_value::BinaryData; - use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::StateTransitionType::DataContractCreate; -use crate::version::FeatureVersion; + +use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for DataContractCreateTransitionV0 { /// Returns ID of the created contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/types.rs index 7f3304ab27c..2200f8bd363 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/types.rs @@ -1,7 +1,7 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::state_transitions::common_fields::property_names::{ SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, }; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for DataContractCreateTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/v0_methods.rs index f1ed8c9b36d..a8de680ea51 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/v0_methods.rs @@ -1,22 +1,26 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; -use crate::{data_contract::DataContract, identity::KeyID, NonConsensusError, ProtocolError}; +use crate::{ + data_contract::DataContract, + errors::{NonConsensusError, ProtocolError}, + identity::identity_public_key::KeyID, +}; use crate::serialization::Signable; -use crate::consensus::signature::{InvalidSignaturePublicKeySecurityLevelError, SignatureError}; +use crate::errors::consensus::signature::{InvalidSignaturePublicKeySecurityLevelError, SignatureError}; use crate::data_contract::accessors::v0::DataContractV0Setters; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use crate::identity::signer::Signer; use crate::identity::PartialIdentity; use crate::prelude::IdentityNonce; -use crate::state_transition::data_contract_create_transition::methods::DataContractCreateTransitionMethodsV0; -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::methods::DataContractCreateTransitionMethodsV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use platform_version::version::PlatformVersion; use platform_version::TryIntoPlatformVersioned; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransitionV0 { fn new_from_data_contract( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/value_conversion.rs index d6397dbbc14..73b7307c33c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/value_conversion.rs @@ -3,14 +3,14 @@ use std::collections::BTreeMap; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; use platform_value::{IntegerReplacementType, ReplacementType, Value}; -use crate::{data_contract::DataContract, ProtocolError}; +use crate::{data_contract::DataContract, errors::ProtocolError}; use platform_version::TryIntoPlatformVersioned; use platform_version::version::PlatformVersion; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; use crate::state_transition::{StateTransitionFieldTypes, StateTransitionValueConvert}; -use crate::state_transition::data_contract_create_transition::{DataContractCreateTransitionV0}; -use crate::state_transition::data_contract_create_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::{DataContractCreateTransitionV0}; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::*; use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_INCREASE; use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::{BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS}; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/version.rs index 56800bfb1fb..2b3ca701cb8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for DataContractCreateTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/value_conversion.rs index b4ec7a648ff..3728baaed7e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/value_conversion.rs @@ -2,16 +2,17 @@ use std::collections::BTreeMap; use platform_value::Value; -use crate::ProtocolError; +use crate::errors::ProtocolError; -use crate::state_transition::data_contract_create_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::{ DataContractCreateTransition, DataContractCreateTransitionV0, }; -use crate::state_transition::state_transitions::data_contract_create_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl StateTransitionValueConvert<'_> for DataContractCreateTransition { fn to_object(&self, skip_signature: bool) -> Result { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/version.rs index a83280151bd..71ac29bf666 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; +use crate::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for DataContractCreateTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/accessors/mod.rs index a928d77b220..b63ec57b8f6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/accessors/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::data_contract::serialized_version::DataContractInSerializationFormat; use crate::prelude::IdentityNonce; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; pub use v0::*; impl DataContractUpdateTransitionAccessorsV0 for DataContractUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/identity_signed.rs index 50c8cb9ce4f..7dffed7728c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/identity_signed.rs @@ -1,6 +1,6 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for DataContractUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/json_conversion.rs index b1ee11537d3..ad2af43504b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; -use crate::state_transition::state_transitions::data_contract_update_transition::fields::*; +use crate::errors::ProtocolError; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; -use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for DataContractUpdateTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { DataContractUpdateTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } @@ -28,7 +28,7 @@ impl StateTransitionJsonConvert<'_> for DataContractUpdateTransition { // // #[cfg(test)] // mod test { -// use crate::state_transition::data_contract_update_transition::STATE_TRANSITION_PROTOCOL_VERSION; +// use crate::state_transition::state_transitions::contract::data_contract_update_transition::STATE_TRANSITION_PROTOCOL_VERSION; // use crate::state_transition::JsonStateTransitionSerializationOptions; // // #[test] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/mod.rs index 98522c59720..1ab06d9331c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/mod.rs @@ -3,14 +3,15 @@ mod v0; pub use v0::*; use crate::data_contract::DataContract; +use crate::errors::ProtocolError; +use crate::identity::identity_public_key::KeyID; use crate::identity::signer::Signer; -use crate::identity::{KeyID, PartialIdentity}; -use crate::state_transition::data_contract_update_transition::{ +use crate::identity::PartialIdentity; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, }; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; -use crate::ProtocolError; +use versioned_feature_core::FeatureVersion; use crate::prelude::{IdentityNonce, UserFeeIncrease}; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/v0/mod.rs index 700ed8e45c5..4e268810f61 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/methods/v0/mod.rs @@ -1,12 +1,13 @@ use crate::data_contract::DataContract; +use crate::identity::identity_public_key::KeyID; use crate::identity::signer::Signer; -use crate::identity::{KeyID, PartialIdentity}; +use crate::identity::PartialIdentity; +use crate::errors::ProtocolError; use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; -use crate::ProtocolError; use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; pub trait DataContractUpdateTransitionMethodsV0 { /// Creates a new instance of `DataContractUpdateTransition` from the given `data_contract`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/mod.rs index 85b5a7317a6..b01fbee308a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/mod.rs @@ -1,5 +1,5 @@ +use crate::errors::ProtocolError; use crate::state_transition::StateTransitionFieldTypes; -use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, PlatformSignable}; @@ -17,7 +17,7 @@ mod json_conversion; pub mod methods; mod serialize; mod state_transition_like; -mod v0; +pub mod v0; #[cfg(feature = "state-transition-value-conversion")] mod value_conversion; mod version; @@ -30,7 +30,7 @@ use crate::data_contract::DataContract; use crate::identity::state_transition::OptionallyAssetLockProved; use crate::prelude::IdentityNonce; -pub use v0::*; +pub use v0::{DataContractUpdateTransitionV0, DataContractUpdateTransitionV0Signable}; pub type DataContractUpdateTransitionLatest = DataContractUpdateTransitionV0; @@ -55,6 +55,7 @@ pub type DataContractUpdateTransitionLatest = DataContractUpdateTransitionV0; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.contract_update_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DataContractUpdateTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(DataContractUpdateTransitionV0), @@ -107,7 +108,7 @@ impl OptionallyAssetLockProved for DataContractUpdateTransition {} #[cfg(test)] mod test { use crate::data_contract::DataContract; - use crate::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; + use crate::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; use crate::tests::fixtures::get_data_contract_fixture; use crate::version::LATEST_PLATFORM_VERSION; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/serialize.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/serialize.rs index fbb4507196a..d8ddc94ed7a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/serialize.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/serialize.rs @@ -20,7 +20,7 @@ // use std::convert::TryInto; // use std::fmt; // use platform_versioning::PlatformVersioned; -// use crate::state_transition::data_contract_update_transition::{DataContractUpdateTransition, DataContractUpdateTransitionV0}; +// use crate::state_transition::state_transitions::contract::data_contract_update_transition::{DataContractUpdateTransition, DataContractUpdateTransitionV0}; // // // impl Serialize for DataContractUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/state_transition_like.rs index 7c03a33becc..265e70b400f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for DataContractUpdateTransition { /// Returns ID of the created contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/identity_signed.rs index 3c39e2d90a0..4c8cc33fc3f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/identity_signed.rs @@ -1,6 +1,6 @@ -use crate::identity::SecurityLevel::CRITICAL; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; +use crate::identity::identity_public_key::SecurityLevel::CRITICAL; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for DataContractUpdateTransitionV0 { @@ -8,7 +8,7 @@ impl StateTransitionIdentitySigned for DataContractUpdateTransitionV0 { self.signature_public_key_id } - fn set_signature_public_key_id(&mut self, key_id: crate::identity::KeyID) { + fn set_signature_public_key_id(&mut self, key_id: crate::identity::identity_public_key::KeyID) { self.signature_public_key_id = key_id } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/json_conversion.rs index 4858d182b26..45ad7e0f03d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for DataContractUpdateTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/mod.rs index 144d706ecca..01f958ae0b6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/mod.rs @@ -18,18 +18,18 @@ use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::data_contract::serialized_version::DataContractInSerializationFormat; +use crate::identity::identity_public_key::KeyID; use crate::prelude::{IdentityNonce, UserFeeIncrease}; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransition; -use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; - +use crate::{data_contract::DataContract, errors::ProtocolError}; #[derive(Debug, Clone, Encode, Decode, PartialEq, PlatformSignable)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] - +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DataContractUpdateTransitionV0 { #[cfg_attr( feature = "state-transition-serde-conversion", diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/state_transition_like.rs index 1b6b946d53c..ce6caa06f0f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/state_transition_like.rs @@ -1,17 +1,14 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::StateTransitionType::DataContractUpdate; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for DataContractUpdateTransitionV0 { /// Returns ID of the created contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/types.rs index 487bdc0b139..cc78ff016d5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/types.rs @@ -1,7 +1,7 @@ -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::state_transitions::common_fields::property_names::{ SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, }; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for DataContractUpdateTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/v0_methods.rs index 73c0a492613..ab6adc3f9c8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/v0_methods.rs @@ -1,16 +1,17 @@ use crate::data_contract::DataContract; +use crate::identity::identity_public_key::KeyID; use crate::identity::signer::Signer; -use crate::identity::{KeyID, PartialIdentity}; +use crate::identity::PartialIdentity; use crate::serialization::Signable; use crate::prelude::{IdentityNonce, UserFeeIncrease}; -use crate::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; -use crate::state_transition::data_contract_update_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, }; use crate::state_transition::StateTransition; -use crate::version::FeatureVersion; -use crate::{NonConsensusError, ProtocolError}; +use versioned_feature_core::FeatureVersion; +use crate::{errors::NonConsensusError, errors::ProtocolError}; use platform_version::version::PlatformVersion; use platform_version::TryIntoPlatformVersioned; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/value_conversion.rs index 986fe7dc0eb..0f9f427e4d3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/value_conversion.rs @@ -1,15 +1,15 @@ use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; use crate::data_contract::DataContract; -use crate::state_transition::data_contract_update_transition::fields::*; -use crate::state_transition::data_contract_update_transition::{ - DataContractUpdateTransitionV0, BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS, -}; +use crate::errors::ProtocolError; use crate::state_transition::state_transitions::common_fields::property_names::{ IDENTITY_CONTRACT_NONCE, USER_FEE_INCREASE, }; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ + DataContractUpdateTransitionV0, BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS, +}; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; -use crate::ProtocolError; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; use platform_value::{IntegerReplacementType, ReplacementType, Value}; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/version.rs index 0dc939fd7f9..ce1edccc355 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for DataContractUpdateTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/value_conversion.rs index 1ec80c0e69e..20c6cdd2d7d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/value_conversion.rs @@ -2,16 +2,17 @@ use std::collections::BTreeMap; use platform_value::Value; -use crate::ProtocolError; +use crate::errors::ProtocolError; -use crate::state_transition::data_contract_update_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_update_transition::fields::*; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, }; -use crate::state_transition::state_transitions::data_contract_update_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl StateTransitionValueConvert<'_> for DataContractUpdateTransition { fn to_object(&self, skip_signature: bool) -> Result { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/version.rs index a49b3c55b66..dfc9b5f0663 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_update_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for DataContractUpdateTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/mod.rs index 0748e4e462f..5daf453e5cc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/mod.rs @@ -1,8 +1,8 @@ mod v0; use std::slice::Iter; -use crate::state_transition::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionMutRef, BatchedTransitionRef}; -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionMutRef, BatchedTransitionRef}; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; pub use v0::*; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransition; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/v0/mod.rs index edf792f5029..763fe374590 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/accessors/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ BatchedTransitionMutRef, BatchedTransitionRef, }; pub trait DocumentsBatchTransitionAccessorsV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/document_base_transition_trait.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/document_base_transition_trait.rs index d9344985342..02a83017fae 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/document_base_transition_trait.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/document_base_transition_trait.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; pub trait DocumentBaseTransitionAccessors { /// Returns a reference to the `base` field of the `DocumentCreateTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/from_document.rs index d394d50727d..c3fd67d244d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/from_document.rs @@ -1,12 +1,13 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; -use crate::state_transition::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentBaseTransition { #[allow(clippy::too_many_arguments)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/mod.rs index 9f1ed77111c..bc9a809ba29 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/mod.rs @@ -11,10 +11,10 @@ mod v1_methods; feature = "state-transition-json-conversion" ))] use crate::data_contract::DataContract; -use crate::state_transition::batch_transition::document_base_transition::v0::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::{ DocumentBaseTransitionV0, DocumentTransitionObjectLike, }; -use crate::state_transition::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v1::DocumentBaseTransitionV1; #[cfg(any( feature = "state-transition-value-conversion", feature = "state-transition-json-conversion" @@ -30,8 +30,8 @@ pub use fields::*; use platform_value::Value; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -#[cfg(feature = "state-transition-json-conversion")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "state-transition-json-conversion")] +//use serde_json::Value as JsonValue; #[cfg(feature = "state-transition-value-conversion")] use std::collections::BTreeMap; @@ -40,6 +40,7 @@ use std::collections::BTreeMap; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentBaseTransition { #[display("V0({})", "_0")] V0(DocumentBaseTransitionV0), @@ -56,7 +57,7 @@ impl Default for DocumentBaseTransition { impl DocumentTransitionObjectLike for DocumentBaseTransition { #[cfg(feature = "state-transition-json-conversion")] fn from_json_object( - json_str: JsonValue, + json_str: serde_json::Value, data_contract: DataContract, ) -> Result where @@ -100,7 +101,7 @@ impl DocumentTransitionObjectLike for DocumentBaseTransition { } #[cfg(feature = "state-transition-json-conversion")] - fn to_json(&self) -> Result { + fn to_json(&self) -> Result { self.to_object()? .try_into() .map_err(ProtocolError::ValueError) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/from_document.rs index b067edad06d..c3aed574635 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/from_document.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0; impl DocumentBaseTransitionV0 { pub(in crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/mod.rs index 919450b3e30..8cef8ea11d8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/mod.rs @@ -13,15 +13,15 @@ use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; use platform_value::Value; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -#[cfg(feature = "state-transition-json-conversion")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "state-transition-json-conversion")] +//use serde_json::Value as JsonValue; #[cfg(feature = "state-transition-value-conversion")] use crate::data_contract::accessors::v0::DataContractV0Getters; -use crate::identifier::Identifier; +use platform_value::Identifier; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::document_base_transition::property_names; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::property_names; #[cfg(any( feature = "state-transition-json-conversion", feature = "state-transition-value-conversion" @@ -40,6 +40,7 @@ use crate::{data_contract::DataContract, errors::ProtocolError}; "document_type_name", "data_contract_id" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentBaseTransitionV0 { /// The document ID #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "$id"))] @@ -84,7 +85,7 @@ pub trait DocumentTransitionObjectLike { /// Creates the Document Transition from JSON representation. The JSON representation contains /// binary data encoded in base64, Identifiers encoded in base58 fn from_json_object( - json_str: JsonValue, + json_str: serde_json::Value, data_contract: DataContract, ) -> Result where @@ -118,7 +119,7 @@ pub trait DocumentTransitionObjectLike { /// Object is an [`serde_json::Value`] instance that replaces the binary data with /// - base58 string for Identifiers /// - base64 string for other binary data - fn to_json(&self) -> Result; + fn to_json(&self) -> Result; #[cfg(feature = "state-transition-value-conversion")] fn to_cleaned_object(&self) -> Result; } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/v0_methods.rs index 6047dcf6586..9ed75f13268 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0/v0_methods.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0; use crate::prelude::IdentityNonce; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0_methods.rs index b556e2fee80..051547dbc76 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v0_methods.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; use crate::prelude::IdentityNonce; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/from_document.rs index 69c4fd49bfb..04dbd40e9c6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/from_document.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentBaseTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/mod.rs index b4e9106422c..aa75865764c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/mod.rs @@ -9,10 +9,10 @@ use derive_more::Display; #[cfg(feature = "state-transition-value-conversion")] use crate::data_contract::accessors::v0::DataContractV0Getters; -use crate::identifier::Identifier; +use platform_value::Identifier; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::document_base_transition::property_names; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::property_names; use crate::tokens::token_payment_info::TokenPaymentInfo; #[cfg(any( feature = "state-transition-json-conversion", @@ -38,6 +38,7 @@ use serde::{Deserialize, Serialize}; "document_type_name", "data_contract_id" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentBaseTransitionV1 { /// The document ID #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "$id"))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/v1_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/v1_methods.rs index 1d185790619..fabe9e63496 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/v1_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1/v1_methods.rs @@ -1,6 +1,6 @@ use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use crate::state_transition::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v1::DocumentBaseTransitionV1; use crate::tokens::token_payment_info::TokenPaymentInfo; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1_methods.rs index bc4538dccba..2b54a14b2b2 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_base_transition/v1_methods.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::document_base_transition::v1::v1_methods::DocumentBaseTransitionV1Methods; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v1::v1_methods::DocumentBaseTransitionV1Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentBaseTransitionV1Methods for DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/convertible.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/convertible.rs index bfa829a274a..36acf491867 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/convertible.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/convertible.rs @@ -6,25 +6,25 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; feature = "state-transition-json-conversion", feature = "state-transition-value-conversion" ))] -use crate::prelude::DataContract; +use crate::data_contract::DataContract; #[cfg(any( feature = "state-transition-json-conversion", feature = "state-transition-value-conversion" ))] -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; #[cfg(feature = "state-transition-json-conversion")] -use crate::state_transition::batch_transition::document_create_transition::v0::BINARY_FIELDS; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::BINARY_FIELDS; #[cfg(any( feature = "state-transition-json-conversion", feature = "state-transition-value-conversion" ))] -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransitionV0; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::fields::property_names::STATE_TRANSITION_PROTOCOL_VERSION; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names::STATE_TRANSITION_PROTOCOL_VERSION; #[cfg(feature = "state-transition-json-conversion")] -use crate::state_transition::data_contract_update_transition::IDENTIFIER_FIELDS; +use crate::state_transition::state_transitions::contract::data_contract_update_transition::IDENTIFIER_FIELDS; #[cfg(any( feature = "state-transition-json-conversion", feature = "state-transition-value-conversion" @@ -46,8 +46,8 @@ use platform_value::ReplacementType; feature = "state-transition-value-conversion" ))] use platform_value::Value; -#[cfg(feature = "state-transition-json-conversion")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "state-transition-json-conversion")] +//use serde_json::Value as JsonValue; #[cfg(feature = "state-transition-value-conversion")] use std::collections::BTreeMap; @@ -58,7 +58,7 @@ use std::collections::BTreeMap; impl DocumentTransitionObjectLike for DocumentCreateTransition { #[cfg(feature = "state-transition-json-conversion")] fn from_json_object( - json_value: JsonValue, + json_value: serde_json::Value, data_contract: DataContract, ) -> Result { let value: Value = json_value.into(); @@ -134,7 +134,7 @@ impl DocumentTransitionObjectLike for DocumentCreateTransition { } #[cfg(feature = "state-transition-json-conversion")] - fn to_json(&self) -> Result { + fn to_json(&self) -> Result { self.to_cleaned_object()? .try_into() .map_err(ProtocolError::ValueError) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/from_document.rs index 1916f706032..1ba98d176d6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/from_document.rs @@ -1,11 +1,12 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::DocumentCreateTransition; -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentCreateTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransitionV0; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentCreateTransition { #[allow(clippy::too_many_arguments)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/mod.rs index dfc46828724..33780571a37 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/mod.rs @@ -6,7 +6,7 @@ mod v0_methods; use crate::block::block_info::BlockInfo; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; -use crate::state_transition::batch_transition::document_create_transition::v0::DocumentFromCreateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::DocumentFromCreateTransitionV0; use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::{Display, From}; @@ -21,6 +21,7 @@ pub use v0::DocumentCreateTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentCreateTransition { #[display("V0({})", "_0")] V0(DocumentCreateTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/from_document.rs index 126062a1659..e9442681443 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/from_document.rs @@ -2,11 +2,12 @@ use crate::data_contract::document_type::methods::DocumentTypeV0Methods; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransitionV0; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentCreateTransitionV0 { pub(crate) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/mod.rs index e9e2643caf4..408212068fc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/mod.rs @@ -23,20 +23,20 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::methods::DocumentTypeBasicMethods; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0}; -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; use derive_more::Display; #[cfg(feature = "state-transition-value-conversion")] use platform_value::btreemap_extensions::BTreeValueRemoveTupleFromMapHelper; use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; mod property_names { pub const ENTROPY: &str = "$entropy"; @@ -55,6 +55,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; serde(rename_all = "camelCase") )] #[display("Base: {}, Entropy: {:?}, Data: {:?}", "base", "entropy", "data")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentCreateTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] @@ -379,7 +380,7 @@ impl DocumentFromCreateTransitionV0 for Document { #[cfg(test)] mod test { use crate::data_contract::v0::DataContractV0; - use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; + use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; use platform_value::btreemap_extensions::BTreeValueMapHelper; use platform_value::{platform_value, BinaryData, Bytes32, Identifier}; use platform_version::version::LATEST_PLATFORM_VERSION; @@ -387,7 +388,7 @@ mod test { use super::*; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; - use serde_json::Value as JsonValue; + // use serde_json::Value as JsonValue; fn init() { let _ = env_logger::builder() @@ -492,22 +493,25 @@ mod test { DocumentCreateTransition::from_object(raw_document, data_contract).unwrap(); let json_transition = transition.to_json().expect("no errors"); - assert_eq!(json_transition["V0"]["$id"], JsonValue::String(id.into())); + assert_eq!( + json_transition["V0"]["$id"], + serde_json::Value::String(id.into()) + ); assert_eq!( json_transition["V0"]["$dataContractId"], - JsonValue::String(data_contract_id.into()) + serde_json::Value::String(data_contract_id.into()) ); assert_eq!( json_transition["alphaBinary"], - JsonValue::String(alpha_binary.into()) + serde_json::Value::String(alpha_binary.into()) ); assert_eq!( json_transition["alphaIdentifier"], - JsonValue::String(alpha_identifier.into()) + serde_json::Value::String(alpha_identifier.into()) ); assert_eq!( json_transition["$entropy"], - JsonValue::String(entropy.into()) + serde_json::Value::String(entropy.into()) ); } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/v0_methods.rs index e19bcb8ec8b..85d517e7c82 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0/v0_methods.rs @@ -1,11 +1,11 @@ -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransitionV0; use platform_value::Value; -use crate::fee::Credits; +use crate::balances::credits::Credits; use std::collections::BTreeMap; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; pub trait DocumentCreateTransitionV0Methods: DocumentBaseTransitionAccessors { /// Returns a reference to the `entropy` field of the `DocumentCreateTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0_methods.rs index da248d53934..e00c10d1cca 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_create_transition/v0_methods.rs @@ -1,10 +1,10 @@ use std::collections::BTreeMap; use platform_value::{Value}; -use crate::fee::Credits; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; -use crate::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use crate::balances::credits::Credits; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; impl DocumentBaseTransitionAccessors for DocumentCreateTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/from_document.rs index 4af388b6b76..e61cb13a3e0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/from_document.rs @@ -2,10 +2,11 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; -use crate::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; -use crate::state_transition::batch_transition::batched_transition::DocumentDeleteTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentDeleteTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentDeleteTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/mod.rs index 0ca94ce8864..7bbddba8d13 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/mod.rs @@ -6,13 +6,14 @@ use bincode::{Decode, Encode}; use derive_more::{Display, From}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::DocumentDeleteTransitionV0; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentDeleteTransition { #[display("V0({})", "_0")] V0(DocumentDeleteTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/from_document.rs index df7b4d2d77a..0cad9527f91 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/from_document.rs @@ -1,11 +1,12 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentDeleteTransitionV0 { pub(crate) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/mod.rs index 633c7d83818..28c91daa791 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/mod.rs @@ -1,7 +1,7 @@ mod from_document; pub mod v0_methods; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; use bincode::{Decode, Encode}; use derive_more::Display; @@ -18,6 +18,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; serde(rename_all = "camelCase") )] #[display("Base: {}", "base")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentDeleteTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: DocumentBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/v0_methods.rs index 861334a6027..c11dd63b57f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0/v0_methods.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; impl DocumentBaseTransitionAccessors for DocumentDeleteTransitionV0 { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0_methods.rs index 8fd1b1f31cf..9497457956b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_delete_transition/v0_methods.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::DocumentDeleteTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentDeleteTransition; impl DocumentBaseTransitionAccessors for DocumentDeleteTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/from_document.rs index 5c92946a2fb..19c58b2184f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/from_document.rs @@ -1,12 +1,13 @@ +use crate::balances::credits::Credits; use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; -use crate::fee::Credits; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; -use crate::state_transition::batch_transition::batched_transition::DocumentPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentPurchaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentPurchaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/mod.rs index 97ee83ec73c..0e26437ad75 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/mod.rs @@ -6,13 +6,14 @@ use bincode::{Decode, Encode}; use derive_more::{Display, From}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::DocumentPurchaseTransitionV0; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentPurchaseTransition { #[display("V0({})", "_0")] V0(DocumentPurchaseTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/from_document.rs index d25745fa30b..3ff4ec4cfbf 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/from_document.rs @@ -1,13 +1,14 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::errors::DocumentError; use crate::document::{Document, DocumentV0Getters}; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentPurchaseTransitionV0 { pub(crate) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/mod.rs index 3b798177be8..e7c63e708fe 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/mod.rs @@ -1,12 +1,12 @@ mod from_document; pub mod v0_methods; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; use bincode::{Decode, Encode}; use derive_more::Display; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::Revision; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -20,6 +20,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; serde(rename_all = "camelCase") )] #[display("Base: {}", "base")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentPurchaseTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: DocumentBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/v0_methods.rs index 41f6b423aff..b2c5dac1e16 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0/v0_methods.rs @@ -1,8 +1,8 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; pub trait DocumentPurchaseTransitionV0Methods: DocumentBaseTransitionAccessors { /// Returns a reference to the `revision` field of the `DocumentReplaceTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0_methods.rs index 8918323373d..3e6668852c6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_purchase_transition/v0_methods.rs @@ -1,9 +1,9 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::DocumentPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentPurchaseTransition; impl DocumentBaseTransitionAccessors for DocumentPurchaseTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/from_document.rs index 373ccf4aa00..15933fe7165 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/from_document.rs @@ -1,11 +1,12 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; -use crate::state_transition::batch_transition::batched_transition::DocumentReplaceTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentReplaceTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentReplaceTransition { #[allow(clippy::too_many_arguments)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/mod.rs index ef0e89bc455..d319cbd2130 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/mod.rs @@ -13,13 +13,14 @@ use platform_value::Identifier; use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::{DocumentFromReplaceTransitionV0, DocumentReplaceTransitionV0}; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentReplaceTransition { #[display("V0({})", "_0")] V0(DocumentReplaceTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/from_document.rs index c51afdfceb4..60fdc7dcde0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/from_document.rs @@ -2,11 +2,12 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::errors::DocumentError; use crate::document::{Document, DocumentV0Getters}; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentReplaceTransitionV0 { pub(crate) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/mod.rs index ef045d2200a..95a22ab54ea 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/mod.rs @@ -18,8 +18,8 @@ use platform_version::version::PlatformVersion; use std::collections::BTreeMap; pub use super::super::document_base_transition::IDENTIFIER_FIELDS; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; mod property_names { pub const REVISION: &str = "$revision"; @@ -32,6 +32,7 @@ mod property_names { serde(rename_all = "camelCase") )] #[display("Base: {}, Revision: {}, Data: {:?}", "base", "revision", "data")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentReplaceTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: DocumentBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/v0_methods.rs index 61dec36af22..0bf2c82314c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0/v0_methods.rs @@ -3,9 +3,9 @@ use platform_value::Value; use std::collections::BTreeMap; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; pub trait DocumentReplaceTransitionV0Methods: DocumentBaseTransitionAccessors { /// Returns a reference to the `revision` field of the `DocumentReplaceTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0_methods.rs index ad52fdadd07..b4ab322372e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_replace_transition/v0_methods.rs @@ -1,10 +1,10 @@ use std::collections::BTreeMap; use platform_value::Value; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::DocumentReplaceTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentReplaceTransition; impl DocumentBaseTransitionAccessors for DocumentReplaceTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/from_document.rs index 5b16c302d6c..01bd6f05a7a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/from_document.rs @@ -1,13 +1,14 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_transfer_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::{ DocumentTransferTransition, DocumentTransferTransitionV0, }; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; use platform_value::Identifier; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentTransferTransition { #[allow(clippy::too_many_arguments)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/mod.rs index d784dca0112..0615ddda7a1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/mod.rs @@ -6,13 +6,14 @@ use bincode::{Decode, Encode}; use derive_more::{Display, From}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::DocumentTransferTransitionV0; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentTransferTransition { #[display("V0({})", "_0")] V0(DocumentTransferTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/from_document.rs index bed0d5dba00..f3e3851593e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/from_document.rs @@ -2,12 +2,13 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::errors::DocumentError; use crate::document::{Document, DocumentV0Getters}; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; use crate::tokens::token_payment_info::TokenPaymentInfo; use crate::ProtocolError; use platform_value::Identifier; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl DocumentTransferTransitionV0 { pub(crate) fn from_document( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/mod.rs index d8a7e7e41fb..2fa76d4ae68 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/mod.rs @@ -10,7 +10,7 @@ use platform_value::Identifier; use serde::{Deserialize, Serialize}; pub use super::super::document_base_transition::IDENTIFIER_FIELDS; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; mod property_names { pub const REVISION: &str = "$revision"; @@ -30,6 +30,7 @@ mod property_names { "revision", "recipient_owner_id" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentTransferTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: DocumentBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/v0_methods.rs index 2dd4b95d4e5..48df87a558a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0/v0_methods.rs @@ -1,9 +1,9 @@ use platform_value::Identifier; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; pub trait DocumentTransferTransitionV0Methods: DocumentBaseTransitionAccessors { /// Returns a reference to the `revision` field of the `DocumentReplaceTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0_methods.rs index e4dc722b788..68f70015524 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transfer_transition/v0_methods.rs @@ -1,9 +1,9 @@ use platform_value::Identifier; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::DocumentTransferTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentTransferTransition; impl DocumentBaseTransitionAccessors for DocumentTransferTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition.rs index d2c0b99394c..6642fc0149e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition.rs @@ -5,23 +5,24 @@ use derive_more::{Display, From}; use serde::{Deserialize, Serialize}; use bincode::{Encode, Decode}; use crate::prelude::{IdentityNonce, Revision}; -use crate::state_transition::batch_transition::{DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenClaimTransition, TokenTransferTransition, TokenUnfreezeTransition, TokenDirectPurchaseTransition, TokenSetPriceForDirectPurchaseTransition}; -use crate::state_transition::batch_transition::batched_transition::{DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition}; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use crate::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use crate::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::{DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenClaimTransition, TokenTransferTransition, TokenUnfreezeTransition, TokenDirectPurchaseTransition, TokenSetPriceForDirectPurchaseTransition}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; #[derive(Debug, Clone, Encode, Decode, From, PartialEq, Display)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentTransition { #[display("CreateDocumentTransition({})", "_0")] Create(DocumentCreateTransition), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition_action_type.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition_action_type.rs index 2fadc908381..3e951c4c38d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition_action_type.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_transition_action_type.rs @@ -3,6 +3,7 @@ use crate::ProtocolError; // @append-only #[derive(Eq, PartialEq, Debug, Copy, Clone, Hash)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentTransitionActionType { Create, //the entropy used Replace, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/from_document.rs index 331f2c677cb..ff3cece1c20 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/from_document.rs @@ -1,11 +1,12 @@ -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; use crate::data_contract::document_type::{DocumentTypeRef}; use crate::document::{Document}; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use crate::state_transition::batch_transition::batched_transition::DocumentUpdatePriceTransition; -use crate::state_transition::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentUpdatePriceTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentUpdatePriceTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/mod.rs index e85c1513dbf..8c29a489019 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/mod.rs @@ -6,13 +6,14 @@ use bincode::{Decode, Encode}; use derive_more::{Display, From}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::DocumentUpdatePriceTransitionV0; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentUpdatePriceTransition { #[display("V0({})", "_0")] V0(DocumentUpdatePriceTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/from_document.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/from_document.rs index d190ca6ffdb..cef56e35069 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/from_document.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/from_document.rs @@ -1,12 +1,13 @@ -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; use crate::data_contract::document_type::{DocumentTypeRef}; use crate::document::{Document, DocumentV0Getters}; use crate::document::errors::DocumentError; -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; use crate::tokens::token_payment_info::TokenPaymentInfo; impl DocumentUpdatePriceTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/mod.rs index fbca7eb6773..f17562d3988 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/mod.rs @@ -8,10 +8,10 @@ use derive_more::Display; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -use crate::fee::Credits; +use crate::balances::credits::Credits; pub use super::super::document_base_transition::IDENTIFIER_FIELDS; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; mod property_names { pub const REVISION: &str = "$revision"; @@ -24,6 +24,7 @@ mod property_names { serde(rename_all = "camelCase") )] #[display("Base: {}, Revision: {}, Price: {}", "base", "revision", "price")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentUpdatePriceTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: DocumentBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/v0_methods.rs index aa96cdc5ccb..d5ea0d2476d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0/v0_methods.rs @@ -1,8 +1,8 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; pub trait DocumentUpdatePriceTransitionV0Methods: DocumentBaseTransitionAccessors { /// Returns a reference to the `revision` field of the `DocumentUpdatePriceTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0_methods.rs index bc97724dfcb..c2d11af0ca3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/document_update_price_transition/v0_methods.rs @@ -1,9 +1,9 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use crate::prelude::Revision; -use crate::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use crate::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::DocumentUpdatePriceTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentUpdatePriceTransition; impl DocumentBaseTransitionAccessors for DocumentUpdatePriceTransition { fn base(&self) -> &DocumentBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/mod.rs index 0e13b68b791..ac1cf49a5b9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/mod.rs @@ -30,14 +30,16 @@ pub mod token_transition_action_type; pub mod token_unfreeze_transition; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; use derive_more::Display; pub use document_create_transition::DocumentCreateTransition; pub use document_delete_transition::DocumentDeleteTransition; pub use document_purchase_transition::DocumentPurchaseTransition; pub use document_replace_transition::DocumentReplaceTransition; pub use document_transfer_transition::DocumentTransferTransition; +pub use token_base_transition::TokenBaseTransition; +pub use token_burn_transition::TokenBurnTransition; use document_transition::DocumentTransition; pub use document_update_price_transition::DocumentUpdatePriceTransition; use platform_value::Identifier; @@ -50,6 +52,7 @@ pub const PROPERTY_ACTION: &str = "$action"; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum BatchedTransition { #[display("DocumentTransition({})", "_0")] Document(DocumentTransition), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/resolvers.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/resolvers.rs index ea182fc3d46..b85e7cc9bea 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/resolvers.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/resolvers.rs @@ -1,8 +1,8 @@ -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ BatchedTransition, BatchedTransitionRef, DocumentPurchaseTransition, DocumentTransferTransition, }; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::{ DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenClaimTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenDirectPurchaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/mod.rs index 4b4602e72dd..637ba74fe71 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/mod.rs @@ -8,8 +8,8 @@ mod v0_methods; feature = "state-transition-json-conversion" ))] use crate::data_contract::DataContract; -use crate::state_transition::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; -use crate::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::DocumentTransitionObjectLike; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::v0::TokenBaseTransitionV0; #[cfg(any( feature = "state-transition-value-conversion", feature = "state-transition-json-conversion" @@ -35,6 +35,7 @@ use std::collections::BTreeMap; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenBaseTransition { #[display("V0({})", "_0")] V0(TokenBaseTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/token_base_transition_accessors.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/token_base_transition_accessors.rs index 2813dc755de..81d65bd4830 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/token_base_transition_accessors.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/token_base_transition_accessors.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; pub trait TokenBaseTransitionAccessors { /// Returns a reference to the `base` field of the `DocumentCreateTransitionV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/mod.rs index c3b8595dcca..ed79d7f7383 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/mod.rs @@ -18,10 +18,10 @@ use crate::data_contract::accessors::v0::DataContractV0Getters; #[cfg(feature = "state-transition-value-conversion")] use crate::data_contract::accessors::v1::DataContractV1Getters; use crate::group::GroupStateTransitionInfo; -use crate::identifier::Identifier; +use platform_value::Identifier; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-value-conversion")] -use crate::state_transition::batch_transition::token_base_transition::property_names; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::property_names; #[cfg(feature = "state-transition-value-conversion")] use crate::tokens::errors::TokenError; #[cfg(any( @@ -42,6 +42,7 @@ use crate::{data_contract::DataContract, errors::ProtocolError}; "token_id", "data_contract_id" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenBaseTransitionV0 { #[cfg_attr( feature = "state-transition-serde-conversion", diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/v0_methods.rs index 40369689bd3..108aefb7f69 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0/v0_methods.rs @@ -1,7 +1,7 @@ use crate::data_contract::GroupContractPosition; use crate::group::GroupStateTransitionInfo; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::v0::TokenBaseTransitionV0; use crate::tokens::calculate_token_id; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0_methods.rs index 5eeffbf6ff0..1d6ed9faf35 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_base_transition/v0_methods.rs @@ -1,8 +1,8 @@ use crate::data_contract::GroupContractPosition; use crate::group::GroupStateTransitionInfo; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use platform_value::Identifier; impl TokenBaseTransitionV0Methods for TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/mod.rs index 027f204cb82..ac7502bf9b8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenBurnTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenBurnTransition { #[display("V0({})", "_0")] V0(TokenBurnTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/mod.rs index dc07a538271..a657d93fe9f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use derive_more::Display; #[cfg(feature = "state-transition-serde-conversion")] @@ -19,6 +19,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; serde(rename_all = "camelCase") )] #[display("Base: {base}, Amount: {burn_amount}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenBurnTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/v0_methods.rs index ee24438ecf4..14e93e2de51 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_burn_transition::TokenBurnTransitionV0; -use crate::state_transition::batch_transition::TokenBurnTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_burn_transition::TokenBurnTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::TokenBurnTransition; impl TokenBaseTransitionAccessors for TokenBurnTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0_methods.rs index d37a08463fe..65a8c8c2477 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/v0_methods.rs @@ -1,11 +1,11 @@ use platform_value::Identifier; use crate::balances::credits::TokenAmount; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_burn_transition::TokenBurnTransition; -use crate::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::TokenBurnTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenBurnTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/mod.rs index 9ae505888f0..c96c973ed48 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_burn_transition::validate_structure::v0::TokenBurnTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenBurnTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::validate_structure::v0::TokenBurnTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::TokenBurnTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/v0/mod.rs index 3dda358b00d..74cb1e54e86 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/v0/mod.rs @@ -1,14 +1,14 @@ -use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM; -use crate::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; -use crate::state_transition::batch_transition::TokenBurnTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::TokenBurnTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenBurnTransitionActionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/mod.rs index f142a897828..d31dd014aba 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenClaimTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenClaimTransition { #[display("V0({})", "_0")] V0(TokenClaimTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/mod.rs index 111728f77f8..74145288004 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/mod.rs @@ -3,7 +3,7 @@ pub mod v0_methods; /// The Identifier fields in [`TokenClaimTransition`] pub use super::super::document_base_transition::IDENTIFIER_FIELDS; use crate::data_contract::associated_token::token_distribution_key::TokenDistributionType; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -15,6 +15,7 @@ use std::fmt; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenClaimTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/v0_methods.rs index 7d66c180ab4..a4aee126484 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0/v0_methods.rs @@ -1,7 +1,7 @@ use crate::data_contract::associated_token::token_distribution_key::TokenDistributionType; -use crate::state_transition::batch_transition::batched_transition::token_claim_transition::TokenClaimTransitionV0; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::TokenClaimTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; impl TokenBaseTransitionAccessors for TokenClaimTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0_methods.rs index 63f70789867..7a8f9e231a3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/v0_methods.rs @@ -1,8 +1,8 @@ use crate::data_contract::associated_token::token_distribution_key::TokenDistributionType; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; -use crate::state_transition::batch_transition::TokenClaimTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::TokenClaimTransition; impl TokenBaseTransitionAccessors for TokenClaimTransition { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/mod.rs index cb2442b324f..05851a64e08 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_claim_transition::validate_structure::v0::TokenClaimTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenClaimTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::validate_structure::v0::TokenClaimTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::TokenClaimTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/v0/mod.rs index 6bd29b50c81..17eccbbf47a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_claim_transition/validate_structure/v0/mod.rs @@ -1,8 +1,8 @@ -use crate::consensus::basic::token::InvalidTokenNoteTooBigError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; -use crate::state_transition::batch_transition::TokenClaimTransition; +use crate::errors::consensus::basic::token::InvalidTokenNoteTooBigError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::TokenClaimTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/mod.rs index 518a06acc48..c1e35c0ab7f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenConfigUpdateTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenConfigUpdateTransition { #[display("V0({})", "_0")] V0(TokenConfigUpdateTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/mod.rs index e49ba00050b..0b4727a5d9a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/mod.rs @@ -3,7 +3,7 @@ pub mod v0_methods; /// The Identifier fields in [`TokenConfigUpdateTransition`] pub use super::super::document_base_transition::IDENTIFIER_FIELDS; use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use derive_more::Display; #[cfg(feature = "state-transition-serde-conversion")] @@ -16,6 +16,7 @@ use serde::{Deserialize, Serialize}; serde(rename_all = "camelCase") )] #[display("Base: {base}, change: {update_token_configuration_item}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenConfigUpdateTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/v0_methods.rs index a9e24acc377..280b540f328 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0/v0_methods.rs @@ -1,11 +1,11 @@ use platform_value::Identifier; use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_config_update_transition::TokenConfigUpdateTransitionV0; -use crate::state_transition::batch_transition::TokenConfigUpdateTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::TokenConfigUpdateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::TokenConfigUpdateTransition; impl TokenBaseTransitionAccessors for TokenConfigUpdateTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0_methods.rs index b16720f136c..3fe185f2b70 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/v0_methods.rs @@ -1,11 +1,11 @@ use platform_value::Identifier; use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_config_update_transition::TokenConfigUpdateTransition; -use crate::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::TokenConfigUpdateTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenConfigUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/mod.rs index 79c77afb32b..64ea343c0fd 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/mod.rs @@ -1,7 +1,7 @@ use platform_version::version::PlatformVersion; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_config_update_transition::validate_structure::v0::TokenConfigUpdateTransitionStructureValidationV0; -use crate::state_transition::batch_transition::TokenConfigUpdateTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::validate_structure::v0::TokenConfigUpdateTransitionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::TokenConfigUpdateTransition; use crate::validation::SimpleConsensusValidationResult; mod v0; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/v0/mod.rs index 010369f8b3a..5cabc7260f1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_config_update_transition/validate_structure/v0/mod.rs @@ -1,15 +1,15 @@ use platform_version::version::PlatformVersion; -use crate::consensus::basic::token::{InvalidTokenConfigUpdateNoChangeError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::{BasicError, UnsupportedFeatureError}; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::token::{InvalidTokenConfigUpdateNoChangeError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::{BasicError, UnsupportedFeatureError}; +use crate::errors::consensus::ConsensusError; use crate::data_contract::associated_token::token_configuration_item::TokenConfigurationChangeItem; -use crate::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; -use crate::state_transition::batch_transition::TokenConfigUpdateTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_config_update_transition::TokenConfigUpdateTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenConfigUpdateTransitionStructureValidationV0 { fn validate_structure_v0( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/mod.rs index 606eb25cf56..202dc882002 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenDestroyFrozenFundsTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenDestroyFrozenFundsTransition { #[display("V0({})", "_0")] V0(TokenDestroyFrozenFundsTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/mod.rs index 251ff821914..ea27272015b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use derive_more::Display; use platform_value::Identifier; @@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize}; serde(rename_all = "camelCase") )] #[display("Base: {base}, Destroyed Account Identity ID: {frozen_identity_id}")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenDestroyFrozenFundsTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/v0_methods.rs index ccd6c0b24ce..1f3c14b710e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransitionV0; -use crate::state_transition::batch_transition::TokenDestroyFrozenFundsTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; impl TokenBaseTransitionAccessors for TokenDestroyFrozenFundsTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0_methods.rs index e0560b49498..f43761aa7e9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenDestroyFrozenFundsTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/mod.rs index 2b634a777eb..f186696faaf 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/mod.rs @@ -1,7 +1,7 @@ use platform_version::version::PlatformVersion; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::validate_structure::v0::TokenDestroyFrozenFundsTransitionStructureValidationV0; -use crate::state_transition::batch_transition::TokenDestroyFrozenFundsTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::validate_structure::v0::TokenDestroyFrozenFundsTransitionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; use crate::validation::SimpleConsensusValidationResult; mod v0; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/v0/mod.rs index db0a5c08e17..1e231f4954f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_destroy_frozen_funds_transition/validate_structure/v0/mod.rs @@ -1,12 +1,12 @@ use crate::ProtocolError; -use crate::state_transition::batch_transition::TokenDestroyFrozenFundsTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; use crate::validation::SimpleConsensusValidationResult; -use crate::consensus::basic::BasicError; -use crate::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; use crate::tokens::MAX_TOKEN_NOTE_LEN; pub(super) trait TokenDestroyFrozenFundsTransitionStructureValidationV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/mod.rs index e36573d8a79..80c37747065 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/mod.rs @@ -21,6 +21,7 @@ pub use v0::TokenDirectPurchaseTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenDirectPurchaseTransition { /// Version 0 of the token direct purchase transition. /// diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/mod.rs index 94d950cdbf3..b47cc003870 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/mod.rs @@ -1,8 +1,7 @@ pub mod v0_methods; -use crate::balances::credits::TokenAmount; -use crate::fee::Credits; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::balances::credits::{Credits, TokenAmount}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -17,6 +16,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenDirectPurchaseTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/v0_methods.rs index 34d56ae32b6..5d08a5ed8df 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0/v0_methods.rs @@ -1,8 +1,8 @@ use crate::balances::credits::TokenAmount; use crate::fee::Credits; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransitionV0; impl TokenBaseTransitionAccessors for TokenDirectPurchaseTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0_methods.rs index 516783b1aba..8deda7c3f21 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/v0_methods.rs @@ -1,9 +1,9 @@ use crate::balances::credits::TokenAmount; use crate::fee::Credits; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::TokenDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::TokenDirectPurchaseTransition; impl TokenBaseTransitionAccessors for TokenDirectPurchaseTransition { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/mod.rs index cfb3fbafd42..0ddd3a468a5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_direct_purchase_transition::validate_structure::v0::TokenDirectPurchaseTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::validate_structure::v0::TokenDirectPurchaseTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::TokenDirectPurchaseTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/v0/mod.rs index 13d696e1699..58f50ca1b1d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/v0/mod.rs @@ -1,9 +1,9 @@ -use crate::consensus::basic::token::InvalidTokenAmountError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::token::InvalidTokenAmountError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM; -use crate::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::TokenDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/mod.rs index c75d6de3145..bb5523042d9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenEmergencyActionTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenEmergencyActionTransition { #[display("V0({})", "_0")] V0(TokenEmergencyActionTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/mod.rs index 18ea3f89b6d..a88bda0745e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::tokens::emergency_action::TokenEmergencyAction; use bincode::{Decode, Encode}; #[cfg(feature = "state-transition-serde-conversion")] @@ -13,6 +13,7 @@ use std::fmt; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenEmergencyActionTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/v0_methods.rs index 02abb8e415e..5ba10dbf0ed 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::batched_transition::token_emergency_action_transition::TokenEmergencyActionTransitionV0; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::TokenEmergencyActionTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::TokenEmergencyActionTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::TokenEmergencyActionTransition; use crate::tokens::emergency_action::TokenEmergencyAction; impl TokenBaseTransitionAccessors for TokenEmergencyActionTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0_methods.rs index c57cf214ae2..751694b6d8b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::batched_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::TokenEmergencyActionTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::TokenEmergencyActionTransition; use crate::tokens::emergency_action::TokenEmergencyAction; use crate::util::hash::hash_double; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/mod.rs index ef6212c5df0..c23e4654a1f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/mod.rs @@ -1,7 +1,7 @@ use platform_version::version::PlatformVersion; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_emergency_action_transition::validate_structure::v0::TokenEmergencyActionTransitionStructureValidationV0; -use crate::state_transition::batch_transition::TokenEmergencyActionTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::validate_structure::v0::TokenEmergencyActionTransitionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::TokenEmergencyActionTransition; use crate::validation::SimpleConsensusValidationResult; mod v0; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/v0/mod.rs index 261522c3847..d2068eaff7f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_emergency_action_transition/validate_structure/v0/mod.rs @@ -1,13 +1,13 @@ -use crate::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; -use crate::state_transition::batch_transition::TokenEmergencyActionTransition; +use crate::errors::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_emergency_action_transition::TokenEmergencyActionTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenEmergencyActionTransitionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/mod.rs index 69df4229a42..a79891534ca 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenFreezeTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenFreezeTransition { #[display("V0({})", "_0")] V0(TokenFreezeTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/mod.rs index 63ac477933e..6b72254fbfc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use platform_value::Identifier; #[cfg(feature = "state-transition-serde-conversion")] @@ -16,6 +16,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenFreezeTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/v0_methods.rs index 78a9555038c..ff9e1539338 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_freeze_transition::TokenFreezeTransitionV0; -use crate::state_transition::batch_transition::TokenFreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::TokenFreezeTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::TokenFreezeTransition; impl TokenBaseTransitionAccessors for TokenFreezeTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0_methods.rs index fc4642abefb..398e78dfc0b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use crate::state_transition::batch_transition::TokenFreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::TokenFreezeTransition; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenFreezeTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/mod.rs index 78c104c60cb..7aa1169cf94 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/mod.rs @@ -1,7 +1,7 @@ mod v0; -use crate::state_transition::batch_transition::token_freeze_transition::validate_structure::v0::TokenFreezeTransitionStructureValidationV0; -use crate::state_transition::batch_transition::TokenFreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::validate_structure::v0::TokenFreezeTransitionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::TokenFreezeTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/v0/mod.rs index e3a98a6bf4a..cfa870457cf 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_freeze_transition/validate_structure/v0/mod.rs @@ -1,13 +1,13 @@ -use crate::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use crate::state_transition::batch_transition::TokenFreezeTransition; +use crate::errors::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_freeze_transition::TokenFreezeTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenFreezeTransitionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/mod.rs index 26e150657a6..e841c58a1dc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenMintTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenMintTransition { #[display("V0({})", "_0")] V0(TokenMintTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/mod.rs index da8079655a5..f212df3d7c7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use platform_value::string_encoding::Encoding; use platform_value::Identifier; @@ -20,6 +20,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenMintTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/v0_methods.rs index 3b3694a442d..8f5cdfa5e7f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0/v0_methods.rs @@ -3,12 +3,12 @@ use crate::data_contract::associated_token::token_configuration::accessors::v0:: use crate::data_contract::associated_token::token_configuration::TokenConfiguration; use crate::data_contract::associated_token::token_distribution_rules::accessors::v0::TokenDistributionRulesV0Getters; use crate::ProtocolError; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0; -use crate::state_transition::batch_transition::TokenMintTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransition; use crate::tokens::errors::TokenError; impl TokenBaseTransitionAccessors for TokenMintTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0_methods.rs index b956f1f71c4..10cf2d51d6c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/v0_methods.rs @@ -3,11 +3,11 @@ use crate::balances::credits::TokenAmount; use crate::data_contract::associated_token::token_configuration::TokenConfiguration; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_mint_transition::TokenMintTransition; -use crate::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenMintTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/mod.rs index 5858e0b50bc..de31e653d9e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_mint_transition::validate_structure::v0::TokenMintTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenMintTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::validate_structure::v0::TokenMintTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/v0/mod.rs index 22e15d92449..4b1e2599db6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/v0/mod.rs @@ -1,14 +1,14 @@ -use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM; -use crate::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; -use crate::state_transition::batch_transition::TokenMintTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenMintTransitionActionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/mod.rs index 8bb643a7da0..69dcb4b1551 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/mod.rs @@ -26,6 +26,7 @@ pub use v0::TokenSetPriceForDirectPurchaseTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenSetPriceForDirectPurchaseTransition { /// Version 0 of the token set price for direct purchase transition. /// diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/mod.rs index b91c515a934..12f937d2d07 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/mod.rs @@ -2,7 +2,7 @@ pub mod v0_methods; /// The Identifier fields in [`TokenSetPriceForDirectPurchaseTransition`] pub use super::super::document_base_transition::IDENTIFIER_FIELDS; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::tokens::token_pricing_schedule::TokenPricingSchedule; use bincode::{Decode, Encode}; #[cfg(feature = "state-transition-serde-conversion")] @@ -15,6 +15,7 @@ use std::fmt; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenSetPriceForDirectPurchaseTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/v0_methods.rs index 8ec1935292b..113eb47bf40 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransitionV0; -use crate::state_transition::batch_transition::TokenSetPriceForDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::TokenSetPriceForDirectPurchaseTransition; use crate::tokens::token_pricing_schedule::TokenPricingSchedule; impl TokenBaseTransitionAccessors for TokenSetPriceForDirectPurchaseTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0_methods.rs index 15409f6009f..cba31fb83e1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransition; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; use crate::tokens::token_pricing_schedule::TokenPricingSchedule; use crate::util::hash::hash_double; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/mod.rs index e4b169a7a20..318ce765b0e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::validate_structure::v0::TokenSetPriceForDirectPurchaseTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenSetPriceForDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::validate_structure::v0::TokenSetPriceForDirectPurchaseTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::TokenSetPriceForDirectPurchaseTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/v0/mod.rs index 4574d7531fb..14419750895 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_set_price_for_direct_purchase_transition/validate_structure/v0/mod.rs @@ -1,13 +1,13 @@ -use crate::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::TokenSetPriceForDirectPurchaseTransition; +use crate::errors::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::TokenSetPriceForDirectPurchaseTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenSetPriceForDirectPurchaseTransitionActionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/mod.rs index cd292c2e292..657b41d0b65 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/mod.rs @@ -6,13 +6,14 @@ use bincode::{Decode, Encode}; use derive_more::{Display, From}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; -pub use v0::*; +pub use v0::{IDENTIFIER_FIELDS, TokenTransferTransitionV0}; #[derive(Debug, Clone, Encode, Decode, PartialEq, Display, From)] #[cfg_attr( feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenTransferTransition { #[display("V0({})", "_0")] V0(TokenTransferTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/mod.rs index de433c3510f..ffba0a8b1a5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/mod.rs @@ -4,7 +4,7 @@ use bincode::{Decode, Encode}; use derive_more::Display; pub use super::super::token_base_transition::IDENTIFIER_FIELDS; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote}; use platform_value::Identifier; #[cfg(feature = "state-transition-serde-conversion")] @@ -27,6 +27,7 @@ mod property_names { "amount", "recipient_owner_id" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenTransferTransitionV0 { #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] pub base: TokenBaseTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/v0_methods.rs index d2846d5fda1..10ff1bbd52e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/v0_methods.rs @@ -1,8 +1,8 @@ use platform_value::Identifier; use crate::prelude::{DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex}; -use crate::state_transition::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransitionV0; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote}; impl TokenBaseTransitionAccessors for TokenTransferTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0_methods.rs index aff9670182f..786b1e4d119 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0_methods.rs @@ -1,9 +1,9 @@ use platform_value::Identifier; use crate::prelude::{DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex}; -use crate::state_transition::batch_transition::batched_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::TokenTransferTransition; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote}; impl TokenBaseTransitionAccessors for TokenTransferTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/mod.rs index 308db8fdb2d..436d2136a5f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/mod.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::token_transfer_transition::validate_structure::v0::TokenTransferTransitionActionStructureValidationV0; -use crate::state_transition::batch_transition::TokenTransferTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::validate_structure::v0::TokenTransferTransitionActionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/v0/mod.rs index 5ce2a430b3a..4d1ed941b1a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/v0/mod.rs @@ -1,13 +1,13 @@ use platform_value::Identifier; -use crate::consensus::basic::BasicError; -use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenTransferToOurselfError}; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenTransferToOurselfError}; +use crate::errors::consensus::ConsensusError; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use crate::state_transition::batch_transition::TokenTransferTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transition.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transition.rs index 1c8c8617dc5..d9c0e4516c2 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transition.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transition.rs @@ -18,26 +18,26 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::prelude::IdentityNonce; use crate::ProtocolError; -use crate::state_transition::batch_transition::{DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenClaimTransition, TokenTransferTransition, TokenSetPriceForDirectPurchaseTransition}; -use crate::state_transition::batch_transition::batched_transition::{DocumentPurchaseTransition, DocumentTransferTransition}; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; -use crate::state_transition::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; -use crate::state_transition::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; -use crate::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use crate::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; -use crate::state_transition::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; -use crate::state_transition::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; -use crate::state_transition::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use crate::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::{DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenClaimTransition, TokenTransferTransition, TokenSetPriceForDirectPurchaseTransition}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{DocumentPurchaseTransition, DocumentTransferTransition}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_config_update_transition::v0::v0_methods::TokenConfigUpdateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_emergency_action_transition::v0::v0_methods::TokenEmergencyActionTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_claim_transition::v0::v0_methods::TokenClaimTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::v0::v0_methods::TokenDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::v0::v0_methods::TokenSetPriceForDirectPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; use crate::tokens::token_event::TokenEvent; pub const TOKEN_HISTORY_ID_BYTES: [u8; 32] = [ @@ -50,6 +50,7 @@ pub const TOKEN_HISTORY_ID_BYTES: [u8; 32] = [ feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenTransition { #[display("TokenBurnTransition({})", "_0")] Burn(TokenBurnTransition), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/mod.rs index 6b9f3c392cb..c829171c98a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/mod.rs @@ -13,6 +13,7 @@ pub use v0::TokenUnfreezeTransitionV0; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenUnfreezeTransition { #[display("V0({})", "_0")] V0(TokenUnfreezeTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/mod.rs index a3e86da8d95..90e3de99092 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/mod.rs @@ -1,6 +1,6 @@ pub mod v0_methods; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use bincode::{Decode, Encode}; use platform_value::Identifier; #[cfg(feature = "state-transition-serde-conversion")] @@ -16,6 +16,7 @@ pub use super::super::document_base_transition::IDENTIFIER_FIELDS; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenUnfreezeTransitionV0 { /// Document Base Transition #[cfg_attr(feature = "state-transition-serde-conversion", serde(flatten))] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/v0_methods.rs index 0559542f7a7..6ed783c3db1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::TokenUnfreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; impl TokenBaseTransitionAccessors for TokenUnfreezeTransitionV0 { fn base(&self) -> &TokenBaseTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0_methods.rs index b90cf25acbd..f99471c28b7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/v0_methods.rs @@ -1,10 +1,10 @@ use platform_value::Identifier; use crate::prelude::IdentityNonce; -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use crate::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; -use crate::state_transition::batch_transition::TokenUnfreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; use crate::util::hash::hash_double; impl TokenBaseTransitionAccessors for TokenUnfreezeTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/mod.rs index 5dbf45eb1fd..e5c3f6ad123 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/mod.rs @@ -1,7 +1,7 @@ mod v0; -use crate::state_transition::batch_transition::token_unfreeze_transition::validate_structure::v0::TokenUnfreezeTransitionStructureValidationV0; -use crate::state_transition::batch_transition::TokenUnfreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::validate_structure::v0::TokenUnfreezeTransitionStructureValidationV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/v0/mod.rs index f5f0bf550dd..c8ac8a23e72 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_unfreeze_transition/validate_structure/v0/mod.rs @@ -1,13 +1,13 @@ -use crate::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; -use crate::state_transition::batch_transition::TokenUnfreezeTransition; +use crate::errors::consensus::basic::token::{InvalidTokenNoteTooBigError, TokenNoteOnlyAllowedWhenProposerError}; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; use crate::tokens::MAX_TOKEN_NOTE_LEN; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; pub(super) trait TokenUnfreezeTransitionStructureValidationV0 { fn validate_structure_v0(&self) -> Result; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/fields.rs index 8a72a2d50c2..da347de65de 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/fields.rs @@ -1,7 +1,7 @@ use crate::state_transition::state_transitions; -use crate::identity::SecurityLevel; -use crate::state_transition::batch_transition::fields::property_names::{ +use crate::identity::identity_public_key::security_level::SecurityLevel; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names::{ OWNER_ID, TRANSITIONS_DATA_CONTRACT_ID, TRANSITIONS_ID, }; pub use state_transitions::common_fields::property_names::{ diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/identity_signed.rs index 549bc5c955c..348d82fc068 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/identity_signed.rs @@ -1,5 +1,5 @@ use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for BatchTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/json_conversion.rs index 71e854b45ec..838a49a1153 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/json_conversion.rs @@ -1,5 +1,5 @@ -use crate::state_transition::batch_transition::BatchTransition; -use crate::state_transition::state_transitions::batch_transition::fields::*; +use crate::state_transition::state_transitions::document::batch_transition::fields::*; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; @@ -11,14 +11,14 @@ impl StateTransitionJsonConvert<'_> for BatchTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { BatchTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/mod.rs index ff12afae394..c993e9b376a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/mod.rs @@ -10,7 +10,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::TokenContractPosition; #[cfg(feature = "state-transition-signing")] use crate::document::Document; -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "state-transition-signing")] use crate::group::GroupStateTransitionInfoStatus; #[cfg(feature = "state-transition-signing")] @@ -20,12 +20,14 @@ use crate::identity::IdentityPublicKey; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::batched_transition::BatchedTransition; -use crate::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; -use crate::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; +use crate::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use crate::state_transition::state_transitions::document::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::{BatchTransitionV0, BatchTransitionV1}; +use crate::state_transition::state_transitions::document::batch_transition::{ + BatchTransitionV0, BatchTransitionV1, +}; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionSigningOptions; @@ -40,9 +42,10 @@ use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote}; use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; -use platform_version::version::FeatureVersion; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; pub mod v0; pub mod v1; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v0/mod.rs index 222df3d810a..38abf40c0c7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v0/mod.rs @@ -2,17 +2,17 @@ use crate::data_contract::document_type::DocumentTypeRef; #[cfg(feature = "state-transition-signing")] use crate::document::Document; -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::IdentityPublicKey; -use crate::identity::SecurityLevel; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::identity::identity_public_key::SecurityLevel; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::ProtocolError; @@ -20,9 +20,9 @@ use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; use std::convert::TryFrom; -use crate::state_transition::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionRef}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionRef}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::methods::StateTransitionCreationOptions; +use crate::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; #[cfg(feature = "state-transition-signing")] use crate::tokens::token_payment_info::TokenPaymentInfo; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v1/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v1/mod.rs index 2cdc90c1e86..7ab3ae4b6bc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v1/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v1/mod.rs @@ -5,7 +5,7 @@ use crate::data_contract::associated_token::token_configuration_item::TokenConfi #[cfg(feature = "state-transition-signing")] use crate::data_contract::associated_token::token_distribution_key::TokenDistributionType; #[cfg(feature = "state-transition-signing")] -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "state-transition-signing")] use crate::group::GroupStateTransitionInfoStatus; #[cfg(feature = "state-transition-signing")] @@ -14,9 +14,9 @@ use crate::identity::signer::Signer; use crate::identity::IdentityPublicKey; #[cfg(feature = "state-transition-signing")] use crate::prelude::{IdentityNonce, UserFeeIncrease}; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::methods::StateTransitionCreationOptions; +use crate::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/mod.rs index 93a886b1b84..74550c3d358 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/mod.rs @@ -9,7 +9,10 @@ use platform_value::Value; use serde::{Deserialize, Serialize}; use crate::ProtocolError; -use crate::{identity::SecurityLevel, state_transition::StateTransitionFieldTypes}; +use crate::{ + identity::identity_public_key::security_level::SecurityLevel, + state_transition::StateTransitionFieldTypes, +}; pub use self::batched_transition::{ document_base_transition, document_create_transition, @@ -44,23 +47,23 @@ mod json_conversion; pub mod methods; pub mod resolvers; mod state_transition_like; -mod v0; -mod v1; +pub mod v0; +pub mod v1; #[cfg(feature = "validation")] mod validation; #[cfg(feature = "state-transition-value-conversion")] mod value_conversion; mod version; -use crate::state_transition::data_contract_update_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, }; -use crate::state_transition::batch_transition::fields::property_names; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names; use crate::identity::state_transition::OptionallyAssetLockProved; -pub use v0::*; -pub use v1::*; +pub use v0::{BatchTransitionV0, BatchTransitionV0Signable}; +pub use v1::{BatchTransitionV1, BatchTransitionV1Signable}; #[derive( Debug, @@ -83,6 +86,7 @@ pub use v1::*; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.batch_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum BatchTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(BatchTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/resolvers/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/resolvers/v0/mod.rs index bdad604186b..0db1f8e846e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/resolvers/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/resolvers/v0/mod.rs @@ -1,9 +1,9 @@ -use crate::state_transition::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_unfreeze_transition::TokenUnfreezeTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ DocumentPurchaseTransition, DocumentTransferTransition, }; -use crate::state_transition::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::{ DocumentCreateTransition, DocumentDeleteTransition, DocumentReplaceTransition, TokenBurnTransition, TokenClaimTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/state_transition_like.rs index 0221ced2611..6dcbc3e4b56 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for BatchTransition { /// Returns ID of the created contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/cbor_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/cbor_conversion.rs index a7bdeaad6a3..81e07c92d1a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/cbor_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/cbor_conversion.rs @@ -1,16 +1,16 @@ -use crate::state_transition::data_contract_update_transition::{ +use crate::state_transition::state_transitions::contract::data_contract_update_transition::{ SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, }; -use crate::state_transition::documents_batch_transition::document_transition::DocumentTransitionV0Methods; -use crate::state_transition::documents_batch_transition::fields::property_names::{ +use crate::state_transition::state_transitions::document::documents_batch_transition::batched_transition::DocumentTransitionV0Methods; +use crate::state_transition::state_transitions::document::documents_batch_transition::fields::property_names::{ STATE_TRANSITION_PROTOCOL_VERSION, TRANSITIONS, }; -use crate::state_transition::documents_batch_transition::{ +use crate::state_transition::state_transitions::document::documents_batch_transition::{ document_base_transition, document_create_transition, DocumentsBatchTransitionV0, }; use crate::state_transition::{FeatureVersioned, StateTransitionCborConvert, StateTransitionFieldTypes, StateTransitionValueConvert}; use crate::util::cbor_value::{CborCanonicalMap, FieldType, ReplacePaths, ValuesCollection}; -use crate::ProtocolError; +use crate::errors::ProtocolError; use anyhow::Context; use ciborium::Value as CborValue; use std::convert::TryInto; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/identity_signed.rs index d0f7084b339..97e29db06b4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/identity_signed.rs @@ -1,7 +1,7 @@ -use crate::identity::SecurityLevel::{CRITICAL, HIGH, MEDIUM}; -use crate::identity::{KeyID, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::SecurityLevel::{CRITICAL, HIGH, MEDIUM}; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for BatchTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/json_conversion.rs index 035a37ad021..de9878e9372 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for BatchTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/mod.rs index 3bd2cb1d1a0..ca4fcdb5970 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/mod.rs @@ -8,10 +8,10 @@ mod v0_methods; mod value_conversion; mod version; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransition; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; @@ -26,6 +26,7 @@ use serde::{Deserialize, Serialize}; derive(Serialize, Deserialize) )] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BatchTransitionV0 { pub owner_id: Identifier, pub transitions: Vec, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/state_transition_like.rs index 83eb9f42442..57686d5d348 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/state_transition_like.rs @@ -1,12 +1,12 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ BatchTransition, BatchTransitionV0, }; use crate::state_transition::StateTransitionType::Batch; use crate::state_transition::{StateTransition, StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; use base64::prelude::BASE64_STANDARD; use base64::Engine; use platform_value::{BinaryData, Identifier}; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/types.rs index abe0ef311e8..7026ab3e7b8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/types.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::fields::property_names::*; -use crate::state_transition::batch_transition::fields::*; -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names::*; +use crate::state_transition::state_transitions::document::batch_transition::fields::*; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for BatchTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/v0_methods.rs index 03991a7f50a..f18cc914c76 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/v0_methods.rs @@ -3,26 +3,26 @@ use std::slice::Iter; use crate::data_contract::document_type::DocumentTypeRef; #[cfg(feature = "state-transition-signing")] use crate::document::{Document, DocumentV0Getters}; -use crate::fee::Credits; +use crate::balances::credits::Credits; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] -use crate::prelude::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::accessors::{DocumentsBatchTransitionAccessorsV0}; +use crate::state_transition::state_transitions::document::batch_transition::accessors::{DocumentsBatchTransitionAccessorsV0}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; -use crate::state_transition::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionMutRef, BatchedTransitionRef}; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{BatchedTransition, BatchedTransitionMutRef, BatchedTransitionRef}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ DocumentPurchaseTransition, DocumentReplaceTransition, DocumentTransferTransition, DocumentUpdatePriceTransition, }; -use crate::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ BatchTransition, DocumentDeleteTransition, }; #[cfg(feature = "state-transition-signing")] @@ -34,12 +34,12 @@ use platform_value::Identifier; use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-signing")] use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; -use crate::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransition; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::methods::StateTransitionCreationOptions; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; #[cfg(feature = "state-transition-signing")] use crate::tokens::token_payment_info::TokenPaymentInfo; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/value_conversion.rs index dd33e917732..e50f3395cb5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/value_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; use crate::state_transition::StateTransitionValueConvert; impl StateTransitionValueConvert<'_> for BatchTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/version.rs index c8a27eafe8f..b81e9996d7a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::BatchTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for BatchTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/identity_signed.rs index 32458067c0b..d107811d945 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/identity_signed.rs @@ -1,8 +1,11 @@ -use crate::identity::SecurityLevel::{CRITICAL, HIGH, MEDIUM}; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::identity::identity_public_key::security_level::SecurityLevel::{CRITICAL, HIGH, MEDIUM}; +use crate::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + KeyID, +}; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for BatchTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/json_conversion.rs index 38ae2ffaee0..1b97b4173a6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for BatchTransitionV1 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/mod.rs index 6ae54da69ee..1ebe4d0ccb2 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/mod.rs @@ -11,7 +11,7 @@ mod version; use crate::identity::KeyID; -use crate::state_transition::batch_transition::batched_transition::BatchedTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; @@ -27,6 +27,7 @@ use serde::{Deserialize, Serialize}; derive(Serialize, Deserialize) )] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BatchTransitionV1 { pub owner_id: Identifier, pub transitions: Vec, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/state_transition_like.rs index f215e8156b4..ca076792aff 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/state_transition_like.rs @@ -1,15 +1,15 @@ use crate::prelude::UserFeeIncrease; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; -use crate::state_transition::batch_transition::{BatchTransition, BatchTransitionV1}; +use crate::state_transition::state_transitions::document::batch_transition::{BatchTransition, BatchTransitionV1}; use crate::state_transition::StateTransitionType::Batch; use crate::state_transition::{StateTransition, StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; use base64::prelude::BASE64_STANDARD; use base64::Engine; use platform_value::{BinaryData, Identifier}; -use crate::state_transition::batch_transition::batched_transition::BatchedTransition; -use crate::state_transition::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; impl From for StateTransition { fn from(value: BatchTransitionV1) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/types.rs index 2a3095b8f96..bab3c35e222 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/types.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::fields::property_names::*; -use crate::state_transition::batch_transition::fields::*; -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names::*; +use crate::state_transition::state_transitions::document::batch_transition::fields::*; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for BatchTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v0_methods.rs index 3d278b483a1..9207d62fd13 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v0_methods.rs @@ -5,29 +5,29 @@ use crate::document::{Document, DocumentV0Getters}; use crate::fee::Credits; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; -use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] -use crate::prelude::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ BatchedTransition, BatchedTransitionMutRef, BatchedTransitionRef, }; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::batched_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::{ DocumentPurchaseTransition, DocumentReplaceTransition, DocumentTransferTransition, DocumentUpdatePriceTransition, }; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; -use crate::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; +use crate::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use std::iter::Map; use std::slice::Iter; -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::{ BatchTransition, DocumentDeleteTransition, }; #[cfg(feature = "state-transition-signing")] @@ -39,11 +39,11 @@ use platform_value::Identifier; use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-signing")] use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; -use crate::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use crate::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::methods::StateTransitionCreationOptions; -use crate::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use crate::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; +use crate::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; #[cfg(feature = "state-transition-signing")] use crate::tokens::token_payment_info::TokenPaymentInfo; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v1_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v1_methods.rs index 8c0f1d4a996..7f683ffe9fa 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v1_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v1_methods.rs @@ -5,18 +5,18 @@ use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] -use crate::prelude::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::batched_transition::BatchedTransition; -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::{TokenDirectPurchaseTransition, TokenSetPriceForDirectPurchaseTransition}; +use crate::state_transition::state_transitions::document::batch_transition::{TokenDirectPurchaseTransition, TokenSetPriceForDirectPurchaseTransition}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::{TokenClaimTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenTransferTransition, TokenUnfreezeTransition}; +use crate::state_transition::state_transitions::document::batch_transition::{TokenClaimTransition, TokenBurnTransition, TokenConfigUpdateTransition, TokenDestroyFrozenFundsTransition, TokenEmergencyActionTransition, TokenFreezeTransition, TokenMintTransition, TokenTransferTransition, TokenUnfreezeTransition}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] @@ -34,40 +34,40 @@ use crate::data_contract::associated_token::token_distribution_key::TokenDistrib #[cfg(feature = "state-transition-signing")] use crate::group::{GroupStateTransitionInfo, GroupStateTransitionInfoStatus}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::multi_party_action::AllowedAsMultiPartyAction; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::methods::StateTransitionCreationOptions; -use crate::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; +use crate::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; +use crate::state_transition::state_transitions::document::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_burn_transition::TokenBurnTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_burn_transition::TokenBurnTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_claim_transition::TokenClaimTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_claim_transition::TokenClaimTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_config_update_transition::TokenConfigUpdateTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_config_update_transition::TokenConfigUpdateTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_emergency_action_transition::TokenEmergencyActionTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_emergency_action_transition::TokenEmergencyActionTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_freeze_transition::TokenFreezeTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_freeze_transition::TokenFreezeTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_mint_transition::TokenMintTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::TokenSetPriceForDirectPurchaseTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_transfer_transition::TokenTransferTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_transfer_transition::TokenTransferTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::batch_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0; +use crate::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0; #[cfg(feature = "state-transition-signing")] use crate::state_transition::GetDataContractSecurityLevelRequirementFn; #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/value_conversion.rs index b2e4b9775d9..35d8b616298 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/value_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; use crate::state_transition::StateTransitionValueConvert; impl StateTransitionValueConvert<'_> for BatchTransitionV1 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/version.rs index dcedbd28965..59ce3695169 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::BatchTransitionV1; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransitionV1; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for BatchTransitionV1 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/find_duplicates_by_id/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/find_duplicates_by_id/v0/mod.rs index 27f1f46368a..9e6dccd0b52 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/find_duplicates_by_id/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/find_duplicates_by_id/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use platform_value::Identifier; use std::collections::btree_map::Entry; use std::collections::BTreeMap; @@ -48,14 +48,14 @@ pub(super) fn find_duplicates_by_id<'a>( #[cfg(test)] mod test { use super::*; - use crate::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; - use crate::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; - use crate::state_transition::batch_transition::document_create_transition::DocumentCreateTransitionV0; - use crate::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; - use crate::state_transition::batch_transition::batched_transition::DocumentCreateTransition; - use crate::state_transition::batch_transition::batched_transition::DocumentReplaceTransition; - use crate::state_transition::batch_transition::batched_transition::DocumentDeleteTransition; - use crate::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_create_transition::DocumentCreateTransitionV0; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentCreateTransition; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentReplaceTransition; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentDeleteTransition; + use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; #[test] fn test_duplicates() { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/mod.rs index b2f89c158d7..fb577d33b8f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/v0/mod.rs index 60661a44916..23615054149 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/validation/validate_basic_structure/v0/mod.rs @@ -1,36 +1,36 @@ -use crate::consensus::basic::document::{ +use crate::errors::consensus::basic::document::{ DocumentTransitionsAreAbsentError, DuplicateDocumentTransitionsWithIdsError, MaxDocumentsTransitionsExceededError, NonceOutOfBoundsError, }; -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use crate::identity::identity_nonce::MISSING_IDENTITY_REVISIONS_FILTER; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use crate::state_transition::batch_transition::validation::find_duplicates_by_id::find_duplicates_by_id; -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::validation::find_duplicates_by_id::find_duplicates_by_id; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_value::Identifier; use platform_version::version::PlatformVersion; use std::collections::btree_map::Entry; use std::collections::BTreeMap; -use crate::consensus::basic::group::GroupActionNotAllowedOnTransitionError; -use crate::consensus::basic::token::{InvalidActionIdError, InvalidTokenIdError}; -use crate::state_transition::batch_transition::batched_transition::BatchedTransitionRef; -use crate::state_transition::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; -use crate::state_transition::batch_transition::batched_transition::token_transition_action_type::TokenTransitionActionTypeGetter; -use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use crate::state_transition::batch_transition::token_config_update_transition::validate_structure::TokenConfigUpdateTransitionStructureValidation; -use crate::state_transition::batch_transition::token_destroy_frozen_funds_transition::validate_structure::TokenDestroyFrozenFundsTransitionStructureValidation; -use crate::state_transition::batch_transition::token_emergency_action_transition::validate_structure::TokenEmergencyActionTransitionStructureValidation; -use crate::state_transition::batch_transition::token_freeze_transition::validate_structure::TokenFreezeTransitionStructureValidation; -use crate::state_transition::batch_transition::token_mint_transition::validate_structure::TokenMintTransitionStructureValidation; -use crate::state_transition::batch_transition::token_claim_transition::validate_structure::TokenClaimTransitionStructureValidation; -use crate::state_transition::batch_transition::token_direct_purchase_transition::validate_structure::TokenDirectPurchaseTransitionStructureValidation; -use crate::state_transition::batch_transition::token_set_price_for_direct_purchase_transition::validate_structure::TokenSetPriceForDirectPurchaseTransitionStructureValidation; -use crate::state_transition::batch_transition::token_transfer_transition::validate_structure::TokenTransferTransitionStructureValidation; -use crate::state_transition::batch_transition::token_unfreeze_transition::validate_structure::TokenUnfreezeTransitionStructureValidation; +use crate::errors::consensus::basic::group::GroupActionNotAllowedOnTransitionError; +use crate::errors::consensus::basic::token::{InvalidActionIdError, InvalidTokenIdError}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition_action_type::TokenTransitionActionTypeGetter; +use crate::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use crate::state_transition::state_transitions::document::batch_transition::token_config_update_transition::validate_structure::TokenConfigUpdateTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::validate_structure::TokenDestroyFrozenFundsTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_emergency_action_transition::validate_structure::TokenEmergencyActionTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_freeze_transition::validate_structure::TokenFreezeTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_mint_transition::validate_structure::TokenMintTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_claim_transition::validate_structure::TokenClaimTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::validate_structure::TokenDirectPurchaseTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_set_price_for_direct_purchase_transition::validate_structure::TokenSetPriceForDirectPurchaseTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_transfer_transition::validate_structure::TokenTransferTransitionStructureValidation; +use crate::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::validate_structure::TokenUnfreezeTransitionStructureValidation; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::{DocumentTransition, DocumentTransitionV0Methods}; use crate::state_transition::StateTransitionLike; use crate::state_transition::state_transitions::document::batch_transition::batched_transition::token_burn_transition::validate_structure::TokenBurnTransitionStructureValidation; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/value_conversion.rs index 55beda05bdf..05a4908662c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/value_conversion.rs @@ -2,16 +2,17 @@ use std::collections::BTreeMap; use platform_value::Value; -use crate::ProtocolError; +use crate::errors::ProtocolError; -use crate::state_transition::batch_transition::{ +use crate::state_transition::state_transitions::document::batch_transition::fields::*; +use crate::state_transition::state_transitions::document::batch_transition::{ BatchTransition, BatchTransitionV0, BatchTransitionV1, }; -use crate::state_transition::state_transitions::batch_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl StateTransitionValueConvert<'_> for BatchTransition { fn to_object(&self, skip_signature: bool) -> Result { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/version.rs index be7d07021e1..e0512276999 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::batch_transition::BatchTransition; +use crate::state_transition::state_transitions::document::batch_transition::BatchTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for BatchTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/mod.rs index 64ea5ff381f..33a9c5fb3a8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/mod.rs @@ -1,7 +1,7 @@ mod v0; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use platform_value::Identifier; pub use v0::*; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/v0/mod.rs index 04de1f7e3a7..aa10a3ee697 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/accessors/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use platform_value::Identifier; pub trait IdentityCreateTransitionAccessorsV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/json_conversion.rs index d8ea2797b0b..f28269ff4c7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::identity_create_transition::IdentityCreateTransition; -use crate::state_transition::state_transitions::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for IdentityCreateTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { IdentityCreateTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/mod.rs index 83f90d6dad7..55fe4cb38ad 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/mod.rs @@ -5,21 +5,21 @@ pub use v0::*; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::Identity; +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; #[cfg(feature = "state-transition-signing")] -use crate::prelude::AssetLockProof; +use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] -use crate::version::PlatformVersion; +use crate::{errors::ProtocolError, BlsModule}; #[cfg(feature = "state-transition-signing")] -use crate::{BlsModule, ProtocolError}; +use platform_version::version::PlatformVersion; impl IdentityCreateTransitionMethodsV0 for IdentityCreateTransition { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/v0/mod.rs index 9fdc3f989f6..59387bea76a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/methods/v0/mod.rs @@ -1,16 +1,16 @@ #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::Identity; +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; #[cfg(feature = "state-transition-signing")] -use crate::prelude::AssetLockProof; +use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] -use crate::{BlsModule, ProtocolError}; +use crate::{errors::ProtocolError, BlsModule}; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/mod.rs index 0691ae08284..e543bf71073 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/mod.rs @@ -10,8 +10,8 @@ pub mod v0; mod value_conversion; mod version; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0Signable; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use crate::ProtocolError; @@ -47,6 +47,7 @@ pub type IdentityCreateTransitionLatest = IdentityCreateTransitionV0; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.identity_create_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityCreateTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityCreateTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/proved.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/proved.rs index cee34c9d4be..1c9e0f18fa6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/proved.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/proved.rs @@ -1,6 +1,6 @@ +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::state_transition::{AssetLockProved, OptionallyAssetLockProved}; -use crate::prelude::AssetLockProof; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use crate::ProtocolError; impl OptionallyAssetLockProved for IdentityCreateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/state_transition_like.rs index 63d23b3b520..d535a53eb9e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/state_transition_like.rs @@ -1,9 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; - +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for IdentityCreateTransition { /// Returns ID of the created contract fn modified_data_ids(&self) -> Vec { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/json_conversion.rs index f3f037fe269..0b20a058281 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityCreateTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/mod.rs index dec9e0efa07..e1be46b3975 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/mod.rs @@ -13,21 +13,21 @@ use std::convert::TryFrom; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::Identity; -use crate::prelude::{Identifier, UserFeeIncrease}; +use crate::prelude::UserFeeIncrease; use crate::identity::accessors::IdentityGettersV0; use crate::identity::state_transition::AssetLockProved; -use crate::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreationSignable; -use crate::version::PlatformVersion; +use crate::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreationSignable; use crate::ProtocolError; +use platform_version::version::PlatformVersion; #[derive(Debug, Clone, PartialEq, Encode, Decode, PlatformSignable)] #[cfg_attr( @@ -41,6 +41,7 @@ use crate::ProtocolError; // Instead of inside of bincode_derive #[platform_signable(derive_bincode_with_borrowed_vec)] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityCreateTransitionV0 { // When signing, we don't sign the signatures for keys #[platform_signable(into = "Vec")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/proved.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/proved.rs index 5c8da97eac1..c1c1446f9ed 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/proved.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/proved.rs @@ -1,7 +1,7 @@ +use crate::errors::ProtocolError; +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::state_transition::AssetLockProved; -use crate::prelude::AssetLockProof; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::ProtocolError; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; impl AssetLockProved for IdentityCreateTransitionV0 { fn set_asset_lock_proof( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/state_transition_like.rs index 42ece86f989..0d0990deb68 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/state_transition_like.rs @@ -1,19 +1,16 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityCreate; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityCreateTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/types.rs index e03876c21e6..946a1f48077 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::identity_create_transition::fields::*; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityCreateTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/v0_methods.rs index baf2d0cb40c..ad34cce80d0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/v0_methods.rs @@ -1,4 +1,4 @@ -use crate::{prelude::Identifier, state_transition::StateTransitionType}; +use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] use crate::{BlsModule, ProtocolError}; @@ -7,30 +7,31 @@ use crate::identity::accessors::IdentityGettersV0; #[cfg(feature = "state-transition-signing")] use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; #[cfg(feature = "state-transition-signing")] +use crate::identity::identity_public_key::KeyType::ECDSA_HASH160; +#[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; +#[cfg(feature = "state-transition-signing")] use crate::identity::state_transition::AssetLockProved; #[cfg(feature = "state-transition-signing")] use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] -use crate::identity::KeyType::ECDSA_HASH160; -#[cfg(feature = "state-transition-signing")] -use crate::prelude::AssetLockProof; -#[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] use crate::serialization::Signable; -use crate::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use crate::state_transition::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; +use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl IdentityCreateTransitionMethodsV0 for IdentityCreateTransitionV0 { #[cfg(feature = "state-transition-signing")] @@ -43,6 +44,7 @@ impl IdentityCreateTransitionMethodsV0 for IdentityCreateTransitionV0 { user_fee_increase: UserFeeIncrease, _platform_version: &PlatformVersion, ) -> Result { + println!("IdentityCreateTransitionV0::try_from_identity_with_signer.1: {:p} {:p} {:p}", identity, &asset_lock_proof, asset_lock_proof_private_key); let mut identity_create_transition = IdentityCreateTransitionV0 { user_fee_increase, ..Default::default() @@ -60,7 +62,7 @@ impl IdentityCreateTransitionMethodsV0 for IdentityCreateTransitionV0 { let state_transition: StateTransition = identity_create_transition.clone().into(); let key_signable_bytes = state_transition.signable_bytes()?; - + println!("IdentityCreateTransitionV0::try_from_identity_with_signer.2: {:p}", &key_signable_bytes); identity_create_transition .public_keys .iter_mut() @@ -74,8 +76,10 @@ impl IdentityCreateTransitionMethodsV0 for IdentityCreateTransitionV0 { })?; let mut state_transition: StateTransition = identity_create_transition.into(); + println!("IdentityCreateTransitionV0::try_from_identity_with_signer.3: {:p}", &asset_lock_proof_private_key); state_transition.sign_by_private_key(asset_lock_proof_private_key, ECDSA_HASH160, bls)?; + println!("IdentityCreateTransitionV0::try_from_identity_with_signer.4: {:p}", &state_transition); Ok(state_transition) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/value_conversion.rs index 3427ecf9249..be22f18089f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/value_conversion.rs @@ -11,13 +11,13 @@ use crate::{ ProtocolError, }; -use crate::prelude::AssetLockProof; +use crate::state_transition::AssetLockProof; use crate::identity::state_transition::AssetLockProved; -use crate::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use crate::state_transition::identity_create_transition::fields::*; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionValueConvert; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/version.rs index 29411a4025b..5d45c9812da 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreateTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/value_conversion.rs index 31a1802d368..4616916b286 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/value_conversion.rs @@ -4,14 +4,15 @@ use platform_value::Value; use crate::ProtocolError; -use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use crate::state_transition::identity_create_transition::IdentityCreateTransition; -use crate::state_transition::state_transitions::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use crate::state_transition::StateTransitionValueConvert; use crate::serialization::ValueConvertible; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::protocol_version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ValueConvertible<'_> for IdentityCreateTransition {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/version.rs index 4714fca7f06..9c67daaf413 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_create_transition::IdentityCreateTransition; +use crate::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreateTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/mod.rs index e263f3faebd..a8906e8ee59 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/mod.rs @@ -1,7 +1,7 @@ mod v0; use crate::prelude::IdentityNonce; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use platform_value::Identifier; pub use v0::*; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/fields.rs index 6b5813e902b..84e4096abb7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/fields.rs @@ -1,6 +1,6 @@ use crate::state_transition::state_transitions; -use crate::state_transition::identity_credit_transfer_transition::fields::property_names::RECIPIENT_ID; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::property_names::RECIPIENT_ID; pub use state_transitions::common_fields::property_names::{ IDENTITY_NONCE, SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, TRANSITION_TYPE, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/identity_signed.rs index 60dd03cf6f4..bc3894acd69 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/identity_signed.rs @@ -1,5 +1,5 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityCreditTransferTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/json_conversion.rs index 09f62ade27b..6b41eeaf63f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; -use crate::state_transition::state_transitions::identity_credit_transfer_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::*; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for IdentityCreditTransferTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { IdentityCreditTransferTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/mod.rs index 43790f371db..f12a60e41b1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/mod.rs @@ -1,13 +1,13 @@ mod v0; pub use v0::*; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; #[cfg(feature = "state-transition-signing")] use crate::{ identity::{signer::Signer, Identity, IdentityPublicKey}, prelude::{IdentityNonce, UserFeeIncrease}, state_transition::{ - identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0, + state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0, StateTransition, }, ProtocolError, @@ -15,7 +15,9 @@ use crate::{ #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; impl IdentityCreditTransferTransitionMethodsV0 for IdentityCreditTransferTransition { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/v0/mod.rs index ca0e45b67a4..af620ec1ff5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/methods/v0/mod.rs @@ -8,7 +8,9 @@ use crate::{ #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; use crate::state_transition::StateTransitionType; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/mod.rs index b991b7402b8..cc22a4bba5e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/mod.rs @@ -10,9 +10,9 @@ pub mod v0; mod value_conversion; mod version; -use crate::state_transition::identity_credit_transfer_transition::fields::property_names::RECIPIENT_ID; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0Signable; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::property_names::RECIPIENT_ID; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use crate::identity::state_transition::OptionallyAssetLockProved; @@ -49,6 +49,7 @@ pub type IdentityCreditTransferTransitionLatest = IdentityCreditTransferTransiti #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.identity_credit_transfer_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityCreditTransferTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityCreditTransferTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/state_transition_like.rs index e4fecb34efa..e561b4b7d6c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for IdentityCreditTransferTransition { /// Returns ID of the credit_transferred contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/identity_signed.rs index acc328d2741..7c3dfcffed9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/identity_signed.rs @@ -1,6 +1,6 @@ -use crate::identity::SecurityLevel::CRITICAL; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::identity::identity_public_key::SecurityLevel::CRITICAL; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityCreditTransferTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/json_conversion.rs index 35e47a44aba..c1bfc0f9921 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityCreditTransferTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/mod.rs index b04b6f3f761..0c214f81ddb 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/mod.rs @@ -8,14 +8,14 @@ pub(super) mod v0_methods; mod value_conversion; mod version; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; -use crate::prelude::{Identifier, IdentityNonce, UserFeeIncrease}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, PlatformSignable}; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -36,6 +36,7 @@ use serde::{Deserialize, Serialize}; )] #[platform_serialize(unversioned)] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityCreditTransferTransitionV0 { // Own ST fields pub identity_id: Identifier, @@ -54,7 +55,7 @@ mod test { use crate::serialization::{PlatformDeserializable, PlatformSerializable}; - use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; + use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use platform_value::Identifier; use rand::Rng; use std::fmt::Debug; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/state_transition_like.rs index f11b5ae9d4a..4718e89a7bd 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/state_transition_like.rs @@ -1,19 +1,16 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityCreditTransfer; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityCreditTransferTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/types.rs index 55f2f0eb6e6..85fdf0a2e7e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/types.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_transfer_transition::fields::property_names::*; -use crate::state_transition::identity_credit_transfer_transition::fields::*; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::property_names::*; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityCreditTransferTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/v0_methods.rs index bbcd3780c05..de7e3ff5124 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/v0_methods.rs @@ -2,7 +2,6 @@ use crate::{ identity::{ accessors::IdentityGettersV0, signer::Signer, Identity, IdentityPublicKey, KeyType, - Purpose, SecurityLevel, }, prelude::{IdentityNonce, UserFeeIncrease}, state_transition::StateTransition, @@ -11,12 +10,17 @@ use crate::{ #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; -use crate::state_transition::identity_credit_transfer_transition::methods::IdentityCreditTransferTransitionMethodsV0; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::methods::IdentityCreditTransferTransitionMethodsV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; #[cfg(feature = "state-transition-signing")] use crate::state_transition::GetDataContractSecurityLevelRequirementFn; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; + +#[cfg(feature = "state-transition-signing")] +use crate::identity::identity_public_key::{Purpose, SecurityLevel}; impl IdentityCreditTransferTransitionMethodsV0 for IdentityCreditTransferTransitionV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/value_conversion.rs index 3734da5c3d6..8ffe5ce793a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/value_conversion.rs @@ -2,10 +2,10 @@ use std::collections::BTreeMap; use platform_value::{IntegerReplacementType, ReplacementType, Value}; -use crate::{state_transition::StateTransitionFieldTypes, ProtocolError}; +use crate::{errors::ProtocolError, state_transition::StateTransitionFieldTypes}; -use crate::state_transition::identity_credit_transfer_transition::fields::*; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::StateTransitionValueConvert; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/version.rs index a24300f243c..b4c391f6038 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreditTransferTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/value_conversion.rs index 14091bea6ef..00957b7ef01 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/value_conversion.rs @@ -4,14 +4,15 @@ use platform_value::Value; use crate::ProtocolError; -use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; -use crate::state_transition::state_transitions::identity_credit_transfer_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; use crate::serialization::ValueConvertible; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ValueConvertible<'_> for IdentityCreditTransferTransition {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/version.rs index abb778305c9..844bbc3d2a9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use crate::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreditTransferTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/accessors/mod.rs index eb952d65097..17ee2909bea 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/accessors/mod.rs @@ -5,7 +5,7 @@ use platform_value::Identifier; pub use v0::*; use crate::prelude::IdentityNonce; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::withdrawal::Pooling; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/identity_signed.rs index 75165fbb7d3..a2e38a4be96 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/identity_signed.rs @@ -1,5 +1,5 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityCreditWithdrawalTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/json_conversion.rs index ad4ff4e6ea3..c8a61b0beea 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; -use crate::state_transition::state_transitions::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for IdentityCreditWithdrawalTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { IdentityCreditWithdrawalTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } @@ -27,7 +27,7 @@ impl StateTransitionJsonConvert<'_> for IdentityCreditWithdrawalTransition { let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(1)), + serde_json::Value::Number(Number::from(1)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/mod.rs index acab5d8f3c6..350416377da 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/mod.rs @@ -1,9 +1,9 @@ mod v0; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; -#[cfg(feature = "state-transition-signing")] -use platform_version::version::FeatureVersion; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; pub use v0::*; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; @@ -17,11 +17,11 @@ use crate::identity::IdentityPublicKey; #[cfg(feature = "state-transition-signing")] use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] -use crate::version::PlatformVersion; +use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-signing")] use crate::withdrawal::Pooling; #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/v0/mod.rs index eeb3ecabada..1d54334db94 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/methods/v0/mod.rs @@ -9,7 +9,9 @@ use crate::{ use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; /// The key purpose that is preferred for signing the withdrawal #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs index 0badee88b91..7cfe087e390 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; pub mod accessors; pub mod fields; @@ -13,12 +13,12 @@ pub mod v1; mod value_conversion; mod version; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0Signable; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use crate::balances::credits::CREDITS_PER_DUFF; use crate::identity::state_transition::OptionallyAssetLockProved; -use crate::state_transition::identity_credit_withdrawal_transition::v1::{ +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::{ IdentityCreditWithdrawalTransitionV1, IdentityCreditWithdrawalTransitionV1Signable, }; use crate::ProtocolError; @@ -62,6 +62,7 @@ pub type IdentityCreditWithdrawalTransitionLatest = IdentityCreditWithdrawalTran #[platform_version_path( "dpp.state_transition_serialization_versions.identity_credit_withdrawal_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityCreditWithdrawalTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityCreditWithdrawalTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/state_transition_like.rs index 165d071b4b6..d1524371cb3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for IdentityCreditWithdrawalTransition { /// Returns ID of the credit_withdrawalred contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/identity_signed.rs index 122a1b4534d..3175d92bcd6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/identity_signed.rs @@ -1,7 +1,7 @@ -use crate::identity::SecurityLevel::CRITICAL; -use crate::identity::{KeyID, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::SecurityLevel::CRITICAL; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityCreditWithdrawalTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/json_conversion.rs index 1a3029aab99..ddef8cee93a 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityCreditWithdrawalTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/mod.rs index 2be39083e0e..053bb8570a5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/mod.rs @@ -9,14 +9,13 @@ mod version; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::{ - identity::{core_script::CoreScript, KeyID}, - prelude::Identifier, + identity::{core_script::CoreScript, identity_public_key::KeyID}, withdrawal::Pooling, ProtocolError, }; @@ -28,6 +27,7 @@ use crate::{ serde(rename_all = "camelCase") )] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityCreditWithdrawalTransitionV0 { pub identity_id: Identifier, pub amount: u64, @@ -48,7 +48,7 @@ mod test { use crate::identity::KeyID; use crate::prelude::Revision; use crate::serialization::{PlatformDeserializable, PlatformSerializable}; - use crate::state_transition::identity_credit_withdrawal_transition::v0::Pooling; + use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::Pooling; use crate::state_transition::StateTransitionType; use crate::ProtocolError; use bincode::{Decode, Encode}; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/state_transition_like.rs index 605f8344512..9be71ff9d5c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/state_transition_like.rs @@ -1,19 +1,16 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityCreditWithdrawal; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityCreditWithdrawalTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/types.rs index d6ecad2e4ae..8f69434d463 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::identity_credit_withdrawal_transition::fields::*; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityCreditWithdrawalTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/value_conversion.rs index 777e24cb519..fd297ef41ed 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/value_conversion.rs @@ -2,10 +2,10 @@ use std::collections::BTreeMap; use platform_value::{IntegerReplacementType, ReplacementType, Value}; -use crate::{state_transition::StateTransitionFieldTypes, ProtocolError}; +use crate::{errors::ProtocolError, state_transition::StateTransitionFieldTypes}; -use crate::state_transition::identity_credit_withdrawal_transition::fields::*; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransitionValueConvert; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/version.rs index 01e185efb16..ad1153ddadb 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreditWithdrawalTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/identity_signed.rs index bc541c4b3ce..aa8d652ccfc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/identity_signed.rs @@ -1,6 +1,5 @@ -use crate::identity::SecurityLevel::CRITICAL; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel, SecurityLevel::CRITICAL}; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityCreditWithdrawalTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/json_conversion.rs index 9c2525ee4b3..e68e5b7367f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityCreditWithdrawalTransitionV1 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/mod.rs index ef18ac89a37..bda18333dd0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/mod.rs @@ -10,14 +10,13 @@ mod version; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::{ identity::{core_script::CoreScript, KeyID}, - prelude::Identifier, withdrawal::Pooling, ProtocolError, }; @@ -29,6 +28,7 @@ use crate::{ serde(rename_all = "camelCase") )] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityCreditWithdrawalTransitionV1 { pub identity_id: Identifier, pub amount: u64, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/state_transition_like.rs index 14462d0c28c..1833e5dbae2 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/state_transition_like.rs @@ -1,18 +1,14 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; - -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityCreditWithdrawal; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityCreditWithdrawalTransitionV1) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/types.rs index 3273e62c92a..d32023aa504 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::identity_credit_withdrawal_transition::fields::*; -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityCreditWithdrawalTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/v0_methods.rs index 8f20f27494a..9359169e2dd 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/v0_methods.rs @@ -1,12 +1,15 @@ #[cfg(feature = "state-transition-signing")] use crate::{ identity::{ - accessors::IdentityGettersV0, core_script::CoreScript, signer::Signer, Identity, - IdentityPublicKey, KeyType, Purpose, SecurityLevel, + accessors::IdentityGettersV0, + core_script::CoreScript, + identity_public_key::{IdentityPublicKey, KeyType, Purpose, SecurityLevel}, + signer::Signer, + Identity, }, prelude::{IdentityNonce, UserFeeIncrease}, state_transition::{ - identity_credit_withdrawal_transition::methods::PreferredKeyPurposeForSigningWithdrawal, + state_transitions::identity::identity_credit_withdrawal_transition::methods::PreferredKeyPurposeForSigningWithdrawal, GetDataContractSecurityLevelRequirementFn, StateTransition, }, withdrawal::Pooling, @@ -14,10 +17,12 @@ use crate::{ }; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; -use crate::state_transition::identity_credit_withdrawal_transition::methods::IdentityCreditWithdrawalTransitionMethodsV0; -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::methods::IdentityCreditWithdrawalTransitionMethodsV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTransitionV1 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/value_conversion.rs index e276d30319d..a1b70c4fc1e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/value_conversion.rs @@ -4,10 +4,10 @@ use platform_value::{IntegerReplacementType, ReplacementType, Value}; use crate::{state_transition::StateTransitionFieldTypes, ProtocolError}; -use crate::state_transition::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use platform_version::version::PlatformVersion; impl StateTransitionValueConvert<'_> for IdentityCreditWithdrawalTransitionV1 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/version.rs index cfff287e9d2..e068ada8a15 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v1/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreditWithdrawalTransitionV1 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/value_conversion.rs index c92b8d51b07..1f157318a42 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/value_conversion.rs @@ -4,14 +4,15 @@ use platform_value::Value; use crate::ProtocolError; -use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; -use crate::state_transition::state_transitions::identity_credit_withdrawal_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::fields::*; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl StateTransitionValueConvert<'_> for IdentityCreditWithdrawalTransition { fn to_object(&self, skip_signature: bool) -> Result { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/version.rs index d0f7ab16874..3f1fc5315f0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use crate::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityCreditWithdrawalTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/accessors/mod.rs index 41e8bfd9c53..a0a3ca68e48 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/accessors/mod.rs @@ -2,7 +2,7 @@ mod v0; pub use v0::*; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/json_conversion.rs index 1ac3c96fa8c..a6e93846fe4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; -use crate::state_transition::state_transitions::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for IdentityTopUpTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { IdentityTopUpTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/mod.rs index 243117c2945..520b3e16c77 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/mod.rs @@ -2,19 +2,21 @@ mod v0; pub use v0::*; +#[cfg(feature = "state-transition-signing")] +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; #[cfg(feature = "state-transition-signing")] use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{AssetLockProof, UserFeeIncrease}; +use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] -use crate::version::FeatureVersion; -#[cfg(feature = "state-transition-signing")] use crate::ProtocolError; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/v0/mod.rs index d314b9325a7..001ea51716d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/methods/v0/mod.rs @@ -1,14 +1,18 @@ #[cfg(feature = "state-transition-signing")] +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; +#[cfg(feature = "state-transition-signing")] use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{AssetLockProof, UserFeeIncrease}; +use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; pub trait IdentityTopUpTransitionMethodsV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/mod.rs index d336359e84c..135522519e0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/mod.rs @@ -12,8 +12,8 @@ mod version; use fields::*; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0Signable; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use crate::ProtocolError; @@ -46,6 +46,7 @@ use serde::{Deserialize, Serialize}; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.identity_top_up_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityTopUpTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityTopUpTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/proved.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/proved.rs index d664ee5ab91..c49dba19aa5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/proved.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/proved.rs @@ -1,6 +1,6 @@ +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::state_transition::{AssetLockProved, OptionallyAssetLockProved}; -use crate::prelude::AssetLockProof; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use crate::ProtocolError; impl OptionallyAssetLockProved for IdentityTopUpTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/state_transition_like.rs index a67c939243b..d9da7140dd5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for IdentityTopUpTransition { /// Returns ID of the topupd contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/json_conversion.rs index 69e4dbb2922..66cef48d4ed 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityTopUpTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/mod.rs index 8541ad0e7b8..7a0cc46c1e0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/mod.rs @@ -11,14 +11,14 @@ mod version; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; -use crate::prelude::{Identifier, UserFeeIncrease}; +use crate::prelude::UserFeeIncrease; use crate::ProtocolError; @@ -37,6 +37,7 @@ mod property_names { serde(rename_all = "camelCase") )] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTopUpTransitionV0 { // Own ST fields pub asset_lock_proof: AssetLockProof, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/proved.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/proved.rs index 9eb1d3dd21c..97de256a08f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/proved.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/proved.rs @@ -1,6 +1,6 @@ +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::state_transition::AssetLockProved; -use crate::prelude::AssetLockProof; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::ProtocolError; impl AssetLockProved for IdentityTopUpTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/state_transition_like.rs index 5d53273c2fc..d2d15e73243 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/state_transition_like.rs @@ -1,19 +1,16 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityTopUp; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityTopUpTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/types.rs index b0dafe61989..7afb39ab671 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::identity_topup_transition::fields::*; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityTopUpTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/v0_methods.rs index da2b8f680b3..31b9d224f20 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/v0_methods.rs @@ -1,28 +1,30 @@ #[cfg(feature = "state-transition-signing")] use crate::identity::accessors::IdentityGettersV0; #[cfg(feature = "state-transition-signing")] +use crate::identity::state_transition::asset_lock_proof::AssetLockProof; +#[cfg(feature = "state-transition-signing")] use crate::identity::Identity; -use crate::prelude::Identifier; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{AssetLockProof, UserFeeIncrease}; +use crate::prelude::UserFeeIncrease; #[cfg(feature = "state-transition-signing")] use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] use dashcore::signer; +use platform_value::Identifier; -use crate::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; -use crate::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; #[cfg(feature = "state-transition-signing")] use crate::serialization::Signable; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/value_conversion.rs index d6b51ddf416..6d580e92785 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/value_conversion.rs @@ -1,14 +1,14 @@ use std::collections::BTreeMap; use std::convert::TryFrom; -use platform_value::{IntegerReplacementType, ReplacementType, Value}; +use platform_value::{Identifier, IntegerReplacementType, ReplacementType, Value}; -use crate::{prelude::Identifier, state_transition::StateTransitionFieldTypes, ProtocolError}; +use crate::{errors::ProtocolError, state_transition::StateTransitionFieldTypes}; -use crate::prelude::AssetLockProof; +use crate::state_transition::AssetLockProof; -use crate::state_transition::identity_topup_transition::fields::*; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionValueConvert; use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_INCREASE; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/version.rs index 6fbc0fa1c89..2ece090e182 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityTopUpTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/value_conversion.rs index 8d7d55bfad9..41b2e0a5e26 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/value_conversion.rs @@ -2,16 +2,17 @@ use std::collections::BTreeMap; use platform_value::Value; -use crate::ProtocolError; +use crate::errors::ProtocolError; -use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; -use crate::state_transition::state_transitions::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::StateTransitionValueConvert; use crate::serialization::ValueConvertible; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ValueConvertible<'_> for IdentityTopUpTransition {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/version.rs index c268ce4343e..e4e1ea2861e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_topup_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; +use crate::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityTopUpTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/mod.rs index 858f0ee423c..1a1b5a329f6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/mod.rs @@ -1,9 +1,9 @@ mod v0; -use crate::identity::KeyID; +use crate::identity::identity_public_key::KeyID; use crate::prelude::{IdentityNonce, Revision}; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use platform_value::Identifier; pub use v0::*; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/v0/mod.rs index 30a8daf5150..2a5ec912e12 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/accessors/v0/mod.rs @@ -1,10 +1,7 @@ use crate::prelude::IdentityNonce; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::{ - identity::KeyID, - prelude::{Identifier, Revision}, -}; - +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::{identity::identity_public_key::KeyID, prelude::Revision}; +use platform_value::Identifier; pub trait IdentityUpdateTransitionAccessorsV0 { fn set_identity_id(&mut self, id: Identifier); fn identity_id(&self) -> Identifier; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/fields.rs index 115e5cc3260..913e3a630d7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/fields.rs @@ -1,6 +1,6 @@ use crate::state_transition::state_transitions; -use crate::state_transition::identity_update_transition::fields::property_names::{ +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::property_names::{ ADD_PUBLIC_KEYS_DATA, ADD_PUBLIC_KEYS_SIGNATURE, }; pub use state_transitions::common_fields::property_names::{ diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/identity_signed.rs index ce749273447..ec0fcadfeb5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/identity_signed.rs @@ -1,5 +1,5 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/json_conversion.rs index cce061e0073..660f7a76703 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/json_conversion.rs @@ -1,24 +1,24 @@ -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; -use crate::state_transition::state_transitions::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; use crate::ProtocolError; use serde_json::Number; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl StateTransitionJsonConvert<'_> for IdentityUpdateTransition { fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { match self { IdentityUpdateTransition::V0(transition) => { let mut value = transition.to_json(options)?; let map_value = value.as_object_mut().expect("expected an object"); map_value.insert( STATE_TRANSITION_PROTOCOL_VERSION.to_string(), - JsonValue::Number(Number::from(0)), + serde_json::Value::Number(Number::from(0)), ); Ok(value) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/mod.rs index dc530225de4..d3ef297b878 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/mod.rs @@ -4,18 +4,21 @@ pub use v0::*; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::{Identity, IdentityPublicKey, KeyID}; +use crate::identity::{ + identity_public_key::{IdentityPublicKey, KeyID}, + Identity, +}; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] -use crate::version::FeatureVersion; -#[cfg(feature = "state-transition-signing")] use crate::ProtocolError; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; #[cfg(feature = "state-transition-signing")] use crate::prelude::{IdentityNonce, UserFeeIncrease}; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/v0/mod.rs index 4399cf93b0f..51f787cbef4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/methods/v0/mod.rs @@ -1,18 +1,18 @@ #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::{Identity, IdentityPublicKey}; +use crate::identity::{identity_public_key::IdentityPublicKey, Identity}; #[cfg(feature = "state-transition-signing")] use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; #[cfg(feature = "state-transition-signing")] -use crate::version::FeatureVersion; -#[cfg(feature = "state-transition-signing")] -use crate::{identity::KeyID, ProtocolError}; +use crate::{identity::identity_public_key::KeyID, ProtocolError}; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; pub trait IdentityUpdateTransitionMethodsV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/mod.rs index c886979839f..70efe6fa0a4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/mod.rs @@ -11,9 +11,9 @@ mod v0_methods; mod value_conversion; mod version; -use crate::state_transition::identity_update_transition::fields::property_names::ADD_PUBLIC_KEYS_SIGNATURE; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0Signable; +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::property_names::ADD_PUBLIC_KEYS_SIGNATURE; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use fields::*; @@ -48,6 +48,7 @@ use serde::{Deserialize, Serialize}; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.identity_update_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityUpdateTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityUpdateTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/state_transition_like.rs index 69886a3c198..9d22939dacb 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for IdentityUpdateTransition { /// Returns ID of the updated contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/identity_signed.rs index 54d384be932..2066df1baf7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/identity_signed.rs @@ -1,6 +1,6 @@ -use crate::identity::SecurityLevel::MASTER; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::identity::identity_public_key::SecurityLevel::MASTER; +use crate::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for IdentityUpdateTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/json_conversion.rs index b88a90f2371..9a69da07bd8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityUpdateTransitionV0 {} @@ -6,10 +6,10 @@ impl StateTransitionJsonConvert<'_> for IdentityUpdateTransitionV0 {} #[cfg(test)] mod test { use crate::identity::accessors::IdentityGettersV0; - use crate::state_transition::identity_update_transition::fields::property_names::*; - use crate::state_transition::identity_update_transition::fields::*; - use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; - use crate::state_transition::identity_update_transition::IdentityUpdateTransition; + use crate::state_transition::state_transitions::identity::identity_update_transition::fields::property_names::*; + use crate::state_transition::state_transitions::identity::identity_update_transition::fields::*; + use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; + use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; @@ -17,7 +17,7 @@ mod test { use crate::tests::utils::generate_random_identifier_struct; use assert_matches::assert_matches; use platform_value::BinaryData; - use serde_json::Value as JsonValue; + // use serde_json::Value as JsonValue; #[test] fn conversion_to_json_object() { @@ -41,8 +41,11 @@ mod test { into_validating_json: false, }) .expect("conversion to json shouldn't fail"); - assert_matches!(result[IDENTITY_ID], JsonValue::String(_)); - assert_matches!(result[SIGNATURE], JsonValue::String(_)); - assert_matches!(result[ADD_PUBLIC_KEYS][0]["data"], JsonValue::String(_)); + assert_matches!(result[IDENTITY_ID], serde_json::Value::String(_)); + assert_matches!(result[SIGNATURE], serde_json::Value::String(_)); + assert_matches!( + result[ADD_PUBLIC_KEYS][0]["data"], + serde_json::Value::String(_) + ); } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/mod.rs index 55fb52ba7f5..316904b7503 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/mod.rs @@ -10,21 +10,17 @@ mod version; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use platform_value::{BinaryData, Value}; +use platform_value::{BinaryData, Identifier, Value}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; use std::convert::{TryFrom, TryInto}; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreationSignable; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreationSignable; use crate::prelude::{IdentityNonce, UserFeeIncrease}; -use crate::{ - identity::KeyID, - prelude::{Identifier, Revision}, - ProtocolError, -}; +use crate::{identity::identity_public_key::KeyID, prelude::Revision, ProtocolError}; #[derive(Encode, Decode, PlatformSignable, Debug, Clone, PartialEq)] #[cfg_attr( @@ -37,6 +33,7 @@ use crate::{ // Instead of inside of bincode_derive #[platform_signable(derive_bincode_with_borrowed_vec)] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityUpdateTransitionV0 { /// Unique identifier of the identity to be updated pub identity_id: Identifier, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/state_transition_like.rs index 00674b8b30f..b7f888e85a7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/state_transition_like.rs @@ -1,19 +1,16 @@ use base64::prelude::BASE64_STANDARD; use base64::Engine; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, -}; +use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType::IdentityUpdate; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: IdentityUpdateTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/types.rs index 0f4d8c616a8..8e91ae8b194 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/types.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_update_transition::fields::property_names::*; -use crate::state_transition::identity_update_transition::fields::*; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::property_names::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityUpdateTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/v0_methods.rs index 26af0304de5..7b2099d8009 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/v0_methods.rs @@ -2,18 +2,15 @@ use crate::serialization::Signable; #[cfg(feature = "state-transition-signing")] -use platform_version::version::PlatformVersion; - -#[cfg(feature = "state-transition-signing")] -use crate::consensus::signature::{ +use crate::errors::consensus::signature::{ InvalidSignaturePublicKeySecurityLevelError, MissingPublicKeyError, SignatureError, }; #[cfg(feature = "state-transition-signing")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::{Identity, IdentityPublicKey}; +use crate::identity::{identity_public_key::IdentityPublicKey, Identity}; #[cfg(feature = "state-transition-signing")] use crate::identity::accessors::IdentityGettersV0; @@ -22,22 +19,22 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGetter use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] use crate::prelude::UserFeeIncrease; -use crate::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use crate::state_transition::identity_update_transition::methods::IdentityUpdateTransitionMethodsV0; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::methods::IdentityUpdateTransitionMethodsV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; #[cfg(feature = "state-transition-signing")] use crate::state_transition::{GetDataContractSecurityLevelRequirementFn, StateTransition}; +use crate::{identity::identity_public_key::KeyID, prelude::Revision}; #[cfg(feature = "state-transition-signing")] -use crate::version::FeatureVersion; -use crate::{ - identity::KeyID, - prelude::{Identifier, Revision}, -}; +use crate::{identity::identity_public_key::SecurityLevel, ProtocolError}; +use platform_value::Identifier; +#[cfg(feature = "state-transition-signing")] +use platform_version::version::PlatformVersion; #[cfg(feature = "state-transition-signing")] -use crate::{identity::SecurityLevel, ProtocolError}; +use versioned_feature_core::FeatureVersion; impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { #[cfg(feature = "state-transition-signing")] fn try_from_identity_with_signer<'a, S: Signer>( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/value_conversion.rs index 34ad3fad146..c119e4694e8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/value_conversion.rs @@ -1,12 +1,12 @@ use platform_value::{IntegerReplacementType, ReplacementType, Value}; -use crate::{state_transition::StateTransitionFieldTypes, ProtocolError}; +use crate::{errors::ProtocolError, state_transition::StateTransitionFieldTypes}; -use crate::state_transition::identity_update_transition::fields::*; -use crate::state_transition::identity_update_transition::v0::{ +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::{ remove_integer_list_or_default, IdentityUpdateTransitionV0, }; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionValueConvert; use crate::state_transition::state_transitions::common_fields::property_names::{ diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/version.rs index 87c620cd39e..0655993449f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityUpdateTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/value_conversion.rs index 24faec046f3..96d9b285236 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/value_conversion.rs @@ -4,14 +4,15 @@ use platform_value::Value; use crate::ProtocolError; -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; -use crate::state_transition::state_transitions::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::fields::*; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::StateTransitionValueConvert; use crate::serialization::ValueConvertible; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ValueConvertible<'_> for IdentityUpdateTransition {} impl StateTransitionValueConvert<'_> for IdentityUpdateTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/version.rs index b3a8fc6588b..27c63d06dfa 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_update_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityUpdateTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/accessors/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/accessors/mod.rs index 47ee9dc57af..beae7a01c53 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/accessors/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/accessors/mod.rs @@ -1,7 +1,7 @@ mod v0; use crate::prelude::IdentityNonce; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::voting::votes::Vote; use platform_value::Identifier; pub use v0::*; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/fields.rs index 7c29ab10e2e..2e3e7b8f28c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/fields.rs @@ -1,6 +1,6 @@ use crate::state_transition::state_transitions; -use crate::state_transition::masternode_vote_transition::fields::property_names::PRO_TX_HASH; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::property_names::PRO_TX_HASH; pub use state_transitions::common_fields::property_names::{ SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, TRANSITION_TYPE, }; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/identity_signed.rs index 9a02b8ddf22..51fc51e6e63 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/identity_signed.rs @@ -1,5 +1,8 @@ -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + KeyID, +}; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for MasternodeVoteTransition { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/json_conversion.rs index a1c5a4af7e2..1211310aa51 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/json_conversion.rs @@ -1,5 +1,5 @@ -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; -use crate::state_transition::state_transitions::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::state_transition::{ JsonStateTransitionSerializationOptions, StateTransitionJsonConvert, }; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/mod.rs index e5aad46bd08..367d4eea435 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/mod.rs @@ -13,11 +13,13 @@ use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/v0/mod.rs index f6fde73f8e5..6b6f1521c2d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/methods/v0/mod.rs @@ -14,7 +14,9 @@ use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; #[cfg(feature = "state-transition-signing")] -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +#[cfg(feature = "state-transition-signing")] +use versioned_feature_core::FeatureVersion; pub trait MasternodeVoteTransitionMethodsV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/mod.rs index a1b75dae203..1ba260824c4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/mod.rs @@ -10,9 +10,9 @@ pub mod v0; mod value_conversion; mod version; -use crate::state_transition::masternode_vote_transition::fields::property_names::PRO_TX_HASH; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0Signable; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::property_names::PRO_TX_HASH; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0Signable; use crate::state_transition::StateTransitionFieldTypes; use crate::identity::state_transition::OptionallyAssetLockProved; @@ -49,6 +49,7 @@ pub type MasternodeVoteTransitionLatest = MasternodeVoteTransitionV0; #[platform_version_path_bounds( "dpp.state_transition_serialization_versions.masternode_vote_state_transition" )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum MasternodeVoteTransition { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(MasternodeVoteTransitionV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/state_transition_like.rs index b08fec4d3fe..69f82ca131b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/state_transition_like.rs @@ -1,8 +1,8 @@ use crate::prelude::UserFeeIncrease; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; -use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use versioned_feature_core::FeatureVersion; impl StateTransitionLike for MasternodeVoteTransition { /// Returns ID of the credit_transferred contract diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/identity_signed.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/identity_signed.rs index 7b5d7316769..cfabc9d0bcb 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/identity_signed.rs @@ -1,6 +1,9 @@ -use crate::identity::SecurityLevel::{CRITICAL, HIGH, MEDIUM}; -use crate::identity::{KeyID, Purpose, SecurityLevel}; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::identity::identity_public_key::{ + Purpose, SecurityLevel, + SecurityLevel::{CRITICAL, HIGH, MEDIUM}, +}; +use crate::identity::KeyID; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::state_transition::StateTransitionIdentitySigned; impl StateTransitionIdentitySigned for MasternodeVoteTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/json_conversion.rs index e0663be9a9d..1ead54efb27 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for MasternodeVoteTransitionV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/mod.rs index eac9dc34b5e..999873350de 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/mod.rs @@ -8,15 +8,13 @@ pub(super) mod v0_methods; mod value_conversion; mod version; +use crate::errors::ProtocolError; use crate::identity::KeyID; - -use crate::prelude::{Identifier, IdentityNonce}; - -use crate::protocol_error::ProtocolError; +use crate::prelude::IdentityNonce; use crate::voting::votes::Vote; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, PlatformSignable}; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; @@ -37,6 +35,7 @@ use serde::{Deserialize, Serialize}; )] #[platform_serialize(unversioned)] #[derive(Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct MasternodeVoteTransitionV0 { // Own ST fields pub pro_tx_hash: Identifier, @@ -54,7 +53,7 @@ mod test { use crate::serialization::{PlatformDeserializable, PlatformSerializable}; - use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; + use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; use crate::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; use crate::voting::vote_polls::VotePoll; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/state_transition_like.rs index 91a72646493..5af11bbfc96 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/state_transition_like.rs @@ -3,17 +3,13 @@ use base64::Engine; use platform_value::BinaryData; use crate::prelude::UserFeeIncrease; -use crate::{ - prelude::Identifier, - state_transition::{StateTransitionLike, StateTransitionType}, +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::{ + StateTransition, StateTransitionLike, StateTransitionType, StateTransitionType::MasternodeVote, }; - -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; - -use crate::state_transition::StateTransition; -use crate::state_transition::StateTransitionType::MasternodeVote; -use crate::version::FeatureVersion; +use platform_value::Identifier; +use versioned_feature_core::FeatureVersion; impl From for StateTransition { fn from(value: MasternodeVoteTransitionV0) -> Self { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/types.rs index da9ee6d3be1..1c2c59bb619 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::masternode_vote_transition::fields::*; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for MasternodeVoteTransitionV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/v0_methods.rs index 179f1c07486..b1e53524132 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/v0_methods.rs @@ -1,15 +1,15 @@ #[cfg(feature = "state-transition-signing")] use crate::identifier::MasternodeIdentifiers; #[cfg(feature = "state-transition-signing")] -use crate::identity::hash::IdentityPublicKeyHashMethodsV0; +use crate::identity::identity_public_key::hash::IdentityPublicKeyHashMethodsV0; #[cfg(feature = "state-transition-signing")] use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] -use crate::identity::{IdentityPublicKey, SecurityLevel}; +use crate::identity::{identity_public_key::SecurityLevel, IdentityPublicKey}; #[cfg(feature = "state-transition-signing")] use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-signing")] -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; #[cfg(feature = "state-transition-signing")] @@ -19,7 +19,7 @@ use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] use platform_value::Identifier; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; impl MasternodeVoteTransitionV0 { #[cfg(feature = "state-transition-signing")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/value_conversion.rs index cd73aba394f..f2cccdde5e7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/value_conversion.rs @@ -4,8 +4,8 @@ use platform_value::{IntegerReplacementType, ReplacementType, Value}; use crate::{state_transition::StateTransitionFieldTypes, ProtocolError}; -use crate::state_transition::masternode_vote_transition::fields::*; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::state_transition::StateTransitionValueConvert; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/version.rs index 35b2683ca28..7634bd69e8c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for MasternodeVoteTransitionV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/value_conversion.rs index db2ed0c9be1..145128ab57c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/value_conversion.rs @@ -4,14 +4,15 @@ use platform_value::Value; use crate::ProtocolError; -use crate::state_transition::masternode_vote_transition::v0::MasternodeVoteTransitionV0; -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; -use crate::state_transition::state_transitions::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::fields::*; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::v0::MasternodeVoteTransitionV0; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::state_transition::StateTransitionValueConvert; use crate::serialization::ValueConvertible; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; impl ValueConvertible<'_> for MasternodeVoteTransition {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/version.rs index 40a720b5a7b..aa690259e6b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/masternode_vote_transition/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use crate::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for MasternodeVoteTransition { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/accessors.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/accessors.rs index 9be50be2d67..a9f4a1eeb55 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/accessors.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/accessors.rs @@ -1,6 +1,7 @@ -use crate::identity::contract_bounds::ContractBounds; -use crate::identity::{KeyID, KeyType, Purpose, SecurityLevel}; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; +use crate::identity::identity_public_key::Purpose; +use crate::identity::identity_public_key::{KeyID, KeyType, SecurityLevel}; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use platform_value::BinaryData; /// Trait providing getters for `IdentityPublicKeyInCreationV0`. diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/json_conversion.rs index c98ecc86fad..6746ee7a413 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityPublicKeyInCreation {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/mod.rs index 0bbe2cc18f6..e9461f273de 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/mod.rs @@ -1,5 +1,5 @@ -use crate::identity::KeyID; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::KeyID; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/v0/mod.rs index 2c8d2fcaa48..50d74f29e41 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_key_ids_witness/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::identity::KeyID; -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::KeyID; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use std::collections::HashMap; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/mod.rs index c99ce26adf5..0f572d728dc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/mod.rs @@ -1,5 +1,5 @@ -use crate::identity::KeyID; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::KeyID; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/v0/mod.rs index 99ee267e7ad..4eb0d8107a1 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/duplicated_keys_witness/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::identity::KeyID; -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::KeyID; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use std::collections::HashMap; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/mod.rs index 216d0a1adae..6d8b369e5d9 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/mod.rs @@ -1,9 +1,9 @@ mod v0; +use crate::identity::identity_public_key::IdentityPublicKey; use crate::identity::signer::Signer; -use crate::identity::IdentityPublicKey; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/v0/mod.rs index ac64608bb2e..155b8b6c495 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_external/v0/mod.rs @@ -1,8 +1,8 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; +use crate::identity::identity_public_key::{IdentityPublicKey, KeyType}; use crate::identity::signer::Signer; -use crate::identity::{IdentityPublicKey, KeyType}; -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/mod.rs index 0bd14bfda60..b28522348a2 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/mod.rs @@ -1,9 +1,9 @@ mod v0; -use crate::identity::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::{BlsModule, ProtocolError}; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::{errors::ProtocolError, BlsModule}; use platform_version::version::PlatformVersion; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/v0/mod.rs index 9aa0eea8632..3e635f5509e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/from_public_key_signed_with_private_key/v0/mod.rs @@ -1,9 +1,9 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::identity::IdentityPublicKey; +use crate::identity::identity_public_key::IdentityPublicKey; use crate::serialization::PlatformMessageSignable; -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; -use crate::{BlsModule, ProtocolError}; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Setters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::{errors::ProtocolError, BlsModule}; impl IdentityPublicKeyInCreation { #[inline(always)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/mod.rs index 69e746b3661..621883e1706 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/mod.rs @@ -1,6 +1,6 @@ mod v0; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/v0/mod.rs index 2d4a33d3a75..9b9049891e6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/hash/v0/mod.rs @@ -1,6 +1,6 @@ use crate::identity::identity_public_key::methods::hash::IdentityPublicKeyHashMethodsV0; -use crate::identity::IdentityPublicKey; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::ProtocolError; impl IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/mod.rs index 459a3ecec29..9df4802966e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/mod.rs @@ -8,8 +8,8 @@ pub mod hash; mod v0; pub mod validate_identity_public_keys_structure; -use crate::identity::IdentityPublicKey; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; pub use v0::IdentityPublicKeyInCreationMethodsV0; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/v0/mod.rs index 816e6bc0a22..95f5e855c31 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/v0/mod.rs @@ -1,6 +1,6 @@ -use crate::identity::{IdentityPublicKey, SecurityLevel}; +use crate::identity::identity_public_key::{IdentityPublicKey, SecurityLevel}; -use crate::state_transition::public_key_in_creation::accessors::{ +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::{ IdentityPublicKeyInCreationV0Getters, IdentityPublicKeyInCreationV0Setters, }; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/mod.rs index e002fffb270..2bdf9b784c4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/mod.rs @@ -1,4 +1,4 @@ -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/v0/mod.rs index 6b02b2e6454..9379b6e6024 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/methods/validate_identity_public_keys_structure/v0/mod.rs @@ -1,19 +1,19 @@ -use crate::consensus::basic::identity::{ +use crate::errors::consensus::basic::identity::{ DuplicatedIdentityPublicKeyBasicError, DuplicatedIdentityPublicKeyIdBasicError, InvalidIdentityPublicKeySecurityLevelError, MissingMasterPublicKeyError, TooManyMasterPublicKeyError, }; -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; use lazy_static::lazy_static; use std::collections::HashMap; -use crate::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; +use crate::errors::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; -use crate::consensus::state::state_error::StateError; -use crate::identity::{Purpose, SecurityLevel}; +use crate::errors::consensus::state::state_error::StateError; +use crate::identity::identity_public_key::{Purpose, SecurityLevel}; -use crate::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::validation::SimpleConsensusValidationResult; use crate::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/mod.rs index 63bd4949c68..5051973ab0d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/mod.rs @@ -1,6 +1,6 @@ -use crate::identity::IdentityPublicKey; -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0Signable; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0Signable; use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::From; @@ -29,6 +29,7 @@ mod version; derive(Serialize, Deserialize), serde(tag = "$version") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityPublicKeyInCreation { #[cfg_attr(feature = "state-transition-serde-conversion", serde(rename = "0"))] V0(IdentityPublicKeyInCreationV0), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/types.rs index a033007d4f1..6a27ed99670 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::public_key_in_creation::fields::*; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::fields::*; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityPublicKeyInCreation { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/json_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/json_conversion.rs index 4f9e56bee02..601cff266fc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/json_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/json_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use crate::state_transition::StateTransitionJsonConvert; impl StateTransitionJsonConvert<'_> for IdentityPublicKeyInCreationV0 {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/mod.rs index 8170f2a7b2a..99ae73eba7d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/mod.rs @@ -5,7 +5,9 @@ mod types; mod value_conversion; mod version; -use crate::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{ + IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel, +}; use std::convert::TryFrom; @@ -16,17 +18,17 @@ use platform_value::{BinaryData, Value}; use crate::errors::ProtocolError; -use crate::identity::contract_bounds::ContractBounds; +use crate::identity::identity_public_key::contract_bounds::ContractBounds; use platform_serialization_derive::PlatformSignable; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::state_transition::public_key_in_creation::accessors::{ +use crate::state_transition::state_transitions::identity::public_key_in_creation::accessors::{ IdentityPublicKeyInCreationV0Getters, IdentityPublicKeyInCreationV0Setters, }; -use crate::state_transition::public_key_in_creation::methods::IdentityPublicKeyInCreationMethodsV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::methods::IdentityPublicKeyInCreationMethodsV0; pub const BINARY_DATA_FIELDS: [&str; 2] = ["data", "signature"]; @@ -34,6 +36,7 @@ pub const BINARY_DATA_FIELDS: [&str; 2] = ["data", "signature"]; Default, Debug, Serialize, Deserialize, Encode, Decode, PlatformSignable, Clone, PartialEq, Eq, )] #[serde(rename_all = "camelCase")] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityPublicKeyInCreationV0 { pub id: KeyID, #[serde(rename = "type")] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/types.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/types.rs index 8ff3d5e1a3f..a14d21747fc 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/types.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/types.rs @@ -1,5 +1,5 @@ -use crate::state_transition::public_key_in_creation::fields::*; -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::fields::*; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use crate::state_transition::StateTransitionFieldTypes; impl StateTransitionFieldTypes for IdentityPublicKeyInCreationV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/value_conversion.rs index 68cf0b4fc29..c73aeff88ef 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/value_conversion.rs @@ -1,4 +1,4 @@ -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use crate::state_transition::StateTransitionValueConvert; impl StateTransitionValueConvert<'_> for IdentityPublicKeyInCreationV0 { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/version.rs index 215cce1a0cd..37bba672877 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/v0/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityPublicKeyInCreationV0 { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/value_conversion.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/value_conversion.rs index aad1aae36cb..a90726a02d8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/value_conversion.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/value_conversion.rs @@ -1,12 +1,13 @@ use crate::serialization::ValueConvertible; -use crate::state_transition::batch_transition::fields::property_names::STATE_TRANSITION_PROTOCOL_VERSION; -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::document::batch_transition::fields::property_names::STATE_TRANSITION_PROTOCOL_VERSION; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionValueConvert; use crate::ProtocolError; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; use platform_value::Value; -use platform_version::version::{FeatureVersion, PlatformVersion}; +use platform_version::version::PlatformVersion; +use versioned_feature_core::FeatureVersion; use std::collections::BTreeMap; impl ValueConvertible<'_> for IdentityPublicKeyInCreation {} diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/version.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/version.rs index a55568c43a7..fdbeec319c5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/version.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/public_key_in_creation/version.rs @@ -1,6 +1,6 @@ -use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use crate::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::FeatureVersioned; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; impl FeatureVersioned for IdentityPublicKeyInCreation { fn feature_version(&self) -> FeatureVersion { diff --git a/packages/rs-dpp/src/state_transition/state_transitions/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/mod.rs index 7de5b5a368b..905109dfd25 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/mod.rs @@ -1,9 +1,9 @@ mod common_fields; -mod contract; -pub(crate) mod document; +pub mod contract; +pub mod document; pub mod identity; pub mod signable_bytes_hasher; -pub use contract::*; -pub use document::*; -pub use identity::*; +// pub use contract::*; +// pub use document::*; +// pub use identity::*; diff --git a/packages/rs-dpp/src/state_transition/traits/state_transition_identity_signed.rs b/packages/rs-dpp/src/state_transition/traits/state_transition_identity_signed.rs index a06d5bd69c7..5e725ee10d9 100644 --- a/packages/rs-dpp/src/state_transition/traits/state_transition_identity_signed.rs +++ b/packages/rs-dpp/src/state_transition/traits/state_transition_identity_signed.rs @@ -2,7 +2,7 @@ feature = "state-transition-signing", feature = "state-transition-validation" ))] -use crate::consensus::signature::{ +use crate::errors::consensus::signature::{ InvalidSignaturePublicKeySecurityLevelError, PublicKeyIsDisabledError, }; use anyhow::anyhow; @@ -23,16 +23,14 @@ use crate::state_transition::StateTransitionLike; ))] use crate::state_transition::StateTransitionSigningOptions; +use crate::errors::ProtocolError; #[cfg(any( feature = "state-transition-signing", feature = "state-transition-validation" ))] -use crate::identity::IdentityPublicKey; -use crate::identity::Purpose; -use crate::{ - identity::{KeyID, SecurityLevel}, - prelude::*, -}; +use crate::identity::identity_public_key::IdentityPublicKey; +use crate::identity::identity_public_key::Purpose; +use crate::identity::identity_public_key::{KeyID, SecurityLevel}; pub trait StateTransitionIdentitySigned: StateTransitionLike { fn signature_public_key_id(&self) -> KeyID; diff --git a/packages/rs-dpp/src/state_transition/traits/state_transition_json_convert.rs b/packages/rs-dpp/src/state_transition/traits/state_transition_json_convert.rs index 73e8dad39a3..d4b2a344943 100644 --- a/packages/rs-dpp/src/state_transition/traits/state_transition_json_convert.rs +++ b/packages/rs-dpp/src/state_transition/traits/state_transition_json_convert.rs @@ -1,7 +1,7 @@ use crate::state_transition::StateTransitionValueConvert; use crate::ProtocolError; use serde::Serialize; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use std::convert::TryInto; #[derive(Debug, Copy, Clone, Default)] @@ -18,7 +18,7 @@ pub trait StateTransitionJsonConvert<'a>: Serialize + StateTransitionValueConver fn to_json( &self, options: JsonStateTransitionSerializationOptions, - ) -> Result { + ) -> Result { if options.into_validating_json { self.to_object(options.skip_signature)? .try_into_validating_json() diff --git a/packages/rs-dpp/src/state_transition/traits/state_transition_like.rs b/packages/rs-dpp/src/state_transition/traits/state_transition_like.rs index e3084b6310d..61326aa8b48 100644 --- a/packages/rs-dpp/src/state_transition/traits/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/traits/state_transition_like.rs @@ -1,9 +1,9 @@ use std::fmt::Debug; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; -use crate::prelude::{Identifier, UserFeeIncrease}; -use crate::version::FeatureVersion; +use crate::prelude::UserFeeIncrease; +use versioned_feature_core::FeatureVersion; use crate::state_transition::StateTransitionType; use crate::state_transition::{StateTransition, StateTransitionFieldTypes}; diff --git a/packages/rs-dpp/src/state_transition/traits/state_transition_versioned.rs b/packages/rs-dpp/src/state_transition/traits/state_transition_versioned.rs index 75d046bd40e..d0b556c7b65 100644 --- a/packages/rs-dpp/src/state_transition/traits/state_transition_versioned.rs +++ b/packages/rs-dpp/src/state_transition/traits/state_transition_versioned.rs @@ -1,4 +1,4 @@ -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; pub trait FeatureVersioned { fn feature_version(&self) -> FeatureVersion; diff --git a/packages/rs-dpp/src/system_data_contracts.rs b/packages/rs-dpp/src/system_data_contracts.rs index 6d0c98453b4..39053ba3c8d 100644 --- a/packages/rs-dpp/src/system_data_contracts.rs +++ b/packages/rs-dpp/src/system_data_contracts.rs @@ -1,10 +1,10 @@ -use crate::data_contract::DataContractFactory; -use crate::prelude::*; -use crate::ProtocolError; +use crate::data_contract::{DataContract, DataContractFactory}; +use crate::errors::ProtocolError; use std::collections::{BTreeMap, BTreeSet}; use crate::data_contract::accessors::v0::DataContractV0Setters; pub use data_contracts::*; +use platform_value::Identifier; use platform_version::version::PlatformVersion; fn create_data_contract( diff --git a/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_fixture.rs index 5a0320c2089..b9a5fa49978 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_fixture.rs @@ -1,11 +1,9 @@ -use crate::{ - data_contract::DataContractFactory, prelude::Identifier, - tests::utils::generate_random_identifier_struct, -}; +use crate::{data_contract::DataContractFactory, tests::utils::generate_random_identifier_struct}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::prelude::IdentityNonce; use data_contracts::SystemDataContract; +use platform_value::Identifier; use platform_version::version::PlatformVersion; pub fn get_dashpay_contract_fixture( diff --git a/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_with_generalized_encryption_key_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_with_generalized_encryption_key_fixture.rs index f018d69a588..d73ba0df45d 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_with_generalized_encryption_key_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_dashpay_contract_with_generalized_encryption_key_fixture.rs @@ -1,13 +1,11 @@ -use crate::{ - data_contract::DataContractFactory, prelude::Identifier, - tests::utils::generate_random_identifier_struct, -}; +use crate::{data_contract::DataContractFactory, tests::utils::generate_random_identifier_struct}; use crate::data_contract::config::v0::DataContractConfigV0; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use crate::prelude::IdentityNonce; use data_contracts::SystemDataContract; +use platform_value::Identifier; use platform_version::version::PlatformVersion; pub fn get_dashpay_contract_with_generalized_encryption_key_fixture( diff --git a/packages/rs-dpp/src/tests/fixtures/get_dashpay_document_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_dashpay_document_fixture.rs index 7c8fe9a581e..5f5df02bb28 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_dashpay_document_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_dashpay_document_fixture.rs @@ -1,9 +1,9 @@ use platform_value::patch::merge; -use platform_value::{platform_value, BinaryData, Value}; +use platform_value::{platform_value, BinaryData, Identifier, Value}; use crate::document::document_factory::DocumentFactory; use crate::document::Document; -use crate::{prelude::Identifier, tests::utils::generate_random_identifier_struct}; +use crate::tests::utils::generate_random_identifier_struct; use super::get_dashpay_contract_fixture; diff --git a/packages/rs-dpp/src/tests/fixtures/get_data_contract.rs b/packages/rs-dpp/src/tests/fixtures/get_data_contract.rs index b53a0786755..5dc96ab1622 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_data_contract.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_data_contract.rs @@ -1,10 +1,8 @@ -use platform_value::platform_value; +use platform_value::{platform_value, Identifier}; use crate::data_contract::created_data_contract::CreatedDataContract; -use crate::prelude::*; -use crate::{ - data_contract::DataContractFactory, identifier, tests::utils::generate_random_identifier_struct, -}; +use crate::prelude::IdentityNonce; +use crate::{data_contract::DataContractFactory, tests::utils::generate_random_identifier_struct}; pub fn get_data_contract_fixture( owner_id: Option, @@ -204,7 +202,7 @@ pub fn get_data_contract_fixture( "identifierField": { "type": "array", "byteArray": true, - "contentMediaType": identifier::MEDIA_TYPE, + "contentMediaType": platform_value::IDENTIFIER_MEDIA_TYPE, "minItems": 32u32, "maxItems": 32u32, "position": 1 diff --git a/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs index 8942b86d7de..148a381fe4f 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs @@ -5,9 +5,9 @@ use platform_version::version::PlatformVersion; use std::collections::BTreeMap; use crate::document::Document; -use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use crate::state_transition::batch_transition::batched_transition::BatchedTransition; -use crate::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; +use crate::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; +use crate::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; use crate::tokens::token_payment_info::TokenPaymentInfo; pub fn get_batched_transitions_fixture<'a>( diff --git a/packages/rs-dpp/src/tests/fixtures/get_documents_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_documents_fixture.rs index 647203d72ea..05786f2b6b9 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_documents_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_documents_fixture.rs @@ -1,14 +1,18 @@ use rand::rngs::StdRng; use rand::SeedableRng; -use platform_value::{platform_value, Value}; +use platform_value::{platform_value, Identifier, Value}; use crate::data_contract::accessors::v0::DataContractV0Getters; use crate::data_contract::document_type::methods::DocumentTypeV0Methods; +use crate::data_contract::DataContract; use crate::document::document_factory::DocumentFactory; use crate::document::Document; -use crate::version::PlatformVersion; -use crate::{prelude::*, tests::utils::generate_random_identifier_struct as gen_owner_id}; +#[cfg(feature = "extended-document")] +use crate::document::ExtendedDocument; +use crate::errors::ProtocolError; +use crate::tests::utils::generate_random_identifier_struct as gen_owner_id; +use platform_version::version::PlatformVersion; #[cfg(feature = "extended-document")] pub fn get_extended_documents_fixture_with_owner_id_from_contract( diff --git a/packages/rs-dpp/src/tests/fixtures/get_dpns_data_contract.rs b/packages/rs-dpp/src/tests/fixtures/get_dpns_data_contract.rs index 56a36dd445d..46b9b2c21c8 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_dpns_data_contract.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_dpns_data_contract.rs @@ -1,4 +1,5 @@ use data_contracts::{DataContractSource, SystemDataContract}; +use platform_value::Identifier; use platform_version::version::PlatformVersion; use crate::data_contract::created_data_contract::CreatedDataContract; diff --git a/packages/rs-dpp/src/tests/fixtures/get_identity_update_transition_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_identity_update_transition_fixture.rs index 65f4df81f28..821d9fc1278 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_identity_update_transition_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_identity_update_transition_fixture.rs @@ -1,14 +1,14 @@ -use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; -use crate::state_transition::identity_update_transition::IdentityUpdateTransition; -use crate::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; +use crate::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use crate::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; -use crate::version::PlatformVersion; use crate::{ - identity::{KeyType, Purpose, SecurityLevel}, + identity::identity_public_key::{KeyType, Purpose, SecurityLevel}, tests::utils::generate_random_identifier_struct, }; use platform_value::string_encoding::Encoding; use platform_value::BinaryData; +use platform_version::version::PlatformVersion; pub fn get_identity_update_transition_fixture( platform_version: PlatformVersion, diff --git a/packages/rs-dpp/src/tests/fixtures/identity_create_transition_fixture.rs b/packages/rs-dpp/src/tests/fixtures/identity_create_transition_fixture.rs index e46fe4009c8..f1bd9beed8f 100644 --- a/packages/rs-dpp/src/tests/fixtures/identity_create_transition_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/identity_create_transition_fixture.rs @@ -2,11 +2,10 @@ use dashcore::PrivateKey; use platform_value::BinaryData; use platform_value::{platform_value, Value}; -use crate::identity::{KeyType, Purpose, SecurityLevel}; +use crate::identity::identity_public_key::{KeyType, Purpose, SecurityLevel}; use crate::tests::fixtures::raw_instant_asset_lock_proof_fixture; -use crate::version; use platform_value::string_encoding::{decode, Encoding}; - +use platform_version::version::LATEST_VERSION; //3bufpwQjL5qsvuP4fmCKgXJrKG852DDMYfi9J6XKqPAT //[198, 23, 40, 120, 58, 93, 0, 165, 27, 49, 4, 117, 107, 204, 67, 46, 164, 216, 230, 135, 201, 92, 31, 155, 62, 131, 211, 177, 139, 175, 163, 237] @@ -14,7 +13,7 @@ pub fn identity_create_transition_fixture(one_time_private_key: Option Value { platform_value!({ - "protocolVersion": version::LATEST_VERSION, + "protocolVersion": LATEST_VERSION, "type": StateTransitionType::IdentityCreditWithdrawal as u8, "identityId": Identifier::from([1_u8; 32]), "amount": 1042u64, @@ -25,9 +25,9 @@ pub fn identity_credit_withdrawal_transition_fixture_raw_object() -> Value { }) } -pub fn identity_credit_withdrawal_transition_fixture_json() -> JsonValue { +pub fn identity_credit_withdrawal_transition_fixture_json() -> serde_json::Value { json!({ - "protocolVersion": version::LATEST_VERSION, + "protocolVersion": LATEST_VERSION, "type": StateTransitionType::IdentityCreditWithdrawal, "identityId": encode(&[1_u8; 32], Encoding::Base58), "amount": 1042, diff --git a/packages/rs-dpp/src/tests/fixtures/identity_fixture.rs b/packages/rs-dpp/src/tests/fixtures/identity_fixture.rs index b8ff26652ab..84103a25240 100644 --- a/packages/rs-dpp/src/tests/fixtures/identity_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/identity_fixture.rs @@ -1,14 +1,16 @@ +use crate::errors::ProtocolError; use crate::identity::identity_public_key::v0::IdentityPublicKeyV0; -use crate::identity::{IdentityV0, KeyType, Purpose, SecurityLevel}; +use crate::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + v0::IdentityV0, + Identity, KeyType, +}; use platform_value::platform_value; use platform_value::string_encoding::Encoding; -use platform_value::BinaryData; +use platform_value::{BinaryData, Identifier}; use serde_json::json; -use crate::prelude::{Identifier, Identity}; - -use crate::version::PlatformVersion; -use crate::ProtocolError; +use platform_version::version::PlatformVersion; //3bufpwQjL5qsvuP4fmCKgXJrKG852DDMYfi9J6XKqPAT //[198, 23, 40, 120, 58, 93, 0, 165, 27, 49, 4, 117, 107, 204, 67, 46, 164, 216, 230, 135, 201, 92, 31, 155, 62, 131, 211, 177, 139, 175, 163, 237] diff --git a/packages/rs-dpp/src/tests/fixtures/identity_topup_transition_fixture.rs b/packages/rs-dpp/src/tests/fixtures/identity_topup_transition_fixture.rs index 6573cd74d0c..c55d319e6ee 100644 --- a/packages/rs-dpp/src/tests/fixtures/identity_topup_transition_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/identity_topup_transition_fixture.rs @@ -3,7 +3,6 @@ use dashcore::PrivateKey; use platform_value::{platform_value, BinaryData, Identifier, Value}; use crate::tests::fixtures::raw_instant_asset_lock_proof_fixture; -use crate::version; //3bufpwQjL5qsvuP4fmCKgXJrKG852DDMYfi9J6XKqPAT //[198, 23, 40, 120, 58, 93, 0, 165, 27, 49, 4, 117, 107, 204, 67, 46, 164, 216, 230, 135, 201, 92, 31, 155, 62, 131, 211, 177, 139, 175, 163, 237] @@ -11,7 +10,7 @@ use crate::version; pub fn identity_topup_transition_fixture(one_time_private_key: Option) -> Value { let asset_lock_proof = raw_instant_asset_lock_proof_fixture(one_time_private_key, None); platform_value!({ - "protocolVersion": version::LATEST_VERSION, + "protocolVersion": platform_version::version::LATEST_VERSION, "type": StateTransitionType::IdentityTopUp as u8, "assetLockProof": asset_lock_proof, "identityId": Identifier::new([198, 23, 40, 120, 58, 93, 0, 165, 27, 49, 4, 117, 107, 204, 67, 46, 164, 216, 230, 135, 201, 92, 31, 155, 62, 131, 211, 177, 139, 175, 163, 237]), diff --git a/packages/rs-dpp/src/tests/json_document.rs b/packages/rs-dpp/src/tests/json_document.rs index d0b80a33585..eccfda9a590 100644 --- a/packages/rs-dpp/src/tests/json_document.rs +++ b/packages/rs-dpp/src/tests/json_document.rs @@ -7,13 +7,14 @@ use crate::data_contract::created_data_contract::v0::CreatedDataContractV0; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::data_contract::document_type::DocumentTypeRef; +use crate::data_contract::DataContract; use crate::document::{Document, DocumentV0}; -use crate::prelude::{DataContract, IdentityNonce}; +use crate::prelude::IdentityNonce; #[cfg(feature = "data-contract-cbor-conversion")] use crate::util::cbor_serializer::serializable_value_to_cbor; -use crate::version::PlatformVersion; use crate::ProtocolError; use platform_value::{Identifier, ReplacementType}; +use platform_version::version::PlatformVersion; use std::fs::File; use std::io::BufReader; use std::path::Path; @@ -122,7 +123,7 @@ pub fn json_document_to_document( path: impl AsRef, owner_id: Option, document_type: DocumentTypeRef, - _platform_version: &PlatformVersion, + _platform_version: &platform_version::version::PlatformVersion, ) -> Result { let mut data = json_document_to_platform_value(path)?; diff --git a/packages/rs-dpp/src/tokens/emergency_action.rs b/packages/rs-dpp/src/tokens/emergency_action.rs index 8bac9c8ea68..9f25fb52475 100644 --- a/packages/rs-dpp/src/tokens/emergency_action.rs +++ b/packages/rs-dpp/src/tokens/emergency_action.rs @@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize}; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenEmergencyAction { #[default] Pause = 0, diff --git a/packages/rs-dpp/src/tokens/errors.rs b/packages/rs-dpp/src/tokens/errors.rs index 536534ddded..397b5edf0ca 100644 --- a/packages/rs-dpp/src/tokens/errors.rs +++ b/packages/rs-dpp/src/tokens/errors.rs @@ -1,6 +1,7 @@ use thiserror::Error; #[derive(Error, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenError { #[error("There is no token at this position")] TokenNotFoundAtPositionError, diff --git a/packages/rs-dpp/src/tokens/gas_fees_paid_by.rs b/packages/rs-dpp/src/tokens/gas_fees_paid_by.rs index 72d8e1fd565..78432e78737 100644 --- a/packages/rs-dpp/src/tokens/gas_fees_paid_by.rs +++ b/packages/rs-dpp/src/tokens/gas_fees_paid_by.rs @@ -1,7 +1,7 @@ -use crate::consensus::basic::data_contract::UnknownGasFeesPaidByError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::consensus::basic::data_contract::UnknownGasFeesPaidByError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; +use crate::errors::ProtocolError; use bincode_derive::{Decode, Encode}; use derive_more::Display; #[cfg(any( @@ -24,6 +24,7 @@ use serde::{Deserialize, Serialize}; ), derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum GasFeesPaidBy { /// The user pays the gas fees #[default] diff --git a/packages/rs-dpp/src/tokens/info/mod.rs b/packages/rs-dpp/src/tokens/info/mod.rs index 9c7a8de6b32..14cbe4cb95b 100644 --- a/packages/rs-dpp/src/tokens/info/mod.rs +++ b/packages/rs-dpp/src/tokens/info/mod.rs @@ -25,6 +25,7 @@ pub mod v0; )] #[platform_serialize(unversioned)] //versioned directly, no need to use platform_version #[cfg_attr(feature = "fixtures-and-mocks", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum IdentityTokenInfo { V0(IdentityTokenInfoV0), } diff --git a/packages/rs-dpp/src/tokens/info/v0/mod.rs b/packages/rs-dpp/src/tokens/info/v0/mod.rs index d4568d86be8..d7ac44cb080 100644 --- a/packages/rs-dpp/src/tokens/info/v0/mod.rs +++ b/packages/rs-dpp/src/tokens/info/v0/mod.rs @@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Encode, Decode, From, PartialEq)] #[cfg_attr(feature = "fixtures-and-mocks", derive(Serialize, Deserialize))] /// Token information for an identity (version 0). +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentityTokenInfoV0 { pub frozen: bool, } diff --git a/packages/rs-dpp/src/tokens/mod.rs b/packages/rs-dpp/src/tokens/mod.rs index b827b2c0dcf..41417d15917 100644 --- a/packages/rs-dpp/src/tokens/mod.rs +++ b/packages/rs-dpp/src/tokens/mod.rs @@ -17,7 +17,9 @@ pub mod token_payment_info; pub mod token_pricing_schedule; pub const MAX_TOKEN_NOTE_LEN: usize = 2048; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type SharedEncryptedNote = (SenderKeyIndex, RecipientKeyIndex, Vec); +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type PrivateEncryptedNote = ( RootEncryptionKeyIndex, DerivationEncryptionKeyIndex, diff --git a/packages/rs-dpp/src/tokens/status/mod.rs b/packages/rs-dpp/src/tokens/status/mod.rs index f39cc6be09f..5c3b4480494 100644 --- a/packages/rs-dpp/src/tokens/status/mod.rs +++ b/packages/rs-dpp/src/tokens/status/mod.rs @@ -22,6 +22,7 @@ pub mod v0; PartialEq, )] #[platform_serialize(unversioned)] //versioned directly, no need to use platform_version +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenStatus { V0(TokenStatusV0), } diff --git a/packages/rs-dpp/src/tokens/status/v0/mod.rs b/packages/rs-dpp/src/tokens/status/v0/mod.rs index a8dd3a0f83a..9200cec6d2b 100644 --- a/packages/rs-dpp/src/tokens/status/v0/mod.rs +++ b/packages/rs-dpp/src/tokens/status/v0/mod.rs @@ -3,6 +3,7 @@ use derive_more::From; #[derive(Debug, Clone, Encode, Decode, From, PartialEq)] /// Token status +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenStatusV0 { pub paused: bool, } diff --git a/packages/rs-dpp/src/tokens/token_amount_on_contract_token.rs b/packages/rs-dpp/src/tokens/token_amount_on_contract_token.rs index 4a8100f1207..8e7185e7f24 100644 --- a/packages/rs-dpp/src/tokens/token_amount_on_contract_token.rs +++ b/packages/rs-dpp/src/tokens/token_amount_on_contract_token.rs @@ -1,13 +1,14 @@ use crate::balances::credits::TokenAmount; -use crate::consensus::basic::data_contract::UnknownDocumentActionTokenEffectError; -use crate::consensus::basic::BasicError; -use crate::consensus::ConsensusError; +use crate::errors::consensus::basic::data_contract::UnknownDocumentActionTokenEffectError; +use crate::errors::consensus::basic::BasicError; +use crate::errors::consensus::ConsensusError; use crate::data_contract::TokenContractPosition; use crate::tokens::gas_fees_paid_by::GasFeesPaidBy; -use crate::ProtocolError; +use crate::errors::ProtocolError; use platform_value::Identifier; #[derive(Debug, PartialEq, Clone, Copy, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum DocumentActionTokenEffect { /// When the document action occurs the token is transferred to the balance of the contract owner #[default] @@ -61,6 +62,7 @@ impl TryFrom for DocumentActionTokenEffect { } #[derive(Debug, PartialEq, Clone, Copy, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct DocumentActionTokenCost { /// If this is not set, it means that we are using our own contract id pub contract_id: Option, diff --git a/packages/rs-dpp/src/tokens/token_event.rs b/packages/rs-dpp/src/tokens/token_event.rs index 92ed079b906..71f58cd0124 100644 --- a/packages/rs-dpp/src/tokens/token_event.rs +++ b/packages/rs-dpp/src/tokens/token_event.rs @@ -5,11 +5,10 @@ use crate::data_contract::associated_token::token_configuration_item::TokenConfi use crate::data_contract::associated_token::token_distribution_key::TokenDistributionTypeWithResolvedRecipient; use crate::data_contract::associated_token::token_perpetual_distribution::distribution_recipient::TokenDistributionResolvedRecipient; use crate::data_contract::document_type::DocumentTypeRef; +use crate::data_contract::DataContract; use crate::document::{Document, DocumentV0}; use crate::fee::Credits; -use crate::prelude::{ - DataContract, DerivationEncryptionKeyIndex, IdentityNonce, RootEncryptionKeyIndex, -}; +use crate::prelude::{DerivationEncryptionKeyIndex, IdentityNonce, RootEncryptionKeyIndex}; use bincode::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use platform_value::Identifier; diff --git a/packages/rs-dpp/src/tokens/token_payment_info/mod.rs b/packages/rs-dpp/src/tokens/token_payment_info/mod.rs index 64a763bb914..0db549906d3 100644 --- a/packages/rs-dpp/src/tokens/token_payment_info/mod.rs +++ b/packages/rs-dpp/src/tokens/token_payment_info/mod.rs @@ -47,6 +47,7 @@ pub mod v0; ), derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenPaymentInfo { #[display("V0({})", "_0")] V0(TokenPaymentInfoV0), diff --git a/packages/rs-dpp/src/tokens/token_payment_info/v0/mod.rs b/packages/rs-dpp/src/tokens/token_payment_info/v0/mod.rs index 8719cba8b26..01105d31c3b 100644 --- a/packages/rs-dpp/src/tokens/token_payment_info/v0/mod.rs +++ b/packages/rs-dpp/src/tokens/token_payment_info/v0/mod.rs @@ -4,7 +4,7 @@ use crate::balances::credits::TokenAmount; use crate::data_contract::TokenContractPosition; use crate::tokens::gas_fees_paid_by::GasFeesPaidBy; use crate::tokens::token_payment_info::v0::v0_accessors::TokenPaymentInfoAccessorsV0; -use crate::ProtocolError; +use crate::errors::ProtocolError; use bincode_derive::{Decode, Encode}; use derive_more::Display; use platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper; @@ -38,6 +38,7 @@ use std::collections::BTreeMap; maximum_token_cost, gas_fees_paid_by )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct TokenPaymentInfoV0 { /// By default, we use a token in the same contract, this field must be set if the document /// requires payment using another contracts token. diff --git a/packages/rs-dpp/src/tokens/token_pricing_schedule.rs b/packages/rs-dpp/src/tokens/token_pricing_schedule.rs index ea77b9d7e83..c6e1393222b 100644 --- a/packages/rs-dpp/src/tokens/token_pricing_schedule.rs +++ b/packages/rs-dpp/src/tokens/token_pricing_schedule.rs @@ -1,6 +1,5 @@ -use crate::balances::credits::TokenAmount; +use crate::balances::credits::{Credits, TokenAmount}; use crate::errors::ProtocolError; -use crate::fee::Credits; use bincode_derive::{Decode, Encode}; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; use serde::{Deserialize, Serialize}; @@ -28,6 +27,7 @@ use std::fmt::{self, Display, Formatter}; feature = "state-transition-serde-conversion", derive(Serialize, Deserialize) )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum TokenPricingSchedule { /// A single flat price in credits for all token amounts. /// diff --git a/packages/rs-dpp/src/util/cbor_value/canonical.rs b/packages/rs-dpp/src/util/cbor_value/canonical.rs index 05d3a61782f..39d88d7d4fa 100644 --- a/packages/rs-dpp/src/util/cbor_value/canonical.rs +++ b/packages/rs-dpp/src/util/cbor_value/canonical.rs @@ -8,7 +8,7 @@ use ciborium::value::Value as CborValue; use serde::Serialize; -use crate::ProtocolError; +use crate::errors::ProtocolError; use super::{ convert::convert_to, get_from_cbor_map, to_path_of_cbors, FieldType, ReplacePaths, diff --git a/packages/rs-dpp/src/util/cbor_value/map.rs b/packages/rs-dpp/src/util/cbor_value/map.rs index ad02b83c8f5..c73c7331ce7 100644 --- a/packages/rs-dpp/src/util/cbor_value/map.rs +++ b/packages/rs-dpp/src/util/cbor_value/map.rs @@ -4,8 +4,8 @@ use std::convert::TryFrom; use std::iter::FromIterator; use std::{collections::BTreeMap, convert::TryInto}; +use crate::errors::ProtocolError; use crate::util::cbor_value::value_to_hash; -use crate::ProtocolError; pub trait CborBTreeMapHelper { fn get_optional_identifier(&self, key: &str) -> Result, ProtocolError>; diff --git a/packages/rs-dpp/src/util/cbor_value/mod.rs b/packages/rs-dpp/src/util/cbor_value/mod.rs index db0d721da75..ff39a718541 100644 --- a/packages/rs-dpp/src/util/cbor_value/mod.rs +++ b/packages/rs-dpp/src/util/cbor_value/mod.rs @@ -2,9 +2,9 @@ use std::convert::TryInto; use anyhow::anyhow; use ciborium::value::Value as CborValue; -use serde_json::{Map, Value as JsonValue}; +use serde_json::Map; -use crate::ProtocolError; +use crate::errors::ProtocolError; mod convert; pub use convert::FieldType; @@ -127,18 +127,21 @@ impl CborMapExtension for &Vec<(CborValue, CborValue)> { // TODO: the issue with stack overflow should be address through re-implemtation of the algorithm pub fn cbor_value_to_json_value(cbor: &CborValue) -> Result { match cbor { - CborValue::Integer(num) => Ok(JsonValue::from(i128::from(*num) as i64)), - CborValue::Bytes(bytes) => Ok(JsonValue::Array( - bytes.iter().map(|byte| JsonValue::from(*byte)).collect(), + CborValue::Integer(num) => Ok(serde_json::Value::from(i128::from(*num) as i64)), + CborValue::Bytes(bytes) => Ok(serde_json::Value::Array( + bytes + .iter() + .map(|byte| serde_json::Value::from(*byte)) + .collect(), )), - CborValue::Float(float) => Ok(JsonValue::from(*float)), - CborValue::Text(text) => Ok(JsonValue::from(text.clone())), - CborValue::Bool(boolean) => Ok(JsonValue::from(*boolean)), - CborValue::Null => Ok(JsonValue::Null), - CborValue::Array(arr) => Ok(JsonValue::Array( + CborValue::Float(float) => Ok(serde_json::Value::from(*float)), + CborValue::Text(text) => Ok(serde_json::Value::from(text.clone())), + CborValue::Bool(boolean) => Ok(serde_json::Value::from(*boolean)), + CborValue::Null => Ok(serde_json::Value::Null), + CborValue::Array(arr) => Ok(serde_json::Value::Array( arr.iter() .map(cbor_value_to_json_value) - .collect::, anyhow::Error>>()?, + .collect::, anyhow::Error>>()?, )), CborValue::Map(map) => cbor_map_to_json_map(map), _ => Err(anyhow!("Can't convert CBOR to JSON: unknown type")), @@ -147,18 +150,18 @@ pub fn cbor_value_to_json_value(cbor: &CborValue) -> Result Result { match cbor { - CborValue::Integer(num) => Ok(JsonValue::from(i128::from(num) as i64)), - CborValue::Bytes(bytes) => Ok(JsonValue::Array( - bytes.into_iter().map(JsonValue::from).collect(), + CborValue::Integer(num) => Ok(serde_json::Value::from(i128::from(num) as i64)), + CborValue::Bytes(bytes) => Ok(serde_json::Value::Array( + bytes.into_iter().map(serde_json::Value::from).collect(), )), - CborValue::Float(float) => Ok(JsonValue::from(float)), - CborValue::Text(text) => Ok(JsonValue::from(text)), - CborValue::Bool(boolean) => Ok(JsonValue::from(boolean)), - CborValue::Null => Ok(JsonValue::Null), - CborValue::Array(arr) => Ok(JsonValue::Array( + CborValue::Float(float) => Ok(serde_json::Value::from(float)), + CborValue::Text(text) => Ok(serde_json::Value::from(text)), + CborValue::Bool(boolean) => Ok(serde_json::Value::from(boolean)), + CborValue::Null => Ok(serde_json::Value::Null), + CborValue::Array(arr) => Ok(serde_json::Value::Array( arr.into_iter() .map(cbor_value_into_json_value) - .collect::, anyhow::Error>>()?, + .collect::, anyhow::Error>>()?, )), CborValue::Map(map) => cbor_map_into_json_map(map), _ => Err(anyhow!("Can't convert CBOR to JSON: unknown type")), @@ -178,7 +181,7 @@ pub fn cbor_map_to_json_map( cbor_value_to_json_value(value)?, )) }) - .collect::, anyhow::Error>>()?; + .collect::, anyhow::Error>>()?; let mut json_map = Map::new(); @@ -201,7 +204,7 @@ pub fn cbor_map_into_json_map( cbor_value_into_json_value(value)?, )) }) - .collect::, anyhow::Error>>()?; + .collect::, anyhow::Error>>()?; let mut json_map = Map::new(); diff --git a/packages/rs-dpp/src/util/deserializer.rs b/packages/rs-dpp/src/util/deserializer.rs index 9be4ff6bba3..d71126cc517 100644 --- a/packages/rs-dpp/src/util/deserializer.rs +++ b/packages/rs-dpp/src/util/deserializer.rs @@ -1,15 +1,16 @@ #[cfg(feature = "cbor")] -use crate::consensus::basic::decode::ProtocolVersionParsingError; +use crate::errors::consensus::basic::decode::ProtocolVersionParsingError; #[cfg(feature = "cbor")] -use crate::consensus::basic::BasicError; +use crate::errors::consensus::basic::BasicError; #[cfg(feature = "cbor")] -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use integer_encoding::VarInt; -use platform_version::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; use crate::errors::ProtocolError; /// A protocol version +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type ProtocolVersion = u32; pub fn get_protocol_version(version_bytes: &[u8]) -> Result { diff --git a/packages/rs-dpp/src/util/json_schema.rs b/packages/rs-dpp/src/util/json_schema.rs index 721bbd4e614..862e982503e 100644 --- a/packages/rs-dpp/src/util/json_schema.rs +++ b/packages/rs-dpp/src/util/json_schema.rs @@ -1,9 +1,6 @@ +use crate::data_contract::errors::contract::DataContractError; use anyhow::{anyhow, bail}; use platform_value::Value; -use serde_json::Value as JsonValue; - -use crate::data_contract::errors::DataContractError; -use crate::identifier; pub trait JsonSchemaExt { /// returns true if json value contains property 'type`, and it equals 'object' @@ -15,7 +12,7 @@ pub trait JsonSchemaExt { /// returns true if json value contains property 'type`, and it equals 'string' fn is_type_of_string(&self) -> bool; /// returns the properties of Json Schema object - fn get_schema_properties(&self) -> Result<&JsonValue, anyhow::Error>; + fn get_schema_properties(&self) -> Result<&serde_json::Value, anyhow::Error>; /// returns the required fields of Json Schema object fn get_schema_required_fields(&self) -> Result, anyhow::Error>; /// returns the indexes from Json Schema @@ -38,14 +35,14 @@ pub fn resolve_uri<'a>(value: &'a Value, uri: &str) -> Result<&'a Value, DataCon value.get_value_at_path(&string_path).map_err(|e| e.into()) } -impl JsonSchemaExt for JsonValue { +impl JsonSchemaExt for serde_json::Value { fn get_schema_required_fields(&self) -> Result, anyhow::Error> { - if let JsonValue::Object(ref map) = self { + if let serde_json::Value::Object(ref map) = self { let required = map.get("required"); if required.is_none() { return Ok(vec![]); } - if let JsonValue::Array(required_list) = required.unwrap() { + if let serde_json::Value::Array(required_list) = required.unwrap() { return required_list .iter() .map(|v| v.as_str()) @@ -58,8 +55,8 @@ impl JsonSchemaExt for JsonValue { } fn is_type_of_string(&self) -> bool { - if let JsonValue::Object(ref map) = self { - if let Some(JsonValue::String(schema_type)) = map.get("type") { + if let serde_json::Value::Object(ref map) = self { + if let Some(serde_json::Value::String(schema_type)) = map.get("type") { return schema_type == "string"; } } @@ -67,8 +64,8 @@ impl JsonSchemaExt for JsonValue { } fn is_type_of_object(&self) -> bool { - if let JsonValue::Object(ref map) = self { - if let Some(JsonValue::String(schema_type)) = map.get("type") { + if let serde_json::Value::Object(ref map) = self { + if let Some(serde_json::Value::String(schema_type)) = map.get("type") { return schema_type == "object"; } } @@ -76,8 +73,8 @@ impl JsonSchemaExt for JsonValue { } fn is_type_of_array(&self) -> bool { - if let JsonValue::Object(ref map) = self { - if let Some(JsonValue::String(schema_type)) = map.get("type") { + if let serde_json::Value::Object(ref map) = self { + if let Some(serde_json::Value::String(schema_type)) = map.get("type") { return schema_type == "array"; } } @@ -85,16 +82,16 @@ impl JsonSchemaExt for JsonValue { } fn is_type_of_byte_array(&self) -> bool { - if let JsonValue::Object(ref map) = self { - if let Some(JsonValue::Bool(is_byte_array)) = map.get("byteArray") { + if let serde_json::Value::Object(ref map) = self { + if let Some(serde_json::Value::Bool(is_byte_array)) = map.get("byteArray") { return *is_byte_array; } } false } - fn get_schema_properties(&self) -> Result<&JsonValue, anyhow::Error> { - if let JsonValue::Object(ref map) = self { + fn get_schema_properties(&self) -> Result<&serde_json::Value, anyhow::Error> { + if let serde_json::Value::Object(ref map) = self { return map .get("properties") .ok_or_else(|| anyhow!("Couldn't find 'properties' in '{:?}'", map)); @@ -117,9 +114,9 @@ impl JsonSchemaExt for JsonValue { // } fn is_type_of_identifier(&self) -> bool { - if let JsonValue::Object(ref map) = self { - if let Some(JsonValue::String(media_type)) = map.get("contentMediaType") { - return media_type == identifier::MEDIA_TYPE; + if let serde_json::Value::Object(ref map) = self { + if let Some(serde_json::Value::String(media_type)) = map.get("contentMediaType") { + return media_type == platform_value::IDENTIFIER_MEDIA_TYPE; } } false diff --git a/packages/rs-dpp/src/util/json_value/mod.rs b/packages/rs-dpp/src/util/json_value/mod.rs index 35edc64a316..de137d53cbb 100644 --- a/packages/rs-dpp/src/util/json_value/mod.rs +++ b/packages/rs-dpp/src/util/json_value/mod.rs @@ -3,12 +3,9 @@ use std::convert::TryInto; use anyhow::{anyhow, bail}; use serde::de::DeserializeOwned; -use serde_json::{Number, Value as JsonValue}; +use serde_json::Number; -use crate::{ - errors::ProtocolError, - identifier::{self}, -}; +use crate::errors::ProtocolError; use super::json_path::{JsonPath, JsonPathLiteral, JsonPathStep}; @@ -24,14 +21,18 @@ const PROPERTY_PROTOCOL_VERSION: &str = "protocolVersion"; /// JsonValueExt contains a set of helper methods that simplify work with JsonValue pub trait JsonValueExt { /// assumes the Json Value is a map and tries to remove the given property - fn remove(&mut self, property_name: &str) -> Result; + fn remove(&mut self, property_name: &str) -> Result; /// assumes the Json Value is a map and tries to remove the given property and deserialize into the provided type fn remove_into(&mut self, property_name: &str) -> Result; /// assumes the Json Value is a map and tries to insert the given value under given property - fn insert(&mut self, property_name: String, value: JsonValue) -> Result<(), anyhow::Error>; + fn insert( + &mut self, + property_name: String, + value: serde_json::Value, + ) -> Result<(), anyhow::Error>; /// assumes the Json Value is an array and tries to add value to the array - fn push(&mut self, value: JsonValue) -> Result<(), anyhow::Error>; + fn push(&mut self, value: serde_json::Value) -> Result<(), anyhow::Error>; fn get_string(&self, property_name: &str) -> Result<&str, anyhow::Error>; fn get_i64(&self, property_name: &str) -> Result; fn get_f64(&self, property_name: &str) -> Result; @@ -40,16 +41,18 @@ pub trait JsonValueExt { fn get_u64(&self, property_name: &str) -> Result; fn get_bytes(&self, property_name: &str) -> Result, anyhow::Error>; /// returns the the mutable JsonValue from provided path. The path is dot-separated string. i.e `properties.id` - fn get_value_mut(&mut self, string_path: &str) -> Result<&mut JsonValue, anyhow::Error>; + fn get_value_mut(&mut self, string_path: &str) + -> Result<&mut serde_json::Value, anyhow::Error>; /// returns the the JsonValue from provided path. The path is dot-separated string. i.e `properties[0].id` - fn get_value(&self, string_path: &str) -> Result<&JsonValue, anyhow::Error>; + fn get_value(&self, string_path: &str) -> Result<&serde_json::Value, anyhow::Error>; /// return the JsonValue from from provided path. The path is a slice of [`JsonPathStep`] - fn get_value_by_path(&self, path: &[JsonPathStep]) -> Result<&JsonValue, anyhow::Error>; + fn get_value_by_path(&self, path: &[JsonPathStep]) + -> Result<&serde_json::Value, anyhow::Error>; /// return the mutable JsonValue from from provided path. The path is a slice of [`JsonPathStep`] fn get_value_by_path_mut( &mut self, path: &[JsonPathStep], - ) -> Result<&mut JsonValue, anyhow::Error>; + ) -> Result<&mut serde_json::Value, anyhow::Error>; /// assumes that the JsonValue is a Map and tries to remove the u32 fn remove_u32(&mut self, property_name: &str) -> Result; @@ -62,7 +65,11 @@ pub trait JsonValueExt { /// Insert value under the path. Path is dot-separated string. i.e `properties[0].id`. If parents don't /// exists they will be created - fn insert_with_path(&mut self, path: &str, value: JsonValue) -> Result<(), anyhow::Error>; + fn insert_with_path( + &mut self, + path: &str, + value: serde_json::Value, + ) -> Result<(), anyhow::Error>; /// Removes data from given path and tries deserialize it into provided type fn remove_value_at_path_into( @@ -72,8 +79,8 @@ pub trait JsonValueExt { fn get_bool(&self, property_name: &str) -> Result; } -impl JsonValueExt for JsonValue { - fn push(&mut self, value: JsonValue) -> Result<(), anyhow::Error> { +impl JsonValueExt for serde_json::Value { + fn push(&mut self, value: serde_json::Value) -> Result<(), anyhow::Error> { match self.as_array_mut() { Some(map) => { map.push(value); @@ -83,7 +90,11 @@ impl JsonValueExt for JsonValue { } } - fn insert(&mut self, property_name: String, value: JsonValue) -> Result<(), anyhow::Error> { + fn insert( + &mut self, + property_name: String, + value: serde_json::Value, + ) -> Result<(), anyhow::Error> { match self.as_object_mut() { Some(map) => { map.insert(property_name, value); @@ -118,7 +129,7 @@ impl JsonValueExt for JsonValue { } } - fn remove(&mut self, property_name: &str) -> Result { + fn remove(&mut self, property_name: &str) -> Result { match self.as_object_mut() { Some(map) => map.remove(property_name).ok_or_else(|| { anyhow!( @@ -140,7 +151,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::String(s) = property_value { + if let serde_json::Value::String(s) = property_value { return Ok(s); } bail!( @@ -159,7 +170,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Number(s) = property_value { + if let serde_json::Value::Number(s) = property_value { return s .as_u64() .ok_or_else(|| anyhow!("unable convert {} to u64", s))? @@ -182,7 +193,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Number(s) = property_value { + if let serde_json::Value::Number(s) = property_value { return s .as_u64() .ok_or_else(|| anyhow!("unable convert {} to u64", s))? @@ -205,7 +216,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Number(s) = property_value { + if let serde_json::Value::Number(s) = property_value { return s .as_u64() .ok_or_else(|| anyhow!("unable convert {} to u64", s)); @@ -226,7 +237,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Number(s) = property_value { + if let serde_json::Value::Number(s) = property_value { return s .as_i64() .ok_or_else(|| anyhow!("unable convert {} to i64", s)); @@ -247,7 +258,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Number(s) = property_value { + if let serde_json::Value::Number(s) = property_value { return s .as_f64() .ok_or_else(|| anyhow!("unable convert {} to f64", s)); @@ -274,7 +285,10 @@ impl JsonValueExt for JsonValue { } /// returns the value from the JsonValue based on the path: i.e "root.data[0].id" - fn get_value_mut(&mut self, string_path: &str) -> Result<&mut JsonValue, anyhow::Error> { + fn get_value_mut( + &mut self, + string_path: &str, + ) -> Result<&mut serde_json::Value, anyhow::Error> { let path_literal: JsonPathLiteral = string_path.into(); let path: JsonPath = path_literal.try_into().unwrap(); get_value_from_json_path_mut(&path, self) @@ -282,7 +296,7 @@ impl JsonValueExt for JsonValue { } /// returns the value from the JsonValue based on the path: i.e "root.data[0].id" - fn get_value(&self, string_path: &str) -> Result<&JsonValue, anyhow::Error> { + fn get_value(&self, string_path: &str) -> Result<&serde_json::Value, anyhow::Error> { let path_literal: JsonPathLiteral = string_path.into(); let path: JsonPath = path_literal.try_into().unwrap(); get_value_from_json_path(&path, self) @@ -290,7 +304,10 @@ impl JsonValueExt for JsonValue { } /// returns the value from the JsonValue based on the path: i.e "root.data[0].id" - fn get_value_by_path(&self, path: &[JsonPathStep]) -> Result<&JsonValue, anyhow::Error> { + fn get_value_by_path( + &self, + path: &[JsonPathStep], + ) -> Result<&serde_json::Value, anyhow::Error> { get_value_from_json_path(path, self) .ok_or_else(|| anyhow!("the property '{:?}' not found", path)) } @@ -298,7 +315,7 @@ impl JsonValueExt for JsonValue { fn get_value_by_path_mut( &mut self, path: &[JsonPathStep], - ) -> Result<&mut JsonValue, anyhow::Error> { + ) -> Result<&mut serde_json::Value, anyhow::Error> { get_value_from_json_path_mut(path, self) .ok_or_else(|| anyhow!("the property '{:?}' not found", path)) } @@ -309,10 +326,10 @@ impl JsonValueExt for JsonValue { protocol_version: u32, ) -> Result<(), ProtocolError> { match self { - JsonValue::Object(ref mut m) => { + serde_json::Value::Object(ref mut m) => { m.insert( String::from(property_name), - JsonValue::Number(Number::from(protocol_version)), + serde_json::Value::Number(Number::from(protocol_version)), ); } _ => return Err(anyhow!("The '{:?}' isn't a map", self).into()), @@ -323,8 +340,8 @@ impl JsonValueExt for JsonValue { fn remove_u32(&mut self, property_name: &str) -> Result { match self { - JsonValue::Object(ref mut m) => match m.remove(property_name) { - Some(JsonValue::Number(number)) => Ok(number.as_u64().ok_or_else(|| { + serde_json::Value::Object(ref mut m) => match m.remove(property_name) { + Some(serde_json::Value::Number(number)) => Ok(number.as_u64().ok_or_else(|| { anyhow!("unable to convert '{}' into unsigned integer", number) })? as u32), _ => { @@ -339,7 +356,7 @@ impl JsonValueExt for JsonValue { fn insert_with_path( &mut self, string_path: &str, - value: JsonValue, + value: serde_json::Value, ) -> Result<(), anyhow::Error> { let path_literal: JsonPathLiteral = string_path.into(); let path: JsonPath = path_literal.try_into().unwrap(); @@ -369,7 +386,7 @@ impl JsonValueExt for JsonValue { ) })?; - if let JsonValue::Bool(s) = property_value { + if let serde_json::Value::Bool(s) = property_value { return Ok(*s); } bail!( @@ -380,17 +397,21 @@ impl JsonValueExt for JsonValue { } } -fn identifier_filter(value: &JsonValue) -> bool { - if let JsonValue::Object(object) = value { - if let Some(JsonValue::String(media_type)) = object.get(PROPERTY_CONTENT_MEDIA_TYPE) { - return media_type == identifier::MEDIA_TYPE; +fn identifier_filter(value: &serde_json::Value) -> bool { + if let serde_json::Value::Object(object) = value { + if let Some(serde_json::Value::String(media_type)) = object.get(PROPERTY_CONTENT_MEDIA_TYPE) + { + return media_type == platform_value::IDENTIFIER_MEDIA_TYPE; } } false } /// returns the value from the JsonValue based on the path: i.e "root.data[0].id" -pub fn get_value_mut<'a>(string_path: &str, value: &'a mut JsonValue) -> Option<&'a mut JsonValue> { +pub fn get_value_mut<'a>( + string_path: &str, + value: &'a mut serde_json::Value, +) -> Option<&'a mut serde_json::Value> { let path_literal: JsonPathLiteral = string_path.into(); let path: JsonPath = path_literal.try_into().unwrap(); get_value_from_json_path_mut(&path, value) @@ -399,9 +420,9 @@ pub fn get_value_mut<'a>(string_path: &str, value: &'a mut JsonValue) -> Option< /// returns the value from the JsonValue based on the JsonPath pub fn get_value_from_json_path_mut<'a>( path: &[JsonPathStep], - value: &'a mut JsonValue, -) -> Option<&'a mut JsonValue> { - let mut last_ptr: &mut JsonValue = value; + value: &'a mut serde_json::Value, +) -> Option<&'a mut serde_json::Value> { + let mut last_ptr: &mut serde_json::Value = value; for step in path { match step { @@ -420,9 +441,9 @@ pub fn get_value_from_json_path_mut<'a>( /// returns the value from the JsonValue based on the JsonPath pub fn get_value_from_json_path<'a>( path: &[JsonPathStep], - value: &'a JsonValue, -) -> Option<&'a JsonValue> { - let mut last_ptr: &JsonValue = value; + value: &'a serde_json::Value, +) -> Option<&'a serde_json::Value> { + let mut last_ptr: &serde_json::Value = value; for step in path { match step { diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/mod.rs index fdeb79f2c9e..b19bf28fda6 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/mod.rs @@ -1,4 +1,4 @@ -use crate::data_contract::JsonValue; +//use crate::data_contract::JsonValue; use crate::validation::{JsonSchemaValidator, SimpleConsensusValidationResult}; use crate::ProtocolError; use platform_version::version::PlatformVersion; @@ -8,7 +8,7 @@ mod v0; impl JsonSchemaValidator { pub fn compile( &self, - json_schema: &JsonValue, + json_schema: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result { match platform_version @@ -28,8 +28,8 @@ impl JsonSchemaValidator { pub fn compile_and_validate( &self, - json_schema: &JsonValue, - json_value: &JsonValue, + json_schema: &serde_json::Value, + json_value: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result { match platform_version diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/v0/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/v0/mod.rs index 897afdd144b..c9f3e3d6160 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/v0/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/compile/v0/mod.rs @@ -1,13 +1,12 @@ -use crate::consensus::ConsensusError; -use crate::data_contract::JsonValue; +use crate::errors::consensus::ConsensusError; use crate::validation::byte_array_keyword::ByteArrayKeyword; use crate::validation::{JsonSchemaValidator, SimpleConsensusValidationResult}; use crate::ProtocolError; use jsonschema::{JSONSchema, RegexEngine, RegexOptions}; - +use serde_json::Value; impl JsonSchemaValidator { #[inline(always)] - pub(super) fn compile_v0(&self, json_schema: &JsonValue) -> Result { + pub(super) fn compile_v0(&self, json_schema: &Value) -> Result { if self.is_compiled_v0() { return Ok(false); } @@ -42,8 +41,8 @@ impl JsonSchemaValidator { #[inline(always)] pub(super) fn compile_and_validate_v0( &self, - json_schema: &JsonValue, - json_value: &JsonValue, + json_schema: &serde_json::Value, + json_value: &serde_json::Value, ) -> Result { let mut validator_guard = self.validator.write().unwrap(); diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/new/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/new/mod.rs index 144a6bfbd27..59f0ad64948 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/new/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/new/mod.rs @@ -1,8 +1,9 @@ mod v0; -use crate::data_contract::JsonValue; +// use crate::data_contract::JsonValue; use crate::validation::JsonSchemaValidator; use crate::ProtocolError; +use jsonschema::JSONSchema; use platform_version::version::PlatformVersion; use std::sync::RwLock; @@ -18,9 +19,12 @@ impl JsonSchemaValidator { validator: RwLock::new(None), } } + pub fn new_private(validator: RwLock>) -> Self { + Self { validator } + } pub fn new_compiled( - json_schema: &JsonValue, + json_schema: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result { match platform_version.dpp.validation.json_schema_validator.new { diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/new/v0/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/new/v0/mod.rs index 644351baeb3..de935ca0e01 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/new/v0/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/new/v0/mod.rs @@ -1,4 +1,4 @@ -use crate::data_contract::JsonValue; +// use crate::data_contract::JsonValue; use crate::validation::JsonSchemaValidator; use crate::ProtocolError; use platform_version::version::PlatformVersion; @@ -6,7 +6,7 @@ use platform_version::version::PlatformVersion; impl JsonSchemaValidator { #[inline(always)] pub(super) fn new_compiled_v0( - json_schema: &JsonValue, + json_schema: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result { let validator = Self::new(); diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/mod.rs index 6795554e08a..14f6273d5ca 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/mod.rs @@ -1,14 +1,14 @@ use crate::validation::{JsonSchemaValidator, SimpleConsensusValidationResult}; -use crate::version::PlatformVersion; use crate::ProtocolError; -use serde_json::Value as JsonValue; +use platform_version::version::PlatformVersion; +// use serde_json::Value as JsonValue; mod v0; impl JsonSchemaValidator { pub fn validate( &self, - instance: &JsonValue, + instance: &serde_json::Value, platform_version: &PlatformVersion, ) -> Result { match platform_version diff --git a/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/v0/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/v0/mod.rs index a8650e98d88..63fad54122f 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/v0/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/methods/validate/v0/mod.rs @@ -1,14 +1,14 @@ -use crate::consensus::ConsensusError; +use crate::errors::consensus::ConsensusError; use crate::validation::{JsonSchemaValidator, SimpleConsensusValidationResult}; use crate::ProtocolError; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; impl JsonSchemaValidator { #[inline(always)] pub(super) fn validate_v0( &self, - instance: &JsonValue, + instance: &serde_json::Value, ) -> Result { let validator_guard = self.validator.read().unwrap(); diff --git a/packages/rs-dpp/src/validation/json_schema_validator/mod.rs b/packages/rs-dpp/src/validation/json_schema_validator/mod.rs index 9e038bbacde..78a0e923791 100644 --- a/packages/rs-dpp/src/validation/json_schema_validator/mod.rs +++ b/packages/rs-dpp/src/validation/json_schema_validator/mod.rs @@ -1,6 +1,5 @@ pub mod methods; -use crate::data_contract::JsonValue; use crate::validation::{DataValidator, SimpleConsensusValidationResult}; use anyhow::Context; use jsonschema::JSONSchema; @@ -14,7 +13,7 @@ pub struct JsonSchemaValidator { // TODO: Remove? impl DataValidator for JsonSchemaValidator { - type Item = JsonValue; + type Item = serde_json::Value; fn validate( &self, data: &Self::Item, @@ -26,3 +25,26 @@ impl DataValidator for JsonSchemaValidator { Ok(result) } } +#[allow(non_camel_case_types)] +#[repr(C)] +#[cfg_attr( + feature = "ferment", + ferment_macro::register(dpp::validation::json_schema_validator::JsonSchemaValidator) +)] +pub struct dpp_validation_JsonSchemaValidator { + validator: RwLock>, +} +#[cfg(feature = "ferment")] +impl ferment::FFIConversionFrom for dpp_validation_JsonSchemaValidator { + unsafe fn ffi_from_const(_ffi: *const Self) -> JsonSchemaValidator { + JsonSchemaValidator::new() + } +} +#[cfg(feature = "ferment")] +impl ferment::FFIConversionTo for dpp_validation_JsonSchemaValidator { + unsafe fn ffi_to_const(obj: JsonSchemaValidator) -> *const Self { + ferment::boxed(dpp_validation_JsonSchemaValidator { + validator: obj.validator, + }) + } +} diff --git a/packages/rs-dpp/src/validation/mod.rs b/packages/rs-dpp/src/validation/mod.rs index 5637dc28ba1..e0a07b7beec 100644 --- a/packages/rs-dpp/src/validation/mod.rs +++ b/packages/rs-dpp/src/validation/mod.rs @@ -1,5 +1,5 @@ #[cfg(feature = "validation")] -pub(crate) use json_schema_validator::JsonSchemaValidator; +pub use json_schema_validator::JsonSchemaValidator; pub use validation_result::{ ConsensusValidationResult, SimpleConsensusValidationResult, SimpleValidationResult, @@ -7,9 +7,9 @@ pub use validation_result::{ }; #[cfg(feature = "validation")] -use crate::version::PlatformVersion; +use crate::errors::ProtocolError; #[cfg(feature = "validation")] -use crate::ProtocolError; +use platform_version::version::PlatformVersion; #[cfg(feature = "validation")] pub(crate) mod byte_array_keyword; #[cfg(feature = "validation")] diff --git a/packages/rs-dpp/src/validation/operations.rs b/packages/rs-dpp/src/validation/operations.rs index abcf1140255..68fc41205d4 100644 --- a/packages/rs-dpp/src/validation/operations.rs +++ b/packages/rs-dpp/src/validation/operations.rs @@ -1,4 +1,4 @@ -use crate::fee::Credits; +use crate::balances::credits::Credits; use platform_version::version::PlatformVersion; #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/packages/rs-dpp/src/validation/validation_result.rs b/packages/rs-dpp/src/validation/validation_result.rs index a711e5c62f5..7978911c03f 100644 --- a/packages/rs-dpp/src/validation/validation_result.rs +++ b/packages/rs-dpp/src/validation/validation_result.rs @@ -1,5 +1,5 @@ use crate::errors::consensus::ConsensusError; -use crate::ProtocolError; +use crate::errors::ProtocolError; use std::fmt::Debug; #[macro_export] diff --git a/packages/rs-dpp/src/version/mod.rs b/packages/rs-dpp/src/version/mod.rs index 71347643217..9b3d2d4d371 100644 --- a/packages/rs-dpp/src/version/mod.rs +++ b/packages/rs-dpp/src/version/mod.rs @@ -1,9 +1,17 @@ -use crate::ProtocolError; +use crate::errors::ProtocolError; use lazy_static::lazy_static; pub use platform_version::error::PlatformVersionError; -pub use platform_version::version::*; -pub use platform_version::*; +pub use platform_version::version::protocol_version::{ + FeatureVersionBounds, PlatformVersion, LATEST_PLATFORM_VERSION, +}; +pub use platform_version::version::{ + dpp_versions, drive_abci_versions, drive_versions, fee, patches, system_data_contract_versions, + system_limits, +}; +pub use platform_version::DefaultForPlatformVersion; +pub use platform_version::TryFromPlatformVersioned; use std::sync::RwLock; +pub use versioned_feature_core::FeatureVersion; lazy_static! { static ref CURRENT_PLATFORM_VERSION: RwLock> = diff --git a/packages/rs-dpp/src/voting/contender_structs/mod.rs b/packages/rs-dpp/src/voting/contender_structs/mod.rs index a71c77f19ab..a83392bb28b 100644 --- a/packages/rs-dpp/src/voting/contender_structs/mod.rs +++ b/packages/rs-dpp/src/voting/contender_structs/mod.rs @@ -34,6 +34,7 @@ pub struct FinalizedContenderWithSerializedDocument { /// This struct holds the identity ID of the contender, the serialized document, /// and the vote tally. #[derive(Debug, PartialEq, Eq, Clone, Default, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FinalizedResourceVoteChoicesWithVoterInfo { /// The resource vote choice. pub resource_vote_choice: ResourceVoteChoice, diff --git a/packages/rs-dpp/src/voting/vote_choices/resource_vote_choice/mod.rs b/packages/rs-dpp/src/voting/vote_choices/resource_vote_choice/mod.rs index fa4b19a7251..e42f45c0a95 100644 --- a/packages/rs-dpp/src/voting/vote_choices/resource_vote_choice/mod.rs +++ b/packages/rs-dpp/src/voting/vote_choices/resource_vote_choice/mod.rs @@ -23,6 +23,7 @@ use std::fmt; derive(Serialize, Deserialize), serde(rename_all = "camelCase") )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ResourceVoteChoice { TowardsIdentity(Identifier), #[default] diff --git a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/mod.rs b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/mod.rs index 90a920fa78e..8008fbbfe8c 100644 --- a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/mod.rs +++ b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/mod.rs @@ -1,4 +1,4 @@ -mod v0; +pub mod v0; use crate::block::block_info::BlockInfo; use crate::voting::contender_structs::{ @@ -18,6 +18,7 @@ pub use v0::ContestedDocumentVotePollStoredInfoV0Getters; pub type LockedVotePollCounter = u16; #[derive(Debug, PartialEq, Eq, Clone, Copy, Default, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContestedDocumentVotePollStatus { #[default] NotStarted, @@ -57,6 +58,7 @@ impl ContestedDocumentVotePollStatus { Debug, PartialEq, Eq, Clone, From, Encode, Decode, PlatformSerialize, PlatformDeserialize, )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContestedDocumentVotePollStoredInfo { /// V0. V0(ContestedDocumentVotePollStoredInfoV0), diff --git a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/v0/mod.rs b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/v0/mod.rs index b7fe690994a..4a5198954b5 100644 --- a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/v0/mod.rs +++ b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_stored_info/v0/mod.rs @@ -13,6 +13,7 @@ use std::fmt; // We can have multiple rounds of voting, after an unlock for example #[derive(Debug, PartialEq, Eq, Clone, Default, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedDocumentVotePollStoredInfoVoteEventV0 { /// The list of contenders returned by the query. pub resource_vote_choices: Vec, @@ -43,6 +44,7 @@ impl fmt::Display for ContestedDocumentVotePollStoredInfoVoteEventV0 { } #[derive(Debug, PartialEq, Eq, Clone, Default, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedDocumentVotePollStoredInfoV0 { /// The list of contenders returned by the query. pub finalized_events: Vec, diff --git a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_winner_info/mod.rs b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_winner_info/mod.rs index 7e666120149..c5f3c16ab5a 100644 --- a/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_winner_info/mod.rs +++ b/packages/rs-dpp/src/voting/vote_info_storage/contested_document_vote_poll_winner_info/mod.rs @@ -3,6 +3,7 @@ use platform_value::Identifier; use std::fmt; #[derive(Debug, PartialEq, Eq, Clone, Copy, Default, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContestedDocumentVotePollWinnerInfo { #[default] NoWinner, diff --git a/packages/rs-dpp/src/voting/vote_polls/contested_document_resource_vote_poll/mod.rs b/packages/rs-dpp/src/voting/vote_polls/contested_document_resource_vote_poll/mod.rs index 9342eae819a..66c83f9669c 100644 --- a/packages/rs-dpp/src/voting/vote_polls/contested_document_resource_vote_poll/mod.rs +++ b/packages/rs-dpp/src/voting/vote_polls/contested_document_resource_vote_poll/mod.rs @@ -16,6 +16,7 @@ use std::fmt; )] #[platform_serialize(unversioned)] //versioned directly, no need to use platform_version #[platform_serialize(limit = 100000)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ContestedDocumentResourceVotePoll { pub contract_id: Identifier, pub document_type_name: String, diff --git a/packages/rs-dpp/src/voting/vote_polls/mod.rs b/packages/rs-dpp/src/voting/vote_polls/mod.rs index 938a852ed4e..0115f183f3b 100644 --- a/packages/rs-dpp/src/voting/vote_polls/mod.rs +++ b/packages/rs-dpp/src/voting/vote_polls/mod.rs @@ -18,6 +18,7 @@ pub mod contested_document_resource_vote_poll; )] #[platform_serialize(unversioned)] #[platform_serialize(limit = 100000)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum VotePoll { ContestedDocumentResourceVotePoll(ContestedDocumentResourceVotePoll), } diff --git a/packages/rs-dpp/src/voting/votes/mod.rs b/packages/rs-dpp/src/voting/votes/mod.rs index 65d8264341d..aeed22bac85 100644 --- a/packages/rs-dpp/src/voting/votes/mod.rs +++ b/packages/rs-dpp/src/voting/votes/mod.rs @@ -17,6 +17,7 @@ use serde::{Deserialize, Serialize}; serde(rename_all = "camelCase") )] #[platform_serialize(limit = 15000, unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Vote { ResourceVote(ResourceVote), } diff --git a/packages/rs-dpp/src/voting/votes/resource_vote/mod.rs b/packages/rs-dpp/src/voting/votes/resource_vote/mod.rs index 15787e88d73..236ac954790 100644 --- a/packages/rs-dpp/src/voting/votes/resource_vote/mod.rs +++ b/packages/rs-dpp/src/voting/votes/resource_vote/mod.rs @@ -15,6 +15,7 @@ pub mod v0; serde(tag = "$version") )] #[platform_serialize(limit = 15000, unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ResourceVote { #[cfg_attr(feature = "vote-serde-conversion", serde(rename = "0"))] V0(ResourceVoteV0), diff --git a/packages/rs-dpp/src/voting/votes/resource_vote/v0/mod.rs b/packages/rs-dpp/src/voting/votes/resource_vote/v0/mod.rs index 5a7a0a407fb..15a251b8d3b 100644 --- a/packages/rs-dpp/src/voting/votes/resource_vote/v0/mod.rs +++ b/packages/rs-dpp/src/voting/votes/resource_vote/v0/mod.rs @@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize}; serde(rename_all = "camelCase") )] #[platform_serialize(unversioned)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct ResourceVoteV0 { pub vote_poll: VotePoll, pub resource_vote_choice: ResourceVoteChoice, diff --git a/packages/rs-dpp/src/withdrawal/mod.rs b/packages/rs-dpp/src/withdrawal/mod.rs index f2031e68e0e..224f990aadb 100644 --- a/packages/rs-dpp/src/withdrawal/mod.rs +++ b/packages/rs-dpp/src/withdrawal/mod.rs @@ -9,6 +9,7 @@ use serde_repr::{Deserialize_repr, Serialize_repr}; #[derive( Serialize_repr, Deserialize_repr, PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, Default, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Pooling { #[default] Never = 0, diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 43dfbcd8301..6727773087d 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -28,8 +28,9 @@ 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.39.6" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/ferment" } dpp = { path = "../rs-dpp", features = ["abci"] } +platform-version = { path = "../rs-platform-version" } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" rust_decimal_macros = "1.25.0" @@ -77,7 +78,9 @@ tokio-util = { version = "0.7" } derive_more = { version = "1.0", features = ["from", "deref", "deref_mut"] } async-trait = "0.1.77" console-subscriber = { version = "0.4", optional = true } -bls-signatures = { git = "https://github.com/dashpay/bls-signatures", tag = "1.3.3", optional = true } +bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "b840e447227dbe6e9a302c97acdf45b95c4d3b21", optional = true } + +versioned-feature-core = "1.0.0" [dev-dependencies] bs58 = { version = "0.5.0" } @@ -101,7 +104,7 @@ drive = { path = "../rs-drive", features = ["fixtures-and-mocks"] } strategy-tests = { path = "../strategy-tests" } assert_matches = "1.5.0" drive-abci = { path = ".", features = ["testing-config", "mocks"] } -bls-signatures = { git = "https://github.com/dashpay/bls-signatures", tag = "1.3.3" } +bls-signatures = { git = "https://github.com/dashpay/bls-signatures", rev = "b840e447227dbe6e9a302c97acdf45b95c4d3b21"} mockall = { version = "0.13" } # For tests of grovedb verify @@ -114,6 +117,7 @@ mocks = ["mockall", "drive/fixtures-and-mocks", "bls-signatures"] console = ["console-subscriber", "tokio/tracing"] testing-config = [] grovedbg = ["drive/grovedbg"] +apple = ["bls-signatures/apple", "bls-signatures/bip32", "bls-signatures/use_serde", "bls-signatures/legacy"] [[bin]] name = "drive-abci" diff --git a/packages/rs-drive-abci/src/abci/app/execution_result.rs b/packages/rs-drive-abci/src/abci/app/execution_result.rs index 43d6e61a34d..f3871341520 100644 --- a/packages/rs-drive-abci/src/abci/app/execution_result.rs +++ b/packages/rs-drive-abci/src/abci/app/execution_result.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult; use dpp::fee::SignedCredits; use dpp::version::PlatformVersion; -use dpp::version::TryIntoPlatformVersioned; +use platform_version::TryIntoPlatformVersioned; use tenderdash_abci::proto::abci::ExecTxResult; impl TryIntoPlatformVersioned> for StateTransitionExecutionResult { diff --git a/packages/rs-drive-abci/src/abci/error.rs b/packages/rs-drive-abci/src/abci/error.rs index 857321a16e8..4c877ae91b7 100644 --- a/packages/rs-drive-abci/src/abci/error.rs +++ b/packages/rs-drive-abci/src/abci/error.rs @@ -1,5 +1,5 @@ use dpp::bls_signatures::BlsError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use tenderdash_abci::proto::abci::ExtendVoteExtension; use tenderdash_abci::proto::types::VoteExtension; diff --git a/packages/rs-drive-abci/src/abci/handler/check_tx.rs b/packages/rs-drive-abci/src/abci/handler/check_tx.rs index f087bcb5d84..8db9f15fb01 100644 --- a/packages/rs-drive-abci/src/abci/handler/check_tx.rs +++ b/packages/rs-drive-abci/src/abci/handler/check_tx.rs @@ -6,7 +6,7 @@ use crate::metrics::{LABEL_ABCI_RESPONSE_CODE, LABEL_CHECK_TX_MODE, LABEL_STATE_ use crate::platform_types::platform::{Platform, PlatformRef}; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::codes::ErrorWithCode; use dpp::fee::SignedCredits; use dpp::util::hash::hash_single; use metrics::Label; diff --git a/packages/rs-drive-abci/src/abci/handler/error/consensus.rs b/packages/rs-drive-abci/src/abci/handler/error/consensus.rs index 8572ea62ab2..4f8142df078 100644 --- a/packages/rs-drive-abci/src/abci/handler/error/consensus.rs +++ b/packages/rs-drive-abci/src/abci/handler/error/consensus.rs @@ -1,5 +1,5 @@ use crate::error::Error; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::platform_value; use dpp::platform_value::string_encoding::{encode, Encoding}; use dpp::serialization::PlatformSerializableWithPlatformVersion; diff --git a/packages/rs-drive-abci/src/abci/handler/error/mod.rs b/packages/rs-drive-abci/src/abci/handler/error/mod.rs index 19735ff6d44..26b52c613f0 100644 --- a/packages/rs-drive-abci/src/abci/handler/error/mod.rs +++ b/packages/rs-drive-abci/src/abci/handler/error/mod.rs @@ -2,8 +2,8 @@ pub mod consensus; use crate::error::query::QueryError; use crate::error::Error; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::platform_value; use dpp::platform_value::string_encoding::{encode, Encoding}; use tenderdash_abci::proto::abci as proto; diff --git a/packages/rs-drive-abci/src/abci/handler/info.rs b/packages/rs-drive-abci/src/abci/handler/info.rs index 969d26809c0..9f6330afa2d 100644 --- a/packages/rs-drive-abci/src/abci/handler/info.rs +++ b/packages/rs-drive-abci/src/abci/handler/info.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; use dpp::dashcore::Network; -use dpp::version::DESIRED_PLATFORM_VERSION; +use platform_version::version::DESIRED_PLATFORM_VERSION; use tenderdash_abci::proto::abci as proto; pub fn info(app: &A, request: proto::RequestInfo) -> Result diff --git a/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs b/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs index c5c379fb164..d4e137f5868 100644 --- a/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs +++ b/packages/rs-drive-abci/src/abci/handler/prepare_proposal.rs @@ -12,8 +12,8 @@ use crate::platform_types::state_transitions_processing_result::StateTransitionE use crate::rpc::core::CoreRPCLike; use dpp::dashcore::hashes::Hash; use dpp::dashcore::Network; -use dpp::version::TryIntoPlatformVersioned; use drive::grovedb_storage::Error::RocksDBError; +use platform_version::TryIntoPlatformVersioned; use tenderdash_abci::proto::abci as proto; use tenderdash_abci::proto::abci::tx_record::TxAction; use tenderdash_abci::proto::abci::{ExecTxResult, TxRecord}; diff --git a/packages/rs-drive-abci/src/abci/handler/process_proposal.rs b/packages/rs-drive-abci/src/abci/handler/process_proposal.rs index e10a60aef0d..5643422b30c 100644 --- a/packages/rs-drive-abci/src/abci/handler/process_proposal.rs +++ b/packages/rs-drive-abci/src/abci/handler/process_proposal.rs @@ -13,8 +13,8 @@ use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult; use crate::rpc::core::CoreRPCLike; use dpp::dashcore::Network; -use dpp::version::TryIntoPlatformVersioned; use drive::grovedb_storage::Error::RocksDBError; +use platform_version::TryIntoPlatformVersioned; use tenderdash_abci::proto::abci as proto; use tenderdash_abci::proto::abci::tx_record::TxAction; diff --git a/packages/rs-drive-abci/src/config.rs b/packages/rs-drive-abci/src/config.rs index 73f9b69fc1f..9f5e33016c5 100644 --- a/packages/rs-drive-abci/src/config.rs +++ b/packages/rs-drive-abci/src/config.rs @@ -5,8 +5,8 @@ use bincode::{Decode, Encode}; use dashcore_rpc::json::QuorumType; use dpp::dashcore::Network; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::INITIAL_PROTOCOL_VERSION; use drive::config::DriveConfig; +use platform_version::version::INITIAL_PROTOCOL_VERSION; use serde::{de::DeserializeOwned, Deserialize, Deserializer, Serialize}; use std::path::PathBuf; use std::str::FromStr; diff --git a/packages/rs-drive-abci/src/error/execution.rs b/packages/rs-drive-abci/src/error/execution.rs index 4e7108e08e7..73074d0f82d 100644 --- a/packages/rs-drive-abci/src/error/execution.rs +++ b/packages/rs-drive-abci/src/error/execution.rs @@ -1,8 +1,8 @@ use dpp::bls_signatures::BlsError; use dpp::dashcore::consensus::encode::Error as DashCoreConsensusEncodeError; use dpp::identity::TimestampMillis; -use dpp::version::FeatureVersion; use drive::error::Error as DriveError; +use versioned_feature_core::FeatureVersion; // @append_only /// Execution errors diff --git a/packages/rs-drive-abci/src/error/mod.rs b/packages/rs-drive-abci/src/error/mod.rs index 5ada5f06b44..c7f7e4d275e 100644 --- a/packages/rs-drive-abci/src/error/mod.rs +++ b/packages/rs-drive-abci/src/error/mod.rs @@ -4,7 +4,7 @@ use crate::error::serialization::SerializationError; use crate::logging; use dashcore_rpc::Error as CoreRpcError; use dpp::bls_signatures::BlsError; -use dpp::data_contract::errors::DataContractError; +use dpp::data_contract::errors::contract::DataContractError; use dpp::platform_value::Error as ValueError; use dpp::version::PlatformVersionError; use drive::dpp::ProtocolError; diff --git a/packages/rs-drive-abci/src/error/query.rs b/packages/rs-drive-abci/src/error/query.rs index ba60b25379c..6d252e92d8b 100644 --- a/packages/rs-drive-abci/src/error/query.rs +++ b/packages/rs-drive-abci/src/error/query.rs @@ -1,12 +1,12 @@ use dpp::platform_value::Error as ValueError; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::FeatureVersion; use dpp::ProtocolError; use drive::error::proof::ProofError; use drive::error::query::QuerySyntaxError as SyntaxError; use drive::error::Error as DriveError; use prost::DecodeError; use tenderdash_abci::proto::abci::ResponseException; +use versioned_feature_core::FeatureVersion; // @append_only /// Errors diff --git a/packages/rs-drive-abci/src/execution/check_tx/mod.rs b/packages/rs-drive-abci/src/execution/check_tx/mod.rs index 1904289ca98..3a07b825dea 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/mod.rs @@ -4,7 +4,7 @@ use crate::platform_types::platform::{Platform, PlatformRef}; use crate::abci::AbciError; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::fee::fee_result::FeeResult; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs index 287058514e3..2ac0c20a646 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs @@ -10,7 +10,7 @@ use crate::platform_types::platform::{Platform, PlatformRef}; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use crate::error::execution::ExecutionError; use crate::execution::types::state_transition_container::v0::{ @@ -207,13 +207,13 @@ mod tests { use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::test::helpers::setup::TestPlatformBuilder; use dpp::block::block_info::BlockInfo; - use dpp::consensus::basic::BasicError; - use dpp::consensus::signature::SignatureError; + use dpp::errors::consensus::basic::BasicError; + use dpp::errors::consensus::signature::SignatureError; use simple_signer::signer::SimpleSigner; - use dpp::consensus::ConsensusError; use dpp::dashcore::secp256k1::Secp256k1; use dpp::dashcore::{key::Keypair, signer, Network, PrivateKey}; + use dpp::errors::consensus::ConsensusError; use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; use dpp::data_contract::document_type::random_document::{ @@ -223,9 +223,10 @@ mod tests { use dpp::document::DocumentV0Setters; use dpp::identity::accessors::{IdentityGettersV0, IdentitySettersV0}; + use dpp::identity::IdentityPublicKey; use dpp::identity::KeyType::ECDSA_SECP256K1; - use dpp::identity::{Identity, IdentityV0, Purpose, SecurityLevel}; - use dpp::prelude::{Identifier, IdentityPublicKey}; + use dpp::identity::{Identity, IdentityV0, KeyType, Purpose, SecurityLevel}; + use dpp::prelude::Identifier; use dpp::serialization::{PlatformSerializable, Signable}; use dpp::native_bls::NativeBlsModule; @@ -253,7 +254,6 @@ mod tests { use crate::platform_types::platform::PlatformRef; use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult; use assert_matches::assert_matches; - use dpp::consensus::state::state_error::StateError; use dpp::dash_to_credits; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Setters; use dpp::data_contract::change_control_rules::authorized_action_takers::AuthorizedActionTakers; @@ -270,6 +270,7 @@ mod tests { use dpp::group::{GroupStateTransitionInfo, GroupStateTransitionInfoStatus}; use dpp::identity::contract_bounds::ContractBounds::SingleContractDocumentType; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; + use dpp::identity::identity_public_key::contract_bounds::ContractBounds::SingleContractDocumentType; use dpp::identity::signer::Signer; use dpp::platform_value::Bytes32; use dpp::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; diff --git a/packages/rs-drive-abci/src/execution/engine/initialization/init_chain/mod.rs b/packages/rs-drive-abci/src/execution/engine/initialization/init_chain/mod.rs index 1b580ba38db..c4f9492e57e 100644 --- a/packages/rs-drive-abci/src/execution/engine/initialization/init_chain/mod.rs +++ b/packages/rs-drive-abci/src/execution/engine/initialization/init_chain/mod.rs @@ -7,9 +7,8 @@ use crate::rpc::core::CoreRPCLike; use crate::abci::AbciError; use crate::error::execution::ExecutionError; -use dpp::version::PlatformVersion; -use dpp::version::ProtocolVersion; use drive::grovedb::Transaction; +use platform_version::version::{PlatformVersion, ProtocolVersion}; use tenderdash_abci::proto::abci::{RequestInitChain, ResponseInitChain}; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_processing_end_events/tests.rs b/packages/rs-drive-abci/src/execution/platform_events/block_processing_end_events/tests.rs index b0d3522b515..891564b903d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_processing_end_events/tests.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_processing_end_events/tests.rs @@ -25,8 +25,8 @@ mod refund_tests { use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::{Identity, IdentityPublicKey}; use dpp::platform_value::Bytes32; - use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; - use dpp::state_transition::batch_transition::BatchTransition; + use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; + use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use drive::util::test_helpers::setup_contract; use platform_version::version::PlatformVersion; use rand::prelude::StdRng; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs index 9268960874e..5c94d10c5f5 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/create_voter_identity/v0/mod.rs @@ -3,10 +3,9 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dashcore_rpc::dashcore_rpc_json::MasternodeListItem; use dpp::dashcore::hashes::Hash; -use dpp::identifier::MasternodeIdentifiers; +use dpp::identifier::{Identifier, MasternodeIdentifiers}; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::Identity; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/disable_identity_keys/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/disable_identity_keys/v0/mod.rs index a43dcf02dbd..fe7d160641e 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/disable_identity_keys/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/disable_identity_keys/v0/mod.rs @@ -4,7 +4,7 @@ use crate::rpc::core::CoreRPCLike; use dashcore_rpc::dashcore_rpc_json::MasternodeListItem; use dpp::block::block_info::BlockInfo; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::Purpose::TRANSFER; +use dpp::identity::identity_public_key::Purpose::TRANSFER; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{ IdentityKeysRequest, KeyIDIdentityPublicKeyPairVec, KeyRequestType, diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identifier/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identifier/v0/mod.rs index 20a09780697..6e800029c00 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identifier/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identifier/v0/mod.rs @@ -1,8 +1,7 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dashcore_rpc::dashcore_rpc_json::MasternodeListItem; -use dpp::identifier::MasternodeIdentifiers; -use dpp::prelude::Identifier; +use dpp::identifier::{Identifier, MasternodeIdentifiers}; impl Platform where diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identity_keys/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identity_keys/v0/mod.rs index ff3a8899500..e2c978132b8 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identity_keys/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_operator_identity_keys/v0/mod.rs @@ -2,7 +2,10 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::{IdentityPublicKey, KeyType, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + IdentityPublicKey, KeyType, +}; use dpp::platform_value::BinaryData; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_owner_key/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_owner_key/v0/mod.rs index ba099e99ed1..d8fc920a36a 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_owner_key/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_owner_key/v0/mod.rs @@ -1,7 +1,10 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + IdentityPublicKey, KeyID, KeyType, +}; use dpp::platform_value::BinaryData; impl Platform { diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_withdrawal_key/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_withdrawal_key/v0/mod.rs index cec144d34a5..e7b8bd325d5 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_withdrawal_key/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_owner_identity_withdrawal_key/v0/mod.rs @@ -2,7 +2,10 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + IdentityPublicKey, KeyID, KeyType, +}; use dpp::platform_value::BinaryData; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_voter_identity_key/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_voter_identity_key/v0/mod.rs index 28246bb4ebd..b6818e295fe 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_voter_identity_key/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/get_voter_identity_key/v0/mod.rs @@ -2,7 +2,10 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + IdentityPublicKey, KeyID, KeyType, +}; use dpp::platform_value::BinaryData; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs index 4dd3994d442..06ea78374f7 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_operator_identity/v0/mod.rs @@ -13,8 +13,11 @@ use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::Purpose::TRANSFER; -use dpp::identity::{Identity, IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use dpp::identity::identity_public_key::Purpose::TRANSFER; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + Identity, IdentityPublicKey, KeyID, KeyType, +}; use dpp::platform_value::BinaryData; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{ @@ -404,9 +407,11 @@ mod tests { use dpp::dashcore::Txid; use dpp::identifier::MasternodeIdentifiers; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; + use dpp::identity::Identity; + use dpp::identity::IdentityPublicKey; use dpp::identity::{IdentityV0, KeyType, Purpose, SecurityLevel}; use dpp::platform_value::BinaryData; - use dpp::prelude::{Identifier, Identity, IdentityPublicKey}; + use dpp::prelude::Identifier; use platform_version::version::PlatformVersion; use rand::prelude::StdRng; use rand::Rng; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/mod.rs index 1f81d17c0be..95d1e2b0172 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/mod.rs @@ -85,9 +85,10 @@ mod tests { use dpp::block::block_info::BlockInfo; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; + use dpp::identity::IdentityPublicKey; use dpp::identity::{Identity, IdentityV0, KeyType, Purpose, SecurityLevel}; use dpp::platform_value::BinaryData; - use dpp::prelude::{Identifier, IdentityPublicKey}; + use dpp::prelude::Identifier; use platform_version::version::PlatformVersion; use rand::prelude::StdRng; use rand::Rng; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/v1/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/v1/mod.rs index 5a82bca92a0..5e5cb840d3b 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/update_owner_withdrawal_address/v1/mod.rs @@ -6,7 +6,7 @@ use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{KeyID, Purpose}; +use dpp::identity::{identity_public_key::Purpose, KeyID}; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{ 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 23c9238b796..8b7095c793e 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 @@ -3,7 +3,7 @@ use crate::error::Error; use crate::platform_types::platform::Platform; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::platform_types::platform_state::PlatformState; -use dashcore_rpc::json::{ExtendedQuorumListResult, QuorumType}; +use dashcore_rpc::json::{dashcore::hash_types::QuorumHash, ExtendedQuorumListResult, QuorumType}; use std::collections::BTreeMap; use std::fmt::Display; @@ -17,7 +17,7 @@ use crate::platform_types::signature_verification_quorum_set::{ SignatureVerificationQuorumSet, SignatureVerificationQuorumSetV0Methods, VerificationQuorum, }; use dpp::bls_signatures::PublicKey as BlsPublicKey; -use dpp::dashcore::QuorumHash; +// use dpp::dashcore::QuorumHash; use tracing::Level; #[derive(Copy, Clone)] diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/mod.rs index 2145adf36a5..8700da4e98c 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/mod.rs @@ -6,8 +6,8 @@ use crate::error::Error; use crate::execution::types::block_fees::BlockFees; use crate::execution::types::fees_in_pools::v0::FeesInPoolsV0; use crate::platform_types::platform::Platform; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use drive::util::batch::DriveOperation; diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/v0/mod.rs index 52493f0cabb..55b70a9908d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_inwards_distribution/add_distribute_block_fees_into_pools_operations/v0/mod.rs @@ -3,8 +3,8 @@ use crate::execution::types::block_fees::v0::BlockFeesV0Getters; use crate::execution::types::block_fees::BlockFees; use crate::execution::types::fees_in_pools::v0::FeesInPoolsV0; use crate::platform_types::platform::Platform; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use drive::util::batch::DriveOperation; diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/mod.rs index 2fba3a87f3d..35c1c141adf 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/mod.rs @@ -5,11 +5,12 @@ use crate::platform_types::platform::Platform; use dpp::block::pool_credits::StorageAndProcessingPoolCredits; use std::collections::BTreeMap; -use dpp::fee::Credits; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use dpp::credits::Credits; + use drive::grovedb::Transaction; use drive::util::batch::DriveOperation; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/v0/mod.rs index 5dcb08f2684..4f817bf1478 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/add_epoch_pool_to_proposers_payout_operations/v0/mod.rs @@ -5,11 +5,11 @@ use std::collections::BTreeMap; use crate::execution::types::unpaid_epoch::v0::{UnpaidEpochV0Getters, UnpaidEpochV0Methods}; use crate::execution::types::unpaid_epoch::UnpaidEpoch; use crate::platform_types::platform::Platform; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::block::epoch::Epoch; use dpp::block::pool_credits::StorageAndProcessingPoolCredits; use dpp::document::DocumentV0Getters; -use dpp::fee::Credits; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use dpp::platform_value::Identifier; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/mod.rs index 7a101b4e342..caa6b444337 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/mod.rs @@ -6,8 +6,8 @@ use crate::platform_types::platform::Platform; use crate::platform_types::platform_state::PlatformState; use dpp::block::block_info::BlockInfo; use dpp::version::PlatformVersion; -use dpp::version::ProtocolVersion; use drive::grovedb::Transaction; +use platform_version::version::ProtocolVersion; impl Platform { /// Executes protocol-specific events on the first block after a protocol version change. diff --git a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs index 0f3918f52cf..0db8158b4fe 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/protocol_upgrade/perform_events_on_first_block_of_protocol_change/v0/mod.rs @@ -11,7 +11,6 @@ use dpp::platform_value::Identifier; use dpp::serialization::PlatformDeserializable; use dpp::system_data_contracts::load_system_data_contract; use dpp::version::PlatformVersion; -use dpp::version::ProtocolVersion; use dpp::voting::vote_polls::VotePoll; use drive::drive::balances::TOTAL_TOKEN_SUPPLIES_STORAGE_KEY; use drive::drive::identity::key::fetch::{ @@ -35,6 +34,7 @@ use drive::drive::RootTree; use drive::grovedb::{Element, PathQuery, Query, QueryItem, SizedQuery, Transaction}; use drive::grovedb_path::SubtreePath; use drive::query::QueryResultType; +use platform_version::version::ProtocolVersion; use std::collections::HashSet; use std::ops::RangeFull; diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/decode_raw_state_transitions/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/decode_raw_state_transitions/v0/mod.rs index 9b7e7bce54c..29c726a8f99 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/decode_raw_state_transitions/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/decode_raw_state_transitions/v0/mod.rs @@ -4,10 +4,10 @@ use crate::execution::types::state_transition_container::v0::{ }; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::basic::decode::SerializedObjectParsingError; -use dpp::consensus::basic::state_transition::StateTransitionMaxSizeExceededError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::decode::SerializedObjectParsingError; +use dpp::errors::consensus::basic::state_transition::StateTransitionMaxSizeExceededError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::state_transition::StateTransition; use dpp::version::PlatformVersion; use dpp::ProtocolError; diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/mod.rs index e2aa2dab962..8f1c216bec3 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/mod.rs @@ -8,7 +8,7 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::version::PlatformVersion; use drive::grovedb::Transaction; diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs index 61c4342481a..85965453864 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs @@ -10,7 +10,7 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::fee::fee_result::FeeResult; use dpp::fee::Credits; diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/process_raw_state_transitions/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/process_raw_state_transitions/v0/mod.rs index 56d63ae8fbf..a0c445602d4 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/process_raw_state_transitions/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/process_raw_state_transitions/v0/mod.rs @@ -3,7 +3,7 @@ use crate::platform_types::platform::{Platform, PlatformRef}; use crate::platform_types::platform_state::PlatformState; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::codes::ErrorWithCode; use dpp::fee::fee_result::FeeResult; use crate::execution::types::execution_event::ExecutionEvent; diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs index b8810cec48a..75f11dc0fc6 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs @@ -5,8 +5,8 @@ use crate::execution::types::execution_operation::ValidationOperation; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::fee::fee_result::FeeResult; diff --git a/packages/rs-drive-abci/src/execution/types/execution_event/mod.rs b/packages/rs-drive-abci/src/execution/types/execution_event/mod.rs index 8c85e10f796..6d11accd4a9 100644 --- a/packages/rs-drive-abci/src/execution/types/execution_event/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/execution_event/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::error::execution::ExecutionError; use crate::error::Error; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValueGettersV0; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; -use dpp::fee::Credits; use dpp::identity::PartialIdentity; use dpp::prelude::UserFeeIncrease; diff --git a/packages/rs-drive-abci/src/execution/types/execution_operation/mod.rs b/packages/rs-drive-abci/src/execution/types/execution_operation/mod.rs index 048dfece236..587eb4cadb4 100644 --- a/packages/rs-drive-abci/src/execution/types/execution_operation/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/execution_operation/mod.rs @@ -1,8 +1,8 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::execution::types::execution_operation::signature_verification_operation::SignatureVerificationOperation; +use dpp::balances::credits::Credits; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::identity::KeyCount; use dpp::validation::operations::ProtocolValidationOperation; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/types/execution_operation/signature_verification_operation.rs b/packages/rs-drive-abci/src/execution/types/execution_operation/signature_verification_operation.rs index f290dbd3127..531534168a6 100644 --- a/packages/rs-drive-abci/src/execution/types/execution_operation/signature_verification_operation.rs +++ b/packages/rs-drive-abci/src/execution/types/execution_operation/signature_verification_operation.rs @@ -1,6 +1,6 @@ use crate::error::Error; use crate::execution::types::execution_operation::OperationLike; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::identity::KeyType; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/types/fees_in_pools/v0/mod.rs b/packages/rs-drive-abci/src/execution/types/fees_in_pools/v0/mod.rs index 0722a753dfe..a94edd0c365 100644 --- a/packages/rs-drive-abci/src/execution/types/fees_in_pools/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/fees_in_pools/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use serde::{Deserialize, Serialize}; use std::fmt; diff --git a/packages/rs-drive-abci/src/execution/types/state_transition_container/v0/mod.rs b/packages/rs-drive-abci/src/execution/types/state_transition_container/v0/mod.rs index 1cf580930d5..2e419f6bb24 100644 --- a/packages/rs-drive-abci/src/execution/types/state_transition_container/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/state_transition_container/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::state_transition::StateTransition; use dpp::ProtocolError; use std::time::Duration; diff --git a/packages/rs-drive-abci/src/execution/types/state_transition_execution_context/mod.rs b/packages/rs-drive-abci/src/execution/types/state_transition_execution_context/mod.rs index 4d9ede1066c..9d2f236818e 100644 --- a/packages/rs-drive-abci/src/execution/types/state_transition_execution_context/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/state_transition_execution_context/mod.rs @@ -6,7 +6,7 @@ use crate::execution::types::state_transition_execution_context::v0::StateTransi use derive_more::From; use dpp::fee::fee_result::FeeResult; use dpp::validation::operations::ProtocolValidationOperation; -use dpp::version::{DefaultForPlatformVersion, PlatformVersion}; +use platform_version::{version::PlatformVersion, DefaultForPlatformVersion}; /// V0 module pub mod v0; diff --git a/packages/rs-drive-abci/src/execution/types/storage_fee_distribution_outcome/v0/mod.rs b/packages/rs-drive-abci/src/execution/types/storage_fee_distribution_outcome/v0/mod.rs index 1c6bcd1e2ca..014f5926479 100644 --- a/packages/rs-drive-abci/src/execution/types/storage_fee_distribution_outcome/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/storage_fee_distribution_outcome/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::fee::Credits; +use dpp::balances::credits::Credits; //todo: make this non versioned /// Result of storage fee distribution diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/check_tx_verification/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/check_tx_verification/v0/mod.rs index 7595b74e84d..b36a8d47a80 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/check_tx_verification/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/check_tx_verification/v0/mod.rs @@ -7,10 +7,10 @@ use crate::rpc::core::CoreRPCLike; use dpp::identity::state_transition::OptionallyAssetLockProved; use dpp::prelude::ConsensusValidationResult; use dpp::serialization::Signable; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::ProtocolError; use dpp::state_transition::StateTransition; -use dpp::version::{DefaultForPlatformVersion, PlatformVersion}; +use platform_version::{DefaultForPlatformVersion, version::PlatformVersion}; use crate::error::execution::ExecutionError; use crate::execution::check_tx::CheckTxLevel; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/chain/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/chain/mod.rs index f0ff6ac4c81..dc499b23624 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/chain/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/chain/mod.rs @@ -2,12 +2,12 @@ use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; use crate::error::Error; use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::basic::identity::{ +use dpp::errors::consensus::basic::identity::{ InvalidAssetLockProofCoreChainHeightError, }; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs index a2500b06636..ec845f48aab 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs @@ -2,10 +2,10 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::consensus::basic::identity::InvalidInstantAssetLockProofSignatureError; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; +use dpp::errors::consensus::basic::identity::InvalidInstantAssetLockProofSignatureError; use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/mod.rs index ee7e2652e0d..8cbf1a62e01 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/mod.rs @@ -6,9 +6,9 @@ use crate::execution::validation::state_transition::ValidationMode; use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::fee::Credits; -use dpp::prelude::AssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::balances::credits::Credits; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/chain/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/chain/mod.rs index 3eb45e3b8d9..992e82d694d 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/chain/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/chain/mod.rs @@ -1,9 +1,9 @@ use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; use crate::error::Error; use crate::platform_types::platform::PlatformRef; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs index f6ad4a3a793..101ddecd9e5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs @@ -3,9 +3,9 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs index a38cf9a5097..310181952d0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs @@ -6,10 +6,9 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; use dpp::dashcore::OutPoint; -use dpp::fee::Credits; - -use dpp::prelude::AssetLockProof; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::balances::credits::Credits; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/v0/mod.rs index 1ca28e3ff83..31bd98b4587 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/v0/mod.rs @@ -2,16 +2,16 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use dpp::asset_lock::reduced_asset_lock_value::{AssetLockValue, AssetLockValueGettersV0}; use dpp::asset_lock::StoredAssetLockInfo; -use dpp::consensus::basic::identity::{ +use dpp::balances::credits::Credits; +use dpp::dashcore::OutPoint; +use dpp::errors::consensus::basic::identity::{ IdentityAssetLockStateTransitionReplayError, IdentityAssetLockTransactionOutPointAlreadyConsumedError, IdentityAssetLockTransactionOutPointNotEnoughBalanceError, }; -use dpp::dashcore::OutPoint; -use dpp::fee::Credits; use dpp::platform_value::Bytes36; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/mod.rs index 13887d434e2..8a471284156 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/mod.rs @@ -2,7 +2,8 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::rpc::core::CoreRPCLike; use dpp::dashcore::TxOut; -use dpp::prelude::{AssetLockProof, ConsensusValidationResult}; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::prelude::ConsensusValidationResult; use dpp::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs index b48a79bf8ef..1f439a917ab 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/transaction/fetch_asset_lock_transaction_output_sync/v0/mod.rs @@ -1,14 +1,15 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::basic::identity::{ +use dpp::dashcore::hashes::Hash; +use dpp::dashcore::TxOut; +use dpp::errors::consensus::basic::identity::{ IdentityAssetLockTransactionIsNotFoundError, IdentityAssetLockTransactionOutputNotFoundError, InvalidAssetLockProofTransactionHeightError, }; -use dpp::dashcore::hashes::Hash; -use dpp::dashcore::TxOut; use dpp::identity::state_transition::asset_lock_proof::validate_asset_lock_transaction_structure::validate_asset_lock_transaction_structure; -use dpp::prelude::{AssetLockProof, ConsensusValidationResult}; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::prelude::ConsensusValidationResult; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/mod.rs index aabfec69beb..fb5906579d3 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/mod.rs @@ -1,5 +1,5 @@ use dpp::identifier::Identifier; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use drive::drive::Drive; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/v0/mod.rs index 48753f8193a..541b1b32287 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_contract_bounds/v0/mod.rs @@ -1,23 +1,23 @@ use crate::error::Error; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; -use dpp::consensus::basic::document::{ +use dpp::errors::consensus::basic::document::{ DataContractNotPresentError, InvalidDocumentTypeError, }; -use dpp::consensus::basic::identity::DataContractBoundsNotPresentError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::basic::identity::DataContractBoundsNotPresentError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use dpp::identifier::Identifier; -use dpp::identity::contract_bounds::ContractBounds; +use dpp::identity::identity_public_key::contract_bounds::ContractBounds; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::Purpose::{DECRYPTION, ENCRYPTION}; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::identity::identity_public_key::Purpose::{DECRYPTION, ENCRYPTION}; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::drive::Drive; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/mod.rs index 6f231aff629..1ea8657f7d7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/mod.rs @@ -1,5 +1,5 @@ use dpp::identifier::Identifier; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use drive::drive::Drive; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/v0/mod.rs index a9feed80d56..7402bede1ed 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_dont_exist_in_state/v0/mod.rs @@ -1,11 +1,11 @@ use crate::error::Error; -use dpp::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::KeyID; use dpp::platform_value::Identifier; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_exist_in_state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_exist_in_state/v0/mod.rs index 6422faf196e..a3fef518da7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_exist_in_state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_identity_public_key_ids_exist_in_state/v0/mod.rs @@ -1,6 +1,6 @@ use crate::error::Error; -use dpp::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; +use dpp::errors::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; use dpp::identity::{IdentityPublicKey, KeyID}; use dpp::platform_value::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/mod.rs index a4d29d4b8b0..ff52d974a74 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/mod.rs @@ -1,5 +1,5 @@ use dpp::identity::IdentityPublicKey; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use crate::error::Error; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/v0/mod.rs index 3abdc332e3d..d1381d0a675 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_not_disabling_last_master_key/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; -use dpp::consensus::basic::BasicError; -use dpp::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, SecurityLevel}; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::identity::identity_public_key::{IdentityPublicKey, SecurityLevel}; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; /// This will validate that all keys are valid against the state diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_simple_pre_check_balance/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_simple_pre_check_balance/v0/mod.rs index 59599801284..8fa59c04345 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_simple_pre_check_balance/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_simple_pre_check_balance/v0/mod.rs @@ -1,9 +1,9 @@ use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; use dpp::identity::PartialIdentity; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; use dpp::state_transition::StateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_state_transition_identity_signed/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_state_transition_identity_signed/v0/mod.rs index 5dc994c950b..fe83b23c7a2 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_state_transition_identity_signed/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_state_transition_identity_signed/v0/mod.rs @@ -1,6 +1,6 @@ use crate::error::Error; -use dpp::consensus::signature::{ +use dpp::errors::consensus::signature::{ IdentityNotFoundError, InvalidSignaturePublicKeyPurposeError, InvalidSignaturePublicKeySecurityLevelError, InvalidStateTransitionSignatureError, PublicKeySecurityLevelNotMetError, @@ -13,9 +13,9 @@ use crate::execution::types::execution_operation::{RetrieveIdentityInfo, Validat use crate::execution::types::state_transition_execution_context::{ StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0, }; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; -use dpp::consensus::signature::{ +use dpp::errors::consensus::signature::{ InvalidIdentityPublicKeyTypeError, MissingPublicKeyError, PublicKeyIsDisabledError, SignatureError, }; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/mod.rs index 84398f0dde9..55a151e3ebf 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/mod.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use drive::drive::Drive; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/v0/mod.rs index ff1f78ef018..b2a426cd8b2 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/validate_unique_identity_public_key_hashes_in_state/v0/mod.rs @@ -1,7 +1,7 @@ use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::KeyID; @@ -12,8 +12,8 @@ use drive::drive::Drive; use drive::grovedb::TransactionArg; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::version::PlatformVersion; use std::collections::HashMap; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs index 419fcffcca9..87d25058afc 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs @@ -7,6 +7,7 @@ use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use dpp::dashcore::Network; +use dpp::errors::ProtocolError; use dpp::fee::Credits; use dpp::identity::PartialIdentity; use dpp::prefunded_specialized_balance::PrefundedSpecializedBalanceIdentifier; @@ -14,11 +15,10 @@ use dpp::prelude::ConsensusValidationResult; use dpp::serialization::Signable; use dpp::state_transition::StateTransition; use dpp::validation::SimpleConsensusValidationResult; -use dpp::version::{DefaultForPlatformVersion, PlatformVersion}; -use dpp::ProtocolError; use drive::drive::Drive; use drive::grovedb::TransactionArg; use drive::state_transition_action::StateTransitionAction; +use platform_version::{version::PlatformVersion, DefaultForPlatformVersion}; use std::collections::BTreeMap; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/advanced_structure_v0/mod.rs index d3c0d57b7df..bbad5c82ea9 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/advanced_structure_v0/mod.rs @@ -1,6 +1,6 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::{DocumentCreationNotAllowedError, InvalidDocumentTypeError}; -use dpp::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; +use dpp::errors::consensus::basic::document::{DocumentCreationNotAllowedError, InvalidDocumentTypeError}; +use dpp::errors::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; use dpp::dashcore::Network; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v0/mod.rs index 5b016084d44..ccc67cdae36 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v0/mod.rs @@ -1,14 +1,15 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; -use dpp::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; -use dpp::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; -use dpp::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; +use dpp::errors::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; +use dpp::errors::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; +use dpp::errors::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; -use dpp::prelude::{ConsensusValidationResult, Identifier}; +use dpp::identifier::Identifier; +use dpp::prelude::ConsensusValidationResult; use dpp::validation::SimpleConsensusValidationResult; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; use drive::state_transition_action::batch::batched_transition::document_transition::document_create_transition_action::{DocumentCreateTransitionAction, DocumentCreateTransitionActionAccessorsV0}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v1/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v1/mod.rs index d1e3f850d8c..83a013022c1 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_create_transition_action/state_v1/mod.rs @@ -1,16 +1,17 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; -use dpp::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; -use dpp::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; -use dpp::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; -use dpp::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; +use dpp::errors::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; +use dpp::errors::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; +use dpp::errors::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; +use dpp::errors::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::dashcore::Network; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; -use dpp::prelude::{ConsensusValidationResult, Identifier}; +use dpp::identifier::Identifier; +use dpp::prelude::ConsensusValidationResult; use dpp::validation::SimpleConsensusValidationResult; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; use drive::state_transition_action::batch::batched_transition::document_transition::document_create_transition_action::{DocumentCreateTransitionAction, DocumentCreateTransitionActionAccessorsV0}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/advanced_structure_v0/mod.rs index 0a9cbfe8929..8f168c49f75 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/advanced_structure_v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; +use dpp::errors::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/state_v0/mod.rs index 7b386543d41..46a74f96994 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_delete_transition_action/state_v0/mod.rs @@ -1,9 +1,9 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::document::document_not_found_error::DocumentNotFoundError; -use dpp::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::document::document_not_found_error::DocumentNotFoundError; +use dpp::errors::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::{Document, DocumentV0Getters}; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/advanced_structure_v0/mod.rs index 7c65043d3e5..e46750052c0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/advanced_structure_v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; +use dpp::errors::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::document::DocumentV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/state_v0/mod.rs index 04027a3afe9..4bf512b13a0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_purchase_transition_action/state_v0/mod.rs @@ -1,5 +1,5 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/advanced_structure_v0/mod.rs index 582db214f0d..c2dae230512 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/advanced_structure_v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; +use dpp::errors::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::validate_document::DataContractDocumentValidationMethodsV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/state_v0/mod.rs index 204c883131c..bfb7f4563de 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_replace_transition_action/state_v0/mod.rs @@ -1,5 +1,5 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/advanced_structure_v0/mod.rs index c8c27c46303..81a9c4445ca 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/advanced_structure_v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; +use dpp::errors::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/state_v0/mod.rs index 638caa3fac4..aec01b9c1a3 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_transfer_transition_action/state_v0/mod.rs @@ -1,5 +1,5 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/advanced_structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/advanced_structure_v0/mod.rs index c595dba4919..fd6f1afc13f 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/advanced_structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/advanced_structure_v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; +use dpp::errors::consensus::basic::document::{InvalidDocumentTransitionActionError, InvalidDocumentTypeError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/state_v0/mod.rs index 48941bc5f69..b7724272720 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/document/document_update_price_transition_action/state_v0/mod.rs @@ -1,5 +1,5 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/state_v0/mod.rs index 0a755bb43e4..fbca25d3d58 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/state_v0/mod.rs @@ -1,9 +1,9 @@ use std::collections::BTreeMap; use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::GroupActionAlreadySignedByIdentityError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::UnauthorizedTokenActionError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::GroupActionAlreadySignedByIdentityError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::UnauthorizedTokenActionError; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use dpp::data_contract::associated_token::token_configuration::TokenConfiguration; use dpp::data_contract::change_control_rules::authorized_action_takers::AuthorizedActionTakers; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/structure_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/structure_v0/mod.rs index 4b543cd8014..e8e8256f741 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/structure_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_base_transition_action/structure_v0/mod.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::BasicError; -use dpp::consensus::basic::token::ContractHasNoTokensError; -use dpp::consensus::basic::token::InvalidTokenPositionError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::basic::token::ContractHasNoTokensError; +use dpp::errors::consensus::basic::token::InvalidTokenPositionError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::validation::{SimpleConsensusValidationResult}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_burn_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_burn_transition_action/state_v0/mod.rs index 2633713736e..c4b78edc1ba 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_burn_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_burn_transition_action/state_v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::IdentityDoesNotHaveEnoughTokenBalanceError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::IdentityDoesNotHaveEnoughTokenBalanceError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_config_update_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_config_update_transition_action/state_v0/mod.rs index d27d8e394e6..b332633ce0f 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_config_update_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_config_update_transition_action/state_v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{InvalidGroupPositionError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, NewTokensDestinationIdentityDoesNotExistError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, UnauthorizedTokenActionError}; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{InvalidGroupPositionError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, NewTokensDestinationIdentityDoesNotExistError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, UnauthorizedTokenActionError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_destroy_frozen_funds_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_destroy_frozen_funds_transition_action/state_v0/mod.rs index 8eeeb520814..665c0eb651c 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_destroy_frozen_funds_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_destroy_frozen_funds_transition_action/state_v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::IdentityTokenAccountNotFrozenError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::IdentityTokenAccountNotFrozenError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_direct_purchase_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_direct_purchase_transition_action/state_v0/mod.rs index a172f48fb2e..9210e1006e2 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_direct_purchase_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_direct_purchase_transition_action/state_v0/mod.rs @@ -1,7 +1,7 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::TokenMintPastMaxSupplyError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::TokenMintPastMaxSupplyError; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use dpp::prelude::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_emergency_action_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_emergency_action_transition_action/state_v0/mod.rs index e6dfaa6a4df..2887cee71bc 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_emergency_action_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_emergency_action_transition_action/state_v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{TokenAlreadyPausedError, TokenNotPausedError}; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{TokenAlreadyPausedError, TokenNotPausedError}; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_freeze_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_freeze_transition_action/state_v0/mod.rs index a26fa757964..e0a90c7504e 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_freeze_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_freeze_transition_action/state_v0/mod.rs @@ -1,6 +1,6 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::IdentityTokenAccountAlreadyFrozenError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::IdentityTokenAccountAlreadyFrozenError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; @@ -16,9 +16,9 @@ use crate::platform_types::platform::PlatformStateRef; use crate::execution::types::execution_operation::ValidationOperation; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContextMethodsV0; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; use dpp::group::action_event::GroupActionEvent; use dpp::group::group_action::GroupActionAccessors; use dpp::tokens::info::v0::IdentityTokenInfoV0Accessors; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_mint_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_mint_transition_action/state_v0/mod.rs index 5de5aa44fab..7ba4aacdaba 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_mint_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_mint_transition_action/state_v0/mod.rs @@ -1,9 +1,9 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::identity::RecipientIdentityDoesNotExistError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{IdentityTokenAccountFrozenError, TokenMintPastMaxSupplyError}; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::identity::RecipientIdentityDoesNotExistError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{IdentityTokenAccountFrozenError, TokenMintPastMaxSupplyError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_transfer_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_transfer_transition_action/state_v0/mod.rs index fba3ee873ae..3fd3447e001 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_transfer_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_transfer_transition_action/state_v0/mod.rs @@ -1,7 +1,7 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountFrozenError, TokenIsPausedError, TokenTransferRecipientIdentityNotExistError}; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountFrozenError, TokenIsPausedError, TokenTransferRecipientIdentityNotExistError}; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use dpp::prelude::Identifier; use dpp::tokens::info::v0::IdentityTokenInfoV0Accessors; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_unfreeze_transition_action/state_v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_unfreeze_transition_action/state_v0/mod.rs index fa8c111f99f..6a79c6e1eb4 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_unfreeze_transition_action/state_v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/action_validation/token/token_unfreeze_transition_action/state_v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::IdentityTokenAccountNotFrozenError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::ModificationOfGroupActionMainParametersNotPermittedError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::IdentityTokenAccountNotFrozenError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/advanced_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/advanced_structure/v0/mod.rs index 122bd5e9f09..da920bac364 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/advanced_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/advanced_structure/v0/mod.rs @@ -1,18 +1,18 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::InvalidDocumentTransitionIdError; -use dpp::consensus::signature::{InvalidSignaturePublicKeySecurityLevelError, SignatureError}; +use dpp::errors::consensus::basic::document::InvalidDocumentTransitionIdError; +use dpp::errors::consensus::signature::{InvalidSignaturePublicKeySecurityLevelError, SignatureError}; use dpp::dashcore::Network; use dpp::document::Document; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::PartialIdentity; -use dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::state_transition::{StateTransitionIdentitySigned, StateTransitionLike}; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::batched_transition::BatchedTransitionRef; -use dpp::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; @@ -21,7 +21,7 @@ use drive::state_transition_action::batch::BatchTransitionAction; use crate::execution::validation::state_transition::state_transitions::batch::action_validation::document::document_replace_transition_action::DocumentReplaceTransitionActionValidation; use crate::execution::validation::state_transition::state_transitions::batch::action_validation::document::document_delete_transition_action::DocumentDeleteTransitionActionValidation; use crate::execution::validation::state_transition::state_transitions::batch::action_validation::document::document_create_transition_action::DocumentCreateTransitionActionValidation; -use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; use drive::state_transition_action::batch::batched_transition::BatchedTransitionAction; use drive::state_transition_action::batch::batched_transition::document_transition::document_delete_transition_action::v0::DocumentDeleteTransitionActionAccessorsV0; use drive::state_transition_action::batch::batched_transition::document_transition::document_purchase_transition_action::DocumentPurchaseTransitionActionAccessorsV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/mod.rs index 2b46fb66246..3a7344fb65d 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::execution::validation::state_transition::batch::balance::v0::DocumentsBatchTransitionBalanceValidationV0; use crate::execution::validation::state_transition::processor::v0::StateTransitionIdentityBalanceValidationV0; use dpp::identity::PartialIdentity; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/v0/mod.rs index 63b5472314a..9c025597aab 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/balance/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; -use dpp::consensus::basic::overflow_error::OverflowError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::overflow_error::OverflowError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::PartialIdentity; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::ProtocolError; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/context.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/context.rs index 3060e541601..1a9fe1c22f0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/context.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/context.rs @@ -1,6 +1,6 @@ use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; use crate::platform_types::platform::PlatformStateRef; -use dpp::prelude::*; +use dpp::identifier::Identifier; use drive::grovedb::TransactionArg; use std::fmt::{Debug, Formatter}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/executor.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/executor.rs index a85f1b6febb..2639cf5c3f7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/executor.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/executor.rs @@ -3,7 +3,7 @@ use crate::execution::validation::state_transition::batch::data_triggers::{ }; use drive::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; -use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionTypeGetter; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionTypeGetter; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; use dpp::version::PlatformVersion; use crate::execution::validation::state_transition::batch::data_triggers::bindings::data_trigger_binding::DataTriggerBinding; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/mod.rs index 21bdb917740..571e5c628aa 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/mod.rs @@ -5,7 +5,7 @@ use dpp::validation::SimpleValidationResult; use drive::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; use crate::error::Error; -use dpp::consensus::state::data_trigger::DataTriggerError; +use dpp::errors::consensus::state::data_trigger::DataTriggerError; use dpp::version::PlatformVersion; pub(super) use bindings::list::data_trigger_bindings_list; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dashpay/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dashpay/v0/mod.rs index ad43302fbba..fbb4bdea0b8 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dashpay/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dashpay/v0/mod.rs @@ -1,8 +1,8 @@ //! The `dashpay_data_triggers` module contains data triggers specific to the DashPay data contract. use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use dpp::ProtocolError; @@ -112,7 +112,7 @@ mod test { use crate::test::helpers::setup::TestPlatformBuilder; use super::*; use dpp::errors::consensus::state::data_trigger::DataTriggerError; - use dpp::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; + use dpp::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; use dpp::tests::fixtures::{get_contact_request_document_fixture, get_dashpay_contract_fixture, get_batched_transitions_fixture, get_identity_fixture}; use dpp::version::DefaultForPlatformVersion; use drive::drive::contract::DataContractFetchInfo; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dpns/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dpns/v0/mod.rs index cd7d7ba1a3b..6bf69845470 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dpns/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/dpns/v0/mod.rs @@ -1,6 +1,6 @@ -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contracts::dpns_contract::v1::document_types::domain::properties::PARENT_DOMAIN_NAME; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; /// The `dpns_triggers` module contains data triggers specific to the DPNS data contract. use dpp::util::hash::hash_double; use std::collections::BTreeMap; @@ -382,7 +382,7 @@ mod test { use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::test::helpers::setup::TestPlatformBuilder; use super::*; - use dpp::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; + use dpp::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; #[test] fn should_return_execution_result_on_dry_run() { diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/feature_flags/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/feature_flags/v0/mod.rs index d1cca4bf1ad..09fc5073fbd 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/feature_flags/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/feature_flags/v0/mod.rs @@ -2,8 +2,8 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/reject/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/reject/v0/mod.rs index 1fe229182f6..21f1934c680 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/reject/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/reject/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; use crate::error::Error; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/withdrawals/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/withdrawals/v0/mod.rs index c4c227f0461..813eb59bac4 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/withdrawals/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/data_triggers/triggers/withdrawals/v0/mod.rs @@ -9,8 +9,8 @@ use dpp::system_data_contracts::withdrawals_contract; use dpp::version::PlatformVersion; use drive::query::{DriveDocumentQuery, InternalClauses, WhereClause, WhereOperator}; use std::collections::BTreeMap; -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; -use dpp::{document, ProtocolError}; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; +use dpp::{document, errors::ProtocolError}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::DocumentV0Getters; use drive::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/identity_contract_nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/identity_contract_nonce/v0/mod.rs index 32829c45b70..7176cafbc4e 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/identity_contract_nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/identity_contract_nonce/v0/mod.rs @@ -1,9 +1,9 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; use dpp::identity::identity_nonce::{validate_identity_nonce_update, validate_new_identity_nonce}; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::state_transition::StateTransitionLike; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/mod.rs index 0e594bc5895..1686bdd1b11 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/mod.rs @@ -2,7 +2,7 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::execution::validation::state_transition::processor::v0::StateTransitionIsAllowedValidationV0; use crate::platform_types::platform::PlatformRef; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/v0/mod.rs index 82f7855f1c6..e21f22781a0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/is_allowed/v0/mod.rs @@ -1,11 +1,11 @@ use crate::platform_types::platform::PlatformRef; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use dpp::block::epoch::EpochIndex; -use dpp::consensus::basic::document::ContestedDocumentsTemporarilyNotAllowedError; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use dpp::state_transition::batch_transition::resolvers::v0::BatchTransitionResolversV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::errors::consensus::basic::document::ContestedDocumentsTemporarilyNotAllowedError; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::resolvers::v0::BatchTransitionResolversV0; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::validation::ConsensusValidationResult; // TARGET_EPOCH_INDEX was introduced without versioning. diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/mod.rs index af6a8cb1caf..ed2939de6a0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/mod.rs @@ -14,7 +14,7 @@ use dpp::block::block_info::BlockInfo; use dpp::dashcore::Network; use dpp::identity::PartialIdentity; use dpp::prelude::*; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/fetch_documents.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/fetch_documents.rs index 88e145b32f4..4e5b9bc72b7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/fetch_documents.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/fetch_documents.rs @@ -1,9 +1,11 @@ use crate::error::Error; use crate::platform_types::platform::PlatformStateRef; use dpp::block::epoch::Epoch; -use dpp::consensus::basic::document::{DataContractNotPresentError, InvalidDocumentTypeError}; -use dpp::consensus::basic::BasicError; use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dpp::errors::consensus::basic::document::{ + DataContractNotPresentError, InvalidDocumentTypeError, +}; +use dpp::errors::consensus::basic::BasicError; use std::collections::btree_map::Entry; use std::collections::BTreeMap; @@ -14,10 +16,10 @@ use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use dpp::document::Document; use dpp::fee::fee_result::FeeResult; use dpp::platform_value::{Identifier, Value}; -use dpp::state_transition::batch_transition::batched_transition::document_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::{ DocumentTransition, DocumentTransitionV0Methods, }; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use drive::drive::document::query::query_contested_documents_storage::QueryContestedDocumentsOutcomeV0Methods; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/mod.rs index cf0443849ce..0a9ef93e92c 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/state/v0/mod.rs @@ -1,8 +1,8 @@ use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::state_transition::StateTransitionLike; use drive::state_transition_action::StateTransitionAction; use dpp::version::{DefaultForPlatformVersion, PlatformVersion}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/transformer/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/transformer/v0/mod.rs index b580af61702..f9be018c20f 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/transformer/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/batch/transformer/v0/mod.rs @@ -4,31 +4,34 @@ use std::sync::Arc; use crate::error::Error; use crate::platform_types::platform::PlatformStateRef; -use dpp::consensus::basic::document::{DataContractNotPresentError, InvalidDocumentTypeError}; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::{ + DataContractNotPresentError, InvalidDocumentTypeError, +}; +use dpp::errors::consensus::basic::BasicError; -use dpp::consensus::state::document::document_not_found_error::DocumentNotFoundError; -use dpp::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; +use dpp::errors::consensus::state::document::document_not_found_error::DocumentNotFoundError; +use dpp::errors::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; -use dpp::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; -use dpp::consensus::state::state_error::StateError; use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dpp::errors::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; -use dpp::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; +use dpp::errors::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; +use dpp::errors::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; use dpp::document::property_names::PRICE; use dpp::document::{Document, DocumentV0Getters}; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use dpp::prelude::{Revision, UserFeeIncrease}; use dpp::validation::SimpleConsensusValidationResult; -use dpp::{consensus::ConsensusError, prelude::Identifier, validation::ConsensusValidationResult}; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::batched_transition::BatchedTransitionRef; -use dpp::state_transition::batch_transition::BatchTransition; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use dpp::{prelude::Identifier, validation::ConsensusValidationResult}; +use dpp::errors::consensus::ConsensusError; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; use dpp::state_transition::StateTransitionLike; use drive::state_transition_action::batch::batched_transition::document_transition::document_create_transition_action::DocumentCreateTransitionAction; use drive::state_transition_action::batch::batched_transition::document_transition::document_delete_transition_action::DocumentDeleteTransitionAction; @@ -40,13 +43,13 @@ use crate::execution::validation::state_transition::batch::state::v0::fetch_docu use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; -use dpp::state_transition::batch_transition::batched_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_transition::{DocumentTransition, DocumentTransitionV0Methods}; -use dpp::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; -use dpp::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::{DocumentTransition, DocumentTransitionV0Methods}; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use drive::drive::contract::DataContractFetchInfo; use drive::drive::Drive; use drive::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/advanced_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/advanced_structure/v0/mod.rs index 625392ee141..22406690a5d 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/advanced_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/advanced_structure/v0/mod.rs @@ -1,10 +1,10 @@ use crate::error::Error; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; use crate::execution::validation::state_transition::data_contract_create::advanced_structure::v1::DataContractCreatedStateTransitionAdvancedStructureValidationV1; -use dpp::consensus::basic::data_contract::InvalidDataContractVersionError; +use dpp::errors::consensus::basic::data_contract::InvalidDataContractVersionError; use dpp::data_contract::INITIAL_DATA_CONTRACT_VERSION; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::ConsensusValidationResult; use drive::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceAction; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/basic_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/basic_structure/v0/mod.rs index 3740a3d1971..e04fbfd52f5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/basic_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/basic_structure/v0/mod.rs @@ -1,19 +1,19 @@ use crate::error::Error; -use dpp::consensus::basic::data_contract::{ +use dpp::errors::consensus::basic::data_contract::{ DuplicateKeywordsError, InvalidDataContractVersionError, InvalidDescriptionLengthError, InvalidKeywordCharacterError, InvalidKeywordLengthError, InvalidTokenBaseSupplyError, NewTokensDestinationIdentityOptionRequiredError, NonContiguousContractTokenPositionsError, TooManyKeywordsError, }; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use dpp::data_contract::associated_token::token_distribution_rules::accessors::v0::TokenDistributionRulesV0Getters; use dpp::data_contract::associated_token::token_perpetual_distribution::methods::v0::TokenPerpetualDistributionV0Accessors; use dpp::data_contract::{TokenContractPosition, INITIAL_DATA_CONTRACT_VERSION}; -use dpp::prelude::DataContract; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::data_contract::DataContract; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use std::collections::HashSet; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/mod.rs index a220f2d16fa..0288fe775c2 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/mod.rs @@ -5,7 +5,7 @@ use crate::execution::validation::state_transition::data_contract_create::identi use crate::execution::validation::state_transition::processor::v0::StateTransitionNonceValidationV0; use crate::platform_types::platform::PlatformStateRef; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/v0/mod.rs index f47704af14f..370a6e13513 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/identity_nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/mod.rs index e7918294dfb..1ca0f3859f5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/mod.rs @@ -8,7 +8,7 @@ use basic_structure::v0::DataContractCreateStateTransitionBasicStructureValidati use dpp::block::block_info::BlockInfo; use dpp::identity::PartialIdentity; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; @@ -181,8 +181,8 @@ mod tests { use assert_matches::assert_matches; use dpp::balances::credits::TokenAmount; use dpp::block::block_info::BlockInfo; - use dpp::consensus::basic::BasicError; - use dpp::consensus::ConsensusError; + use dpp::errors::consensus::basic::BasicError; + use dpp::errors::consensus::ConsensusError; use dpp::dash_to_credits; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::DataContractV1Getters; @@ -203,8 +203,8 @@ mod tests { use dpp::platform_value::Value; use dpp::prelude::Identifier; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::data_contract_create_transition::methods::DataContractCreateTransitionMethodsV0; - use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; + use dpp::state_transition::state_transitions::contract::data_contract_create_transition::methods::DataContractCreateTransitionMethodsV0; + use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::tests::json_document::json_document_to_contract_with_ids; use dpp::tokens::calculate_token_id; use dpp::tokens::gas_fees_paid_by::GasFeesPaidBy; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/state/v0/mod.rs index dc72d28a481..681a6b8e54c 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/state/v0/mod.rs @@ -4,14 +4,14 @@ use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use std::collections::BTreeSet; -use dpp::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; -use dpp::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; -use dpp::consensus::state::group::IdentityMemberOfGroupNotFoundError; -use dpp::consensus::state::identity::identity_for_token_configuration_not_found_error::{ +use dpp::errors::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; +use dpp::errors::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; +use dpp::errors::consensus::state::group::IdentityMemberOfGroupNotFoundError; +use dpp::errors::consensus::state::identity::identity_for_token_configuration_not_found_error::{ IdentityInTokenConfigurationNotFoundError, TokenConfigurationIdentityContext, }; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{ +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{ InvalidTokenPositionStateError, PreProgrammedDistributionTimestampInPastError, }; use dpp::data_contract::accessors::v0::DataContractV0Getters; @@ -25,8 +25,8 @@ use dpp::data_contract::change_control_rules::authorized_action_takers::Authoriz use dpp::data_contract::document_type::accessors::DocumentTypeV1Getters; use dpp::data_contract::group::accessors::v0::GroupV0Getters; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::ProtocolError; use crate::error::execution::ExecutionError; @@ -438,14 +438,14 @@ mod tests { use crate::test::helpers::setup::TestPlatformBuilder; use assert_matches::assert_matches; use dpp::block::block_info::BlockInfo; - use dpp::consensus::basic::BasicError; - use dpp::consensus::ConsensusError; use dpp::data_contract::accessors::v0::DataContractV0Getters; - use dpp::data_contract::errors::DataContractError; + use dpp::data_contract::errors::contract::DataContractError; use dpp::data_contract::serialized_version::DataContractInSerializationFormat; + use dpp::errors::consensus::basic::BasicError; + use dpp::errors::consensus::ConsensusError; use dpp::platform_value::Value; use dpp::prelude::IdentityNonce; - use dpp::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; + use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use dpp::tests::fixtures::get_data_contract_fixture; use drive::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceActionAccessorsV0; use platform_version::{DefaultForPlatformVersion, TryIntoPlatformVersioned}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/mod.rs index 6b977fccd61..4509b5f8ff3 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/mod.rs @@ -1,5 +1,5 @@ use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::validation::SimpleConsensusValidationResult; use drive::grovedb::TransactionArg; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/v0/mod.rs index 2f012f5a0c4..966de52af5a 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/identity_contract_nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs index 71c2311bd1c..f034ceb3733 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs @@ -4,7 +4,7 @@ mod state; use basic_structure::v0::DataContractUpdateStateTransitionBasicStructureValidationV0; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::validation::{ConsensusValidationResult, SimpleConsensusValidationResult}; use dpp::version::PlatformVersion; @@ -91,34 +91,34 @@ mod tests { use crate::rpc::core::MockCoreRPCLike; use crate::test::helpers::setup::{TempPlatform, TestPlatformBuilder}; use dpp::block::block_info::BlockInfo; - use dpp::consensus::state::state_error::StateError; - use dpp::consensus::ConsensusError; use dpp::dash_to_credits; use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; + use dpp::errors::consensus::state::state_error::StateError; + use dpp::errors::consensus::ConsensusError; use rand::prelude::StdRng; use rand::SeedableRng; use std::collections::BTreeMap; use dpp::data_contract::DataContract; - use dpp::fee::Credits; + use dpp::balances::credits::Credits; use dpp::identifier::Identifier; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::{Identity, IdentityPublicKey, IdentityV0}; use dpp::platform_value::BinaryData; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; - use dpp::state_transition::data_contract_update_transition::{ + use dpp::state_transition::state_transitions::contract::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; + use dpp::state_transition::state_transitions::contract::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, }; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::platform_types::state_transitions_processing_result::StateTransitionExecutionResult; use assert_matches::assert_matches; - use dpp::consensus::basic::BasicError; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::group::v0::GroupV0; use dpp::data_contract::group::Group; + use dpp::errors::consensus::basic::BasicError; use dpp::tests::fixtures::get_data_contract_fixture; use dpp::tests::json_document::json_document_to_contract; use dpp::version::PlatformVersion; @@ -241,8 +241,8 @@ mod tests { use serde_json::json; use dpp::assert_state_consensus_errors; - use dpp::consensus::state::state_error::StateError; - use dpp::consensus::state::state_error::StateError::DataContractIsReadonlyError; + use dpp::errors::consensus::state::state_error::StateError; + use dpp::errors::consensus::state::state_error::StateError::DataContractIsReadonlyError; use dpp::errors::consensus::ConsensusError; use crate::execution::validation::state_transition::processor::v0::StateTransitionStateValidationV0; @@ -254,7 +254,7 @@ mod tests { use dpp::data_contract::serialized_version::DataContractInSerializationFormat; use dpp::platform_value::platform_value; - use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; + use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; use crate::execution::validation::state_transition::ValidationMode; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/mod.rs index 055835c15cb..4d8334471d7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/mod.rs @@ -8,7 +8,7 @@ use crate::platform_types::platform::PlatformRef; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::validation::ConsensusValidationResult; use drive::grovedb::TransactionArg; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/v0/mod.rs index b44ecb8b3b5..553365ccab0 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/state/v0/mod.rs @@ -4,15 +4,15 @@ use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use std::collections::BTreeSet; -use dpp::consensus::basic::document::DataContractNotPresentError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; -use dpp::consensus::state::group::IdentityMemberOfGroupNotFoundError; -use dpp::consensus::state::identity::identity_for_token_configuration_not_found_error::{ +use dpp::errors::consensus::basic::document::DataContractNotPresentError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; +use dpp::errors::consensus::state::group::IdentityMemberOfGroupNotFoundError; +use dpp::errors::consensus::state::identity::identity_for_token_configuration_not_found_error::{ IdentityInTokenConfigurationNotFoundError, TokenConfigurationIdentityContext, }; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::InvalidTokenPositionStateError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::InvalidTokenPositionStateError; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::accessors::v1::{DataContractV1Getters, DataContractV1Setters}; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; @@ -28,8 +28,8 @@ use dpp::data_contract::validate_update::DataContractUpdateValidationMethodsV0; use crate::error::execution::ExecutionError; use crate::execution::validation::state_transition::ValidationMode; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::version::PlatformVersion; use dpp::ProtocolError; use drive::grovedb::TransactionArg; @@ -506,13 +506,13 @@ mod tests { use crate::test::helpers::setup::TestPlatformBuilder; use assert_matches::assert_matches; use dpp::block::block_info::BlockInfo; - use dpp::consensus::ConsensusError; use dpp::data_contract::accessors::v0::DataContractV0Setters; - use dpp::data_contract::errors::DataContractError; + use dpp::data_contract::errors::contract::DataContractError; use dpp::data_contract::serialized_version::DataContractInSerializationFormat; + use dpp::errors::consensus::ConsensusError; use dpp::platform_value::Value; use dpp::prelude::IdentityNonce; - use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; + use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use dpp::tests::fixtures::get_data_contract_fixture; use drive::state_transition_action::system::bump_identity_data_contract_nonce_action::BumpIdentityDataContractNonceActionAccessorsV0; use platform_version::{DefaultForPlatformVersion, TryIntoPlatformVersioned}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/advanced_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/advanced_structure/v0/mod.rs index 10ccad492ba..46a606f5603 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/advanced_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/advanced_structure/v0/mod.rs @@ -4,13 +4,13 @@ use crate::execution::types::state_transition_execution_context::{ StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0, }; use crate::execution::validation::state_transition::identity_create::identity_and_signatures::v0::IdentityCreateStateTransitionIdentityAndSignaturesValidationV0; -use dpp::consensus::basic::invalid_identifier_error::InvalidIdentifierError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::invalid_identifier_error::InvalidIdentifierError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::state_transition::AssetLockProved; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::ConsensusValidationResult; use dpp::version::PlatformVersion; use dpp::ProtocolError; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/basic_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/basic_structure/v0/mod.rs index 9ac16266842..2131323095f 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/basic_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/basic_structure/v0/mod.rs @@ -1,9 +1,9 @@ use crate::error::Error; -use dpp::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::identity::state_transition::AssetLockProved; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/identity_and_signatures/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/identity_and_signatures/v0/mod.rs index 5d09fedb7ee..2451400a7f9 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/identity_and_signatures/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/identity_and_signatures/v0/mod.rs @@ -4,9 +4,9 @@ use crate::execution::types::state_transition_execution_context::{ StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0, }; use dpp::serialization::PlatformMessageSignable; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; use dpp::validation::SimpleConsensusValidationResult; pub(crate) trait IdentityCreateStateTransitionIdentityAndSignaturesValidationV0 { diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/mod.rs index 41f2e1604cc..d7036c93ef7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/mod.rs @@ -15,7 +15,7 @@ use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; @@ -204,8 +204,8 @@ mod tests { use dpp::native_bls::NativeBlsModule; use dpp::prelude::Identifier; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; - use dpp::state_transition::identity_create_transition::IdentityCreateTransition; + use dpp::state_transition::state_transitions::identity::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; + use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use dpp::state_transition::StateTransition; use dpp::tests::fixtures::instant_asset_lock_proof_fixture; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs index a2b66ae882b..251ff882727 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs @@ -3,21 +3,21 @@ use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use dpp::asset_lock::reduced_asset_lock_value::{AssetLockValue, AssetLockValueGettersV0}; use dpp::balances::credits::CREDITS_PER_DUFF; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; -use dpp::consensus::signature::{BasicECDSAError, SignatureError}; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; +use dpp::errors::consensus::signature::{BasicECDSAError, SignatureError}; -use dpp::consensus::state::identity::IdentityAlreadyExistsError; use dpp::dashcore::hashes::Hash; use dpp::dashcore::{signer, ScriptBuf, Txid}; +use dpp::errors::consensus::state::identity::IdentityAlreadyExistsError; use dpp::identity::KeyType; use dpp::identity::state_transition::AssetLockProved; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; use dpp::ProtocolError; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::state_transition::StateTransitionLike; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/mod.rs index fe390272c18..472eb148f3b 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::execution::validation::state_transition::identity_credit_transfer::balance::v0::IdentityCreditTransferTransitionBalanceValidationV0; use crate::execution::validation::state_transition::processor::v0::StateTransitionIdentityBalanceValidationV0; use dpp::identity::PartialIdentity; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/v0/mod.rs index 6ea45ee35e2..9003172fd83 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/balance/v0/mod.rs @@ -1,8 +1,8 @@ use crate::error::Error; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; use dpp::identity::PartialIdentity; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/mod.rs index a21e4049654..cbbcde991dc 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/mod.rs @@ -4,7 +4,7 @@ mod state; mod structure; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::{ConsensusValidationResult, SimpleConsensusValidationResult}; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/mod.rs index b6a24435f92..85bc1fcea7e 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/mod.rs @@ -5,7 +5,7 @@ use crate::execution::validation::state_transition::identity_credit_transfer::no use crate::execution::validation::state_transition::processor::v0::StateTransitionNonceValidationV0; use crate::platform_types::platform::PlatformStateRef; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/v0/mod.rs index 290f8a33179..747aea281ff 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/state/v0/mod.rs index 60cc63c19ce..5e6340644e1 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/state/v0/mod.rs @@ -2,13 +2,13 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; -use dpp::consensus::signature::IdentityNotFoundError; +use dpp::errors::consensus::signature::IdentityNotFoundError; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use drive::state_transition_action::identity::identity_credit_transfer::IdentityCreditTransferTransitionAction; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/structure/v0/mod.rs index 2d19799dccd..db65f40a715 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_transfer/structure/v0/mod.rs @@ -1,11 +1,11 @@ -use dpp::consensus::basic::identity::{ +use dpp::errors::consensus::basic::identity::{ IdentityCreditTransferToSelfError, InvalidIdentityCreditTransferAmountError, }; // use dpp::platform_value:: use crate::error::Error; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::validation::SimpleConsensusValidationResult; const MIN_TRANSFER_AMOUNT: u64 = 100000; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/mod.rs index edbfa3f1a6a..4d9e43ec277 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::execution::validation::state_transition::identity_credit_withdrawal::balance::v0::IdentityCreditTransferTransitionBalanceValidationV0; use crate::execution::validation::state_transition::processor::v0::StateTransitionIdentityBalanceValidationV0; use dpp::identity::PartialIdentity; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/v0/mod.rs index 0843ed7ec1d..3ee9f06d715 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/balance/v0/mod.rs @@ -1,8 +1,8 @@ use crate::error::Error; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; use dpp::identity::PartialIdentity; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::error::execution::ExecutionError; use dpp::validation::SimpleConsensusValidationResult; @@ -50,10 +50,10 @@ mod tests { use super::*; use assert_matches::assert_matches; - use dpp::consensus::state::state_error::StateError; - use dpp::consensus::ConsensusError; + use dpp::errors::consensus::state::state_error::StateError; + use dpp::errors::consensus::ConsensusError; use dpp::prelude::Identifier; - use dpp::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; + use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use platform_version::version::v1::PLATFORM_V1; mod validate_advanced_minimum_balance_pre_check_v0 { diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/mod.rs index 3b42e8e744f..6f30412bfb5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/mod.rs @@ -5,7 +5,7 @@ mod state; mod structure; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::{ConsensusValidationResult, SimpleConsensusValidationResult}; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; @@ -140,16 +140,16 @@ mod tests { use crate::test::helpers::setup::TestPlatformBuilder; use assert_matches::assert_matches; use dpp::block::block_info::BlockInfo; - use dpp::consensus::basic::BasicError; - use dpp::consensus::ConsensusError; use dpp::dash_to_credits; + use dpp::errors::consensus::basic::BasicError; + use dpp::errors::consensus::ConsensusError; use dpp::identity::core_script::CoreScript; use dpp::identity::KeyType::{ECDSA_HASH160, ECDSA_SECP256K1}; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::identity_credit_withdrawal_transition::methods::{ + use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::methods::{ IdentityCreditWithdrawalTransitionMethodsV0, PreferredKeyPurposeForSigningWithdrawal, }; - use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; + use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::withdrawal::Pooling; use platform_version::version::v1::PROTOCOL_VERSION_1; use platform_version::version::PlatformVersion; @@ -531,7 +531,7 @@ mod tests { mod errors { use super::*; - use dpp::consensus::state::state_error::StateError; + use dpp::errors::consensus::state::state_error::StateError; #[test] fn test_credit_withdrawal_without_withdrawal_address_with_a_non_payable_transfer_key() { let platform_version = PlatformVersion::latest(); diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/mod.rs index 8676f0eb75e..6623f3fc471 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/mod.rs @@ -5,7 +5,7 @@ use crate::execution::validation::state_transition::identity_credit_withdrawal:: use crate::execution::validation::state_transition::processor::v0::StateTransitionNonceValidationV0; use crate::platform_types::platform::PlatformStateRef; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/v0/mod.rs index f99d11d9a80..15d5f39d223 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/mod.rs index d82846f84ed..54b0432349b 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/mod.rs @@ -2,7 +2,7 @@ pub(crate) mod v0; use crate::error::Error; use dpp::identity::PartialIdentity; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use crate::error::execution::ExecutionError; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/v0/mod.rs index 4bdd1ff1a2c..f464b2adb54 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/signature_purpose_matches_requirements/v0/mod.rs @@ -1,10 +1,10 @@ use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::consensus::basic::identity::WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError; +use dpp::errors::consensus::basic::identity::WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{PartialIdentity, Purpose}; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::identity::{PartialIdentity, identity_public_key::Purpose}; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/state/v0/mod.rs index 87eff3dbaac..f4fb845c959 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/state/v0/mod.rs @@ -4,7 +4,7 @@ use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::execution::types::execution_operation::ValidationOperation; use crate::execution::types::state_transition_execution_context::{ diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v0/mod.rs index d69627cf842..a4b08e18be9 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v0/mod.rs @@ -1,7 +1,7 @@ use crate::error::Error; -use dpp::consensus::basic::{BasicError, UnsupportedFeatureError}; -use dpp::consensus::ConsensusError; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::errors::consensus::basic::{BasicError, UnsupportedFeatureError}; +use dpp::errors::consensus::ConsensusError; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v1/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v1/mod.rs index f3898d0b0dd..dad4efd1a0c 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_credit_withdrawal/structure/v1/mod.rs @@ -1,14 +1,14 @@ -use dpp::consensus::basic::identity::{ +use dpp::errors::consensus::basic::identity::{ InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityCreditWithdrawalTransitionCoreFeeError, InvalidIdentityCreditWithdrawalTransitionOutputScriptError, NotImplementedIdentityCreditWithdrawalTransitionPoolingError, }; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use crate::error::Error; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::{ +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::{ IdentityCreditWithdrawalTransition, MIN_CORE_FEE_PER_BYTE, MIN_WITHDRAWAL_AMOUNT, }; use dpp::util::is_fibonacci_number::is_fibonacci_number; @@ -84,10 +84,10 @@ mod tests { use super::*; use assert_matches::assert_matches; - use dpp::consensus::basic::BasicError; use dpp::dashcore::ScriptBuf; + use dpp::errors::consensus::basic::BasicError; use dpp::identity::core_script::CoreScript; - use dpp::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; + use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use platform_version::version::v1::PLATFORM_V1; use rand::SeedableRng; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/identity_retrieval/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/identity_retrieval/v0/mod.rs index 2b49d301aa7..c4558589d29 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/identity_retrieval/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/identity_retrieval/v0/mod.rs @@ -1,11 +1,11 @@ use crate::error::Error; -use dpp::consensus::signature::{IdentityNotFoundError, SignatureError}; +use dpp::errors::consensus::signature::{IdentityNotFoundError, SignatureError}; use dpp::identity::PartialIdentity; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::version::PlatformVersion; use crate::execution::types::execution_operation::{RetrieveIdentityInfo, ValidationOperation}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/mod.rs index 4c8ea80995c..fc0f64958a6 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/mod.rs @@ -1,7 +1,7 @@ pub(crate) mod identity_retrieval; mod structure; mod transform_into_action; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::validation::{ConsensusValidationResult, SimpleConsensusValidationResult}; use dpp::version::PlatformVersion; @@ -110,8 +110,8 @@ mod tests { use dpp::identity::{Identity, IdentityPublicKey, IdentityV0}; use dpp::prelude::Identifier; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; - use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; + use dpp::state_transition::state_transitions::identity::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; + use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::StateTransition; use dpp::tests::fixtures::instant_asset_lock_proof_fixture; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/structure/v0/mod.rs index 6a8be703cff..24149848122 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/structure/v0/mod.rs @@ -1,7 +1,7 @@ use crate::error::Error; use dpp::identity::state_transition::AssetLockProved; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs index 681ec99ab7c..191c125c120 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/transform_into_action/v0/mod.rs @@ -3,18 +3,18 @@ use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use dpp::asset_lock::reduced_asset_lock_value::{AssetLockValue, AssetLockValueGettersV0}; use dpp::balances::credits::CREDITS_PER_DUFF; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; -use dpp::consensus::signature::{BasicECDSAError, SignatureError}; use dpp::dashcore::hashes::Hash; use dpp::dashcore::{signer, ScriptBuf, Txid}; +use dpp::errors::consensus::signature::{BasicECDSAError, SignatureError}; use dpp::identity::state_transition::AssetLockProved; use dpp::identity::KeyType; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::state_transition::StateTransitionLike; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/advanced_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/advanced_structure/v0/mod.rs index a5071a5d3a0..527b52a01f1 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/advanced_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/advanced_structure/v0/mod.rs @@ -1,8 +1,8 @@ use crate::error::execution::ExecutionError::CorruptedCodeExecution; use crate::error::Error; -use dpp::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::identity::PartialIdentity; @@ -12,9 +12,9 @@ use crate::execution::types::state_transition_execution_context::{ StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0, }; use dpp::serialization::PlatformMessageSignable; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; use dpp::validation::ConsensusValidationResult; use drive::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceAction; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/basic_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/basic_structure/v0/mod.rs index 2252d0192c4..e21bd1b1a95 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/basic_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/basic_structure/v0/mod.rs @@ -1,14 +1,14 @@ use crate::error::Error; -use dpp::consensus::basic::identity::{ +use dpp::errors::consensus::basic::identity::{ DisablingKeyIdAlsoBeingAddedInSameTransitionError, DuplicatedIdentityPublicKeyIdBasicError, InvalidIdentityUpdateTransitionEmptyError, }; -use dpp::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; -use dpp::consensus::ConsensusError; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; -use dpp::state_transition::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::errors::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; +use dpp::errors::consensus::ConsensusError; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::IdentityPublicKeyInCreationV0Getters; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use std::collections::HashSet; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs index b20695ead45..0b9efa8a5d4 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/mod.rs @@ -4,7 +4,7 @@ mod nonce; mod state; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use dpp::validation::{ConsensusValidationResult, SimpleConsensusValidationResult}; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; @@ -120,12 +120,11 @@ mod tests { use crate::test::helpers::setup::TestPlatformBuilder; use assert_matches::assert_matches; use dpp::block::block_info::BlockInfo; - use dpp::consensus::ConsensusError; use dpp::dash_to_credits; use dpp::dashcore::key::{Keypair, Secp256k1}; use dpp::dashcore::signer; use dpp::data_contract::accessors::v0::DataContractV0Getters; - use dpp::identifier::Identifier; + use dpp::errors::consensus::ConsensusError; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::contract_bounds::ContractBounds; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; @@ -133,13 +132,14 @@ mod tests { use dpp::identity::KeyType::ECDSA_SECP256K1; use dpp::identity::{KeyType, Purpose, SecurityLevel}; use dpp::serialization::{PlatformSerializable, Signable}; - use dpp::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; - use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; + use dpp::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; + use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; + use dpp::state_transition::state_transitions::identity::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use dpp::state_transition::proof_result::StateTransitionProofResult; - use dpp::state_transition::public_key_in_creation::v0::IdentityPublicKeyInCreationV0; use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::state_transition::StateTransition; use drive::drive::Drive; + use platform_value::Identifier; use platform_version::version::PlatformVersion; use rand::rngs::StdRng; use rand::SeedableRng; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/mod.rs index 30f81ef9996..991bc69d51e 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/mod.rs @@ -5,7 +5,7 @@ use crate::execution::validation::state_transition::identity_update::nonce::v0:: use crate::execution::validation::state_transition::processor::v0::StateTransitionNonceValidationV0; use crate::platform_types::platform::PlatformStateRef; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/v0/mod.rs index fc51a636c58..b312d400bc2 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/state/v0/mod.rs index 08997950bf5..f6e658fde68 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_update/state/v0/mod.rs @@ -5,14 +5,14 @@ use crate::rpc::core::CoreRPCLike; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use dpp::version::PlatformVersion; use drive::state_transition_action::identity::identity_update::IdentityUpdateTransitionAction; use drive::state_transition_action::StateTransitionAction; use drive::grovedb::TransactionArg; -use dpp::version::DefaultForPlatformVersion; +use platform_version::DefaultForPlatformVersion; use drive::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceAction; use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext; use crate::execution::validation::state_transition::common::validate_identity_public_key_contract_bounds::validate_identity_public_keys_contract_bounds; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/mod.rs index 40cc8ef3c5a..00011945a95 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/mod.rs @@ -7,7 +7,7 @@ use dpp::block::block_info::BlockInfo; use dpp::dashcore::Network; use dpp::identity::PartialIdentity; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/v0/mod.rs index 0773f388402..a7976e80541 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/advanced_structure/v0/mod.rs @@ -4,14 +4,15 @@ use crate::execution::types::execution_operation::ValidationOperation; use crate::execution::types::state_transition_execution_context::{ StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0, }; -use dpp::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; -use dpp::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; -use dpp::identifier::MasternodeIdentifiers; -use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; +use dpp::errors::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; +use dpp::errors::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; +use dpp::identifier::{Identifier, MasternodeIdentifiers}; +use dpp::identity::identity_public_key::hash::IdentityPublicKeyHashMethodsV0; +// use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::PartialIdentity; -use dpp::prelude::{ConsensusValidationResult, Identifier}; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::prelude::ConsensusValidationResult; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::state_transition::StateTransitionIdentitySigned; use drive::state_transition_action::identity::masternode_vote::MasternodeVoteTransitionAction; use drive::state_transition_action::StateTransitionAction; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/mod.rs index 8fd9438e1d7..4434b58b7ff 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/mod.rs @@ -6,7 +6,7 @@ use crate::execution::validation::state_transition::processor::v0::StateTransiti use dpp::fee::Credits; use dpp::prefunded_specialized_balance::PrefundedSpecializedBalanceIdentifier; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::version::PlatformVersion; use drive::drive::Drive; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/v0/mod.rs index f5c7a563097..ba41ce2a1fc 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/balance/v0/mod.rs @@ -1,12 +1,12 @@ use std::collections::BTreeMap; -use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; -use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; +use dpp::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; +use dpp::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; use crate::error::Error; use dpp::fee::Credits; use dpp::prefunded_specialized_balance::PrefundedSpecializedBalanceIdentifier; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::error::execution::ExecutionError; use crate::execution::types::execution_operation::ValidationOperation; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/mod.rs index 2b05033c352..b165515b51c 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/mod.rs @@ -5,7 +5,7 @@ mod state; mod transform_into_action; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::validation::ConsensusValidationResult; use drive::state_transition_action::StateTransitionAction; @@ -104,7 +104,7 @@ mod tests { use drive::util::object_size_info::DataContractResolvedInfo; use drive::drive::votes::resolved::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePollWithContractInfoAllowBorrowed; use dpp::identifier::Identifier; - use dpp::prelude::DataContract; + use dpp::data_contract::DataContract; use dpp::util::strings::convert_to_homograph_safe_chars; use drive::query::vote_polls_by_document_type_query::ResolvedVotePollsByDocumentTypeQuery; use crate::platform_types::platform_state::PlatformState; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/mod.rs index 79818202cde..e1ff08cc425 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/mod.rs @@ -6,7 +6,7 @@ use crate::execution::validation::state_transition::masternode_vote::nonce::v1:: use crate::execution::validation::state_transition::processor::v0::StateTransitionNonceValidationV0; use crate::platform_types::platform::PlatformStateRef; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v0/mod.rs index fd9ea2cc165..219a46ab4db 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v1/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v1/mod.rs index 6fa254f7fbe..8ee86d97baf 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v1/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/nonce/v1/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::basic::BasicError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::basic::BasicError; use dpp::identity::identity_nonce::{ validate_identity_nonce_update, validate_new_identity_nonce, MISSING_IDENTITY_REVISIONS_FILTER, }; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/state/v0/mod.rs index cde77903a56..12bf174be55 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/state/v0/mod.rs @@ -1,12 +1,12 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; -use dpp::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; +use dpp::errors::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; +use dpp::errors::consensus::ConsensusError; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use crate::error::execution::ExecutionError; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs index b49fbe56eaa..7a0c4fdf48b 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/masternode_vote/transform_into_action/v0/mod.rs @@ -1,17 +1,17 @@ use crate::error::Error; use crate::platform_types::platform::PlatformRef; use dashcore_rpc::dashcore_rpc_json::MasternodeType; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; -use dpp::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; -use dpp::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; -use dpp::consensus::ConsensusError; use dpp::dashcore::hashes::Hash; use dpp::dashcore::ProTxHash; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; +use dpp::errors::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; +use dpp::errors::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; +use dpp::errors::consensus::ConsensusError; use dpp::prelude::ConsensusValidationResult; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use drive::state_transition_action::identity::masternode_vote::MasternodeVoteTransitionAction; use crate::execution::validation::state_transition::ValidationMode; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs index 9d402e22339..cca37e2a0c6 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs @@ -96,14 +96,13 @@ pub(in crate::execution) mod tests { use dpp::fee::fee_result::FeeResult; use dpp::identifier::MasternodeIdentifiers; use dpp::identity::accessors::IdentityGettersV0; - use dpp::identity::contract_bounds::ContractBounds; - use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; + use dpp::identity::ContractBounds; use dpp::platform_value::{Bytes32, Value}; use dpp::serialization::PlatformSerializable; - use dpp::state_transition::batch_transition::BatchTransition; - use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; - use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; - use dpp::state_transition::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; + use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; + use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; + use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; + use dpp::state_transition::state_transitions::identity::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; use dpp::state_transition::StateTransition; use dpp::tokens::calculate_token_id; use dpp::util::hash::hash_double; diff --git a/packages/rs-drive-abci/src/mimic/mod.rs b/packages/rs-drive-abci/src/mimic/mod.rs index 53a869211b9..d129385bab1 100644 --- a/packages/rs-drive-abci/src/mimic/mod.rs +++ b/packages/rs-drive-abci/src/mimic/mod.rs @@ -14,8 +14,8 @@ use crate::rpc::core::CoreRPCLike; use ciborium::Value as CborValue; use dpp::block::block_info::BlockInfo; use dpp::bls_signatures::SignatureSchemes; -use dpp::consensus::ConsensusError; use dpp::dashcore::hashes::Hash; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; use dpp::platform_value::string_encoding::{decode, Encoding}; use dpp::platform_value::Value; diff --git a/packages/rs-drive-abci/src/platform_types/event_execution_result/mod.rs b/packages/rs-drive-abci/src/platform_types/event_execution_result/mod.rs index bf821deaba9..55c0399e7c3 100644 --- a/packages/rs-drive-abci/src/platform_types/event_execution_result/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/event_execution_result/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::fee::fee_result::FeeResult; diff --git a/packages/rs-drive-abci/src/platform_types/masternode/mod.rs b/packages/rs-drive-abci/src/platform_types/masternode/mod.rs index f6c6d094130..8cb9e394986 100644 --- a/packages/rs-drive-abci/src/platform_types/masternode/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/masternode/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::platform_types::masternode::v0::MasternodeV0; use bincode::{Decode, Encode}; use dashcore_rpc::json::MasternodeListItem; -use dpp::version::{PlatformVersion, TryFromPlatformVersioned}; +use platform_version::{version::PlatformVersion, TryFromPlatformVersioned}; mod accessors; /// Version 0 diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs index d52f4904336..fd4cdffda7f 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs @@ -13,13 +13,16 @@ use derive_more::From; use dpp::bincode::{config, Decode, Encode}; use dpp::block::epoch::Epoch; use dpp::block::extended_block_info::ExtendedBlockInfo; -use dpp::dashcore::{ProTxHash, QuorumHash}; +// use dpp::dashcore::{ProTxHash, QuorumHash}; +use dashcore_rpc::dashcore::{ProTxHash, QuorumHash}; use dpp::serialization::{PlatformDeserializableFromVersionedStructure, PlatformSerializable}; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::{PlatformVersion, TryFromPlatformVersioned, TryIntoPlatformVersioned}; use dpp::ProtocolError; use indexmap::IndexMap; +use platform_version::{ + version::PlatformVersion, TryFromPlatformVersioned, TryIntoPlatformVersioned, +}; use crate::config::PlatformConfig; use crate::error::execution::ExecutionError; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/patch_platform_version.rs b/packages/rs-drive-abci/src/platform_types/platform_state/patch_platform_version.rs index ea85c30256a..66262535e2e 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/patch_platform_version.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/patch_platform_version.rs @@ -1,15 +1,12 @@ use crate::error::execution::ExecutionError; use crate::error::Error; -use dpp::prelude::BlockHeight; -use dpp::version::patches::PATCHES; -use dpp::version::PlatformVersion; -use dpp::version::INITIAL_PROTOCOL_VERSION; -use std::sync::atomic::{AtomicU32, Ordering}; - use crate::platform_types::platform_state::v0::{ PlatformStateV0Methods, PlatformStateV0PrivateMethods, }; use crate::platform_types::platform_state::PlatformState; +use dpp::prelude::BlockHeight; +use platform_version::version::{patches::PATCHES, PlatformVersion, INITIAL_PROTOCOL_VERSION}; +use std::sync::atomic::{AtomicU32, Ordering}; static PATCHED_PROTOCOL_VERSION: AtomicU32 = AtomicU32::new(INITIAL_PROTOCOL_VERSION); diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs index cf8ea67b8c9..af252985e7d 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs @@ -19,7 +19,7 @@ use crate::platform_types::masternode::Masternode; use crate::platform_types::validator_set::ValidatorSet; use dpp::block::block_info::{BlockInfo, DEFAULT_BLOCK_INFO}; use dpp::block::extended_block_info::v0::ExtendedBlockInfoV0Getters; -use dpp::version::{PlatformVersion, TryIntoPlatformVersioned}; +use platform_version::{version::PlatformVersion, TryIntoPlatformVersioned}; use crate::config::PlatformConfig; use crate::platform_types::signature_verification_quorum_set::{ @@ -30,8 +30,8 @@ use dpp::fee::default_costs::{ CachedEpochIndexFeeVersions, CachedEpochIndexFeeVersionsFieldsBeforeVersion4, EpochIndexFeeVersionsForStorage, }; -use dpp::version::fee::FeeVersion; use itertools::Itertools; +use platform_version::version::fee::FeeVersion; use std::collections::BTreeMap; use std::fmt::{Debug, Formatter}; diff --git a/packages/rs-drive-abci/src/platform_types/state_transitions_processing_result/mod.rs b/packages/rs-drive-abci/src/platform_types/state_transitions_processing_result/mod.rs index fdcfa1ed93d..d05a38d82bf 100644 --- a/packages/rs-drive-abci/src/platform_types/state_transitions_processing_result/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/state_transitions_processing_result/mod.rs @@ -1,4 +1,4 @@ -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use crate::error::Error; use crate::platform_types::event_execution_result::EstimatedFeeResult; diff --git a/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contract_history/v0/mod.rs b/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contract_history/v0/mod.rs index 328f2ac307f..0f5f4fc85ce 100644 --- a/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contract_history/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contract_history/v0/mod.rs @@ -8,7 +8,7 @@ use dpp::identifier::Identifier; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; -use dpp::{check_validation_result_with_data, ProtocolError}; +use dpp::{check_validation_result_with_data, errors::ProtocolError}; use dapi_grpc::platform::v0::get_data_contract_history_response::get_data_contract_history_response_v0::DataContractHistoryEntry; use crate::platform_types::platform_state::PlatformState; diff --git a/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contracts/v0/mod.rs b/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contracts/v0/mod.rs index 12b52e050a7..1db718855c0 100644 --- a/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contracts/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/data_contract_based_queries/data_contracts/v0/mod.rs @@ -13,7 +13,7 @@ use dpp::platform_value::Bytes32; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; -use dpp::{check_validation_result_with_data, ProtocolError}; +use dpp::{check_validation_result_with_data, errors::ProtocolError}; impl Platform { pub(super) fn query_data_contracts_v0( diff --git a/packages/rs-drive-abci/src/query/identity_based_queries/identities_contract_keys/v0/mod.rs b/packages/rs-drive-abci/src/query/identity_based_queries/identities_contract_keys/v0/mod.rs index 62cc1202c81..4e0b0f0e7db 100644 --- a/packages/rs-drive-abci/src/query/identity_based_queries/identities_contract_keys/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/identity_based_queries/identities_contract_keys/v0/mod.rs @@ -8,7 +8,7 @@ use dapi_grpc::platform::v0::get_identities_contract_keys_response::{ get_identities_contract_keys_response_v0, GetIdentitiesContractKeysResponseV0, }; use dpp::check_validation_result_with_data; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use dpp::platform_value::Bytes32; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; @@ -135,9 +135,10 @@ mod tests { use dpp::block::epoch::Epoch; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::identity::accessors::IdentityGettersV0; - use dpp::identity::contract_bounds::ContractBounds; + use dpp::identity::ContractBounds; use dpp::identity::{Identity, KeyID, KeyType, Purpose, SecurityLevel}; - use dpp::prelude::{Identifier, IdentityPublicKey}; + use dpp::prelude::Identifier; + use dpp::identity::IdentityPublicKey; use dpp::serialization::PlatformDeserializable; use drive::util::test_helpers::test_utils::identities::create_test_identity_with_rng; use rand::prelude::StdRng; diff --git a/packages/rs-drive-abci/src/query/identity_based_queries/keys/v0/mod.rs b/packages/rs-drive-abci/src/query/identity_based_queries/keys/v0/mod.rs index 3cc854832d4..a054bb2ca50 100644 --- a/packages/rs-drive-abci/src/query/identity_based_queries/keys/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/identity_based_queries/keys/v0/mod.rs @@ -12,7 +12,7 @@ use drive::error::query::QuerySyntaxError; use std::collections::BTreeMap; use crate::platform_types::platform_state::PlatformState; -use dpp::identity::{KeyID, Purpose, SecurityLevel}; +use dpp::identity::identity_public_key::{KeyID, Purpose, SecurityLevel}; use dpp::validation::ValidationResult; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{ diff --git a/packages/rs-drive-abci/src/test/fixture/abci.rs b/packages/rs-drive-abci/src/test/fixture/abci.rs index 45abd250ca1..3256d2dc8e4 100644 --- a/packages/rs-drive-abci/src/test/fixture/abci.rs +++ b/packages/rs-drive-abci/src/test/fixture/abci.rs @@ -3,7 +3,7 @@ use crate::config::PlatformConfig; use dpp::version::PlatformVersion; -use dpp::version::ProtocolVersion; +use platform_version::version::ProtocolVersion; use tenderdash_abci::proto::abci::RequestInitChain; use tenderdash_abci::proto::google::protobuf::Timestamp; use tenderdash_abci::proto::types::{ConsensusParams, VersionParams}; diff --git a/packages/rs-drive-abci/src/test/helpers/fee_pools.rs b/packages/rs-drive-abci/src/test/helpers/fee_pools.rs index 443cc03b900..047de92ecde 100644 --- a/packages/rs-drive-abci/src/test/helpers/fee_pools.rs +++ b/packages/rs-drive-abci/src/test/helpers/fee_pools.rs @@ -35,8 +35,8 @@ use std::borrow::Cow; use std::collections::BTreeMap; +use dpp::identifier::Identifier; use dpp::platform_value::Value; -use dpp::prelude::Identifier; use drive::dpp::identity::Identity; use rand::rngs::StdRng; use rand::{Rng, SeedableRng}; diff --git a/packages/rs-drive-abci/src/test/helpers/setup.rs b/packages/rs-drive-abci/src/test/helpers/setup.rs index 08d56b2dc56..b7018804cc2 100644 --- a/packages/rs-drive-abci/src/test/helpers/setup.rs +++ b/packages/rs-drive-abci/src/test/helpers/setup.rs @@ -11,13 +11,13 @@ use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::MockCoreRPCLike; use crate::{config::PlatformConfig, rpc::core::DefaultCoreRPC}; use dpp::block::block_info::BlockInfo; +use dpp::data_contract::DataContract; use dpp::document::transfer::Transferable; use dpp::nft::TradeMode; -use dpp::prelude::{CoreBlockHeight, DataContract, TimestampMillis}; +use dpp::prelude::{CoreBlockHeight, TimestampMillis}; use dpp::tests::json_document::json_document_to_contract; -use dpp::version::PlatformVersion; -use dpp::version::ProtocolVersion; use drive::util::storage_flags::StorageFlags; +use platform_version::version::{PlatformVersion, ProtocolVersion}; use tempfile::TempDir; /// A test platform builder. diff --git a/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs b/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs index 0b05b3df924..1fad9a69ab9 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs @@ -3,7 +3,7 @@ use dashcore_rpc::dashcore_rpc_json::{DMNState, MasternodeListItem, MasternodeTy use dpp::bls_signatures::{Bls12381G2Impl, SecretKey as BlsPrivateKey}; use dpp::dashcore::hashes::Hash; use dpp::dashcore::{ProTxHash, QuorumHash, Txid}; -use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; +use dpp::identity::identity_public_key::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::IdentityPublicKey; use drive_abci::mimic::test_quorum::TestQuorumInfo; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs index 0d88b21ca5c..0e85c776162 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs @@ -4,13 +4,13 @@ use crate::BlockHeight; use dpp::block::block_info::BlockInfo; use dpp::dashcore::{Network, PrivateKey}; use dpp::dashcore::{ProTxHash, QuorumHash}; -use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; use dpp::ProtocolError; use dpp::dashcore::secp256k1::SecretKey; use dpp::data_contract::document_type::random_document::CreateRandomDocument; use dpp::data_contract::{DataContract, DataContractFactory}; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use strategy_tests::frequency::Frequency; use strategy_tests::operations::FinalizeBlockOperation::IdentityAddKeys; use strategy_tests::operations::{ @@ -18,12 +18,15 @@ use strategy_tests::operations::{ OperationType, TokenOp, }; +use dpp::balances::credits::Credits; use dpp::document::DocumentV0Getters; -use dpp::fee::Credits; -use dpp::identity::{Identity, IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + Identity, IdentityPublicKey, KeyID, KeyType, +}; use dpp::serialization::PlatformSerializableWithPlatformVersion; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::state_transition::StateTransition; use dpp::util::deserializer::ProtocolVersion; use dpp::version::PlatformVersion; @@ -36,35 +39,33 @@ use dpp::dashcore::hashes::Hash; use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::document_type::v0::DocumentTypeV0; -use dpp::identifier::MasternodeIdentifiers; +use dpp::identifier::{Identifier, MasternodeIdentifiers}; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; -use dpp::identity::KeyType::ECDSA_SECP256K1; +use dpp::identity::state_transition::asset_lock_proof::{AssetLockProof, InstantAssetLockProof}; use dpp::platform_value::{BinaryData, Value}; -use dpp::prelude::{AssetLockProof, Identifier, IdentityNonce}; -use dpp::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::{ +use dpp::prelude::IdentityNonce; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::{ BatchedTransition, DocumentDeleteTransition, DocumentReplaceTransition, DocumentTransferTransition, }; -use dpp::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; -use dpp::state_transition::batch_transition::document_create_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_create_transition::{ DocumentCreateTransition, DocumentCreateTransitionV0, }; -use dpp::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; -use dpp::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0; -use dpp::state_transition::batch_transition::token_transfer_transition::TokenTransferTransitionV0; -use dpp::state_transition::batch_transition::{ - BatchTransition, BatchTransitionV0, BatchTransitionV1, TokenMintTransition, - TokenTransferTransition, -}; -use dpp::state_transition::data_contract_create_transition::methods::v0::DataContractCreateTransitionMethodsV0; -use dpp::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; -use dpp::state_transition::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::v0::TokenBaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_mint_transition::TokenMintTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::{BatchTransition, BatchTransitionV0, BatchTransitionV1}; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::TokenMintTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_transfer_transition::TokenTransferTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::methods::v0::DataContractCreateTransitionMethodsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::tokens::calculate_token_id; use dpp::tokens::token_event::TokenEvent; use dpp::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; @@ -618,7 +619,7 @@ impl NetworkStrategy { ); } - let current_identities_as_refs: Vec<&dpp::identity::Identity> = + let current_identities_as_refs: Vec<&Identity> = current_identities.iter().collect(); let documents = document_type @@ -748,7 +749,7 @@ impl NetworkStrategy { ) .expect("expected random_documents_with_params") } else { - let current_identities_as_refs: Vec<&dpp::identity::Identity> = + let current_identities_as_refs: Vec<&Identity> = current_identities.iter().collect(); document_type @@ -1759,7 +1760,7 @@ impl NetworkStrategy { platform_config: &PlatformConfig, platform_version: &PlatformVersion, ) -> StateTransition { - let (_, pk) = ECDSA_SECP256K1 + let (_, pk) = KeyType::ECDSA_SECP256K1 .random_public_and_private_key_data(rng, platform_version) .unwrap(); let sk: [u8; 32] = pk.try_into().unwrap(); @@ -1898,7 +1899,7 @@ fn create_signed_instant_asset_lock_proofs_for_identities( .into_iter() .map(|identity| { // Create instant asset lock proof - let (_, pk) = ECDSA_SECP256K1 + let (_, pk) = KeyType::ECDSA_SECP256K1 .random_public_and_private_key_data(rng, platform_version) .unwrap(); diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index 492781d97cc..0848ad38d72 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -14,6 +14,7 @@ mocks = [ "indexmap/serde", "dpp/data-contract-serde-conversion", ] +apple = ["ferment-macro"] [dependencies] @@ -35,6 +36,8 @@ dpp = { path = "../rs-dpp", features = [ bincode = { version = "=2.0.0-rc.3", features = ["serde"] } platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true } platform-serialization = { path = "../rs-platform-serialization" } +platform-value = { path = "../rs-platform-value" } +platform-version = { path = "../rs-platform-version" } tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.4.0", tag = "v1.4.0", features = [ "crypto", ], default-features = false } @@ -42,5 +45,6 @@ tracing = { version = "0.1.37" } serde = { version = "1.0.219", default-features = false, optional = true } serde_json = { version = "1.0", features = ["preserve_order"], optional = true } hex = { version = "0.4.3" } +ferment-macro = { version = "0.2", package = "ferment-macro", optional = true } indexmap = { version = "2.6.0" } -derive_more = { version = "1.0", features = ["from"] } +derive_more = { version = "1.0", features = ["from"] } \ No newline at end of file diff --git a/packages/rs-drive-proof-verifier/src/error.rs b/packages/rs-drive-proof-verifier/src/error.rs index 3e5839483bb..1c13e697ae3 100644 --- a/packages/rs-drive-proof-verifier/src/error.rs +++ b/packages/rs-drive-proof-verifier/src/error.rs @@ -99,6 +99,7 @@ pub enum Error { /// Errors returned by the context provider #[derive(Debug, thiserror::Error)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum ContextProviderError { /// Generic Context provider error #[error("Context provider error: {0}")] diff --git a/packages/rs-drive-proof-verifier/src/proof.rs b/packages/rs-drive-proof-verifier/src/proof.rs index 045e1f5a271..28a472932f1 100644 --- a/packages/rs-drive-proof-verifier/src/proof.rs +++ b/packages/rs-drive-proof-verifier/src/proof.rs @@ -31,11 +31,11 @@ use dpp::block::extended_epoch_info::ExtendedEpochInfo; use dpp::core_subsidy::NetworkCoreSubsidy; use dpp::dashcore::hashes::Hash; use dpp::dashcore::{Network, ProTxHash}; +use dpp::data_contract::DataContract; use dpp::document::{Document, DocumentV0Getters}; use dpp::identity::identities_contract_keys::IdentitiesContractKeys; -use dpp::identity::Purpose; +use dpp::identity::{Identity, identity_public_key::Purpose}; use dpp::platform_value::{self}; -use dpp::prelude::{DataContract, Identifier, Identity}; use dpp::serialization::PlatformDeserializable; use dpp::state_transition::proof_result::StateTransitionProofResult; use dpp::state_transition::StateTransition; @@ -59,6 +59,7 @@ use std::array::TryFromSliceError; use std::collections::BTreeMap; use std::num::TryFromIntError; use crate::error::MapGroveDbError; +use platform_value::Identifier; /// Parse and verify the received proof and retrieve the requested object, if any. /// diff --git a/packages/rs-drive-proof-verifier/src/provider.rs b/packages/rs-drive-proof-verifier/src/provider.rs index 374aa2f3d27..1b6c1193773 100644 --- a/packages/rs-drive-proof-verifier/src/provider.rs +++ b/packages/rs-drive-proof-verifier/src/provider.rs @@ -1,11 +1,12 @@ use crate::error::ContextProviderError; +use dpp::data_contract::{DataContract, TokenConfiguration}; use dpp::data_contract::serialized_version::DataContractInSerializationFormat; -use dpp::data_contract::TokenConfiguration; -use dpp::prelude::{CoreBlockHeight, DataContract, Identifier}; -use dpp::version::PlatformVersion; +use dpp::prelude::CoreBlockHeight; use drive::{error::proof::ProofError, query::ContractLookupFn}; #[cfg(feature = "mocks")] use hex::ToHex; +use platform_version::version::protocol_version::PlatformVersion; +use platform_value::Identifier; use std::{io::ErrorKind, ops::Deref, sync::Arc}; /// Interface between the Sdk and state of the application. diff --git a/packages/rs-drive-proof-verifier/src/types.rs b/packages/rs-drive-proof-verifier/src/types.rs index 5365a63067d..ea172fd2d6a 100644 --- a/packages/rs-drive-proof-verifier/src/types.rs +++ b/packages/rs-drive-proof-verifier/src/types.rs @@ -16,14 +16,12 @@ pub mod token_info; /// Token status pub mod token_status; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::core_types::validator_set::ValidatorSet; -use dpp::data_contract::document_type::DocumentType; -use dpp::fee::Credits; -use dpp::platform_value::Value; +use dpp::data_contract::{document_type::DocumentType, DataContract}; use dpp::prelude::{IdentityNonce, TimestampMillis}; use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; -use dpp::version::PlatformVersion; pub use dpp::version::ProtocolVersionVoteCount; use dpp::voting::contender_structs::{Contender, ContenderWithSerializedDocument}; use dpp::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; @@ -36,7 +34,7 @@ use dpp::{ dashcore::ProTxHash, document::Document, identity::KeyID, - prelude::{DataContract, Identifier, IdentityPublicKey, Revision}, + prelude::Revision, util::deserializer::ProtocolVersion, ProtocolError, }; @@ -44,13 +42,15 @@ use drive::grovedb::query_result_type::Path; use drive::grovedb::Element; // IndexMap is exposed to the public API pub use indexmap::IndexMap; +use platform_value::{Identifier, Value}; use std::collections::{BTreeMap, BTreeSet}; use dpp::dashcore::hashes::Hash; +use dpp::identity::IdentityPublicKey; +use platform_version::version::PlatformVersion; #[cfg(feature = "mocks")] use { bincode::{Decode, Encode}, - dpp::version as platform_version, platform_serialization::{PlatformVersionEncode, PlatformVersionedDecode}, platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}, }; @@ -141,7 +141,7 @@ impl Contenders { let contender = v.try_to_contender(document_type.as_ref(), platform_version)?; Ok((*id, contender)) }) - .collect::, dpp::ProtocolError>>() + .collect::, ProtocolError>>() .map_err(Into::into) } } @@ -274,7 +274,7 @@ impl PlatformVersionEncode for ContestedResource { fn platform_encode( &self, encoder: &mut E, - _platform_version: &platform_version::PlatformVersion, + _platform_version: &PlatformVersion, ) -> Result<(), bincode::error::EncodeError> { self.0.encode(encoder) } @@ -284,7 +284,7 @@ impl PlatformVersionEncode for ContestedResource { impl PlatformVersionedDecode for ContestedResource { fn platform_versioned_decode( decoder: &mut D, - _platform_version: &platform_version::PlatformVersion, + _platform_version: &PlatformVersion, ) -> Result { Ok(ContestedResource(Value::decode(decoder)?)) } @@ -299,7 +299,7 @@ impl PlatformVersionEncode for ContestedResources { fn platform_encode( &self, encoder: &mut E, - platform_version: &platform_version::PlatformVersion, + platform_version: &PlatformVersion, ) -> Result<(), bincode::error::EncodeError> { self.0.platform_encode(encoder, platform_version) } @@ -309,7 +309,7 @@ impl PlatformVersionEncode for ContestedResources { impl PlatformVersionedDecode for ContestedResources { fn platform_versioned_decode( decoder: &mut D, - platform_version: &platform_version::PlatformVersion, + platform_version: &PlatformVersion, ) -> Result { let inner = >::platform_versioned_decode(decoder, platform_version)?; Ok(Self(inner)) @@ -546,7 +546,7 @@ impl PlatformVersionEncode for MasternodeProtocolVote { fn platform_encode( &self, encoder: &mut E, - platform_version: &platform_version::PlatformVersion, + platform_version: &PlatformVersion, ) -> Result<(), bincode::error::EncodeError> { let protx_bytes: [u8; 32] = self.pro_tx_hash.to_raw_hash().to_byte_array(); protx_bytes.platform_encode(encoder, platform_version)?; diff --git a/packages/rs-drive-proof-verifier/src/types/evonode_status.rs b/packages/rs-drive-proof-verifier/src/types/evonode_status.rs index 589b692f485..f22ddf1a340 100644 --- a/packages/rs-drive-proof-verifier/src/types/evonode_status.rs +++ b/packages/rs-drive-proof-verifier/src/types/evonode_status.rs @@ -9,10 +9,10 @@ use dapi_grpc::platform::v0::{ #[cfg(feature = "mocks")] use { bincode::{Decode, Encode}, - dpp::{version as platform_version, ProtocolError}, + dpp::ProtocolError, platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}, }; - +// use ::platform_version::version; #[derive(Debug, Clone, Default)] #[cfg_attr( feature = "mocks", diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index e1109638a35..394eac5881e 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -15,6 +15,7 @@ resolver = "2" [dependencies] bincode = { version = "=2.0.0-rc.3", features = ["serde"] } +platform-value = { path = "../rs-platform-value" } platform-version = { path = "../rs-platform-version" } # used to convert integers to bytes, needed in verifier integer-encoding = { version = "4.0.0" } @@ -58,6 +59,7 @@ grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "221ca6ec6b8d grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "221ca6ec6b8d2b192d334192bd5a7b2cab5b0aa8", optional = true } grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "221ca6ec6b8d2b192d334192bd5a7b2cab5b0aa8" } grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "221ca6ec6b8d2b192d334192bd5a7b2cab5b0aa8" } +versioned-feature-core = "1.0.0" [dev-dependencies] criterion = "0.5" diff --git a/packages/rs-drive/src/drive/asset_lock/estimation_costs/mod.rs b/packages/rs-drive/src/drive/asset_lock/estimation_costs/mod.rs index 6bd560cbc51..f570618f0d2 100644 --- a/packages/rs-drive/src/drive/asset_lock/estimation_costs/mod.rs +++ b/packages/rs-drive/src/drive/asset_lock/estimation_costs/mod.rs @@ -10,7 +10,7 @@ use grovedb::EstimatedLayerInformation; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/mod.rs b/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/mod.rs index 529ecddd868..9967eb5d20d 100644 --- a/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/mod.rs +++ b/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/mod.rs @@ -7,7 +7,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::platform_value::Bytes36; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use dpp::asset_lock::StoredAssetLockInfo; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/v0/mod.rs b/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/v0/mod.rs index c85e0dc84d3..120fd7c3894 100644 --- a/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/v0/mod.rs +++ b/packages/rs-drive/src/drive/asset_lock/fetch_asset_lock_outpoint_info/v0/mod.rs @@ -7,7 +7,7 @@ use crate::util::grove_operations::QueryTarget::QueryTargetValue; use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; use dpp::asset_lock::StoredAssetLockInfo; diff --git a/packages/rs-drive/src/drive/balances/add_to_system_credits/mod.rs b/packages/rs-drive/src/drive/balances/add_to_system_credits/mod.rs index 15de1b23484..2e59fc06029 100644 --- a/packages/rs-drive/src/drive/balances/add_to_system_credits/mod.rs +++ b/packages/rs-drive/src/drive/balances/add_to_system_credits/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds to the total platform system credits when: diff --git a/packages/rs-drive/src/drive/balances/add_to_system_credits/v0/mod.rs b/packages/rs-drive/src/drive/balances/add_to_system_credits/v0/mod.rs index 2f0e6cf6ddf..f282ad1ed8b 100644 --- a/packages/rs-drive/src/drive/balances/add_to_system_credits/v0/mod.rs +++ b/packages/rs-drive/src/drive/balances/add_to_system_credits/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds to the total platform system credits when: diff --git a/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/mod.rs b/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/mod.rs index 4bb7a7a00f9..3f9326bb73b 100644 --- a/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/mod.rs +++ b/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/mod.rs @@ -5,8 +5,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::PlatformVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/v0/mod.rs b/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/v0/mod.rs index 33b1740e104..d5d50d5988f 100644 --- a/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/balances/add_to_system_credits_operations/v0/mod.rs @@ -7,11 +7,11 @@ use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::GroveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::PlatformVersion; use grovedb::batch::{KeyInfoPath, QualifiedGroveDbOp}; use grovedb::Element::Item; use grovedb::{EstimatedLayerInformation, TransactionArg}; use integer_encoding::VarInt; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/mod.rs b/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/mod.rs index 7c965e4a61f..d8ce66bd2fa 100644 --- a/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/mod.rs +++ b/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::balances::total_credits_balance::TotalCreditsBalance; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Calculates the total credits balance. diff --git a/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/v0/mod.rs b/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/v0/mod.rs index 9d7b48e342a..52bf041c615 100644 --- a/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/v0/mod.rs +++ b/packages/rs-drive/src/drive/balances/calculate_total_credits_balance/v0/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::util::grove_operations::DirectQueryType; use dpp::balances::total_credits_balance::TotalCreditsBalance; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Verify that the sum tree identity credits + pool credits + refunds are equal to the diff --git a/packages/rs-drive/src/drive/balances/mod.rs b/packages/rs-drive/src/drive/balances/mod.rs index 23c74cd12ac..fbecbca53e0 100644 --- a/packages/rs-drive/src/drive/balances/mod.rs +++ b/packages/rs-drive/src/drive/balances/mod.rs @@ -133,7 +133,7 @@ mod tests { use crate::drive::Drive; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; - use dpp::version::PlatformVersion; + use platform_version::version::PlatformVersion; #[test] fn verify_total_credits_structure() { diff --git a/packages/rs-drive/src/drive/balances/remove_from_system_credits/mod.rs b/packages/rs-drive/src/drive/balances/remove_from_system_credits/mod.rs index dd3e02729f7..a8116dc1a2c 100644 --- a/packages/rs-drive/src/drive/balances/remove_from_system_credits/mod.rs +++ b/packages/rs-drive/src/drive/balances/remove_from_system_credits/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Removes a specified amount from the system credits. diff --git a/packages/rs-drive/src/drive/balances/remove_from_system_credits/v0/mod.rs b/packages/rs-drive/src/drive/balances/remove_from_system_credits/v0/mod.rs index 58e696e007f..2e775d31fb9 100644 --- a/packages/rs-drive/src/drive/balances/remove_from_system_credits/v0/mod.rs +++ b/packages/rs-drive/src/drive/balances/remove_from_system_credits/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// We remove from system credits when: diff --git a/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/mod.rs b/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/mod.rs index 4c4aa70cc92..728ed9962a2 100644 --- a/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/mod.rs +++ b/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/v0/mod.rs b/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/v0/mod.rs index 8bdb989d21f..d1c9df85fbf 100644 --- a/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/balances/remove_from_system_credits_operations/v0/mod.rs @@ -7,11 +7,11 @@ use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::GroveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::PlatformVersion; use grovedb::batch::{KeyInfoPath, QualifiedGroveDbOp}; use grovedb::Element::Item; use grovedb::{EstimatedLayerInformation, TransactionArg}; use integer_encoding::VarInt; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/apply/apply_contract/mod.rs b/packages/rs-drive/src/drive/contract/apply/apply_contract/mod.rs index 6d167865cc9..65109f12462 100644 --- a/packages/rs-drive/src/drive/contract/apply/apply_contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/apply/apply_contract/mod.rs @@ -7,9 +7,9 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/contract/apply/apply_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/apply/apply_contract/v0/mod.rs index 795ed88a807..3f14dfffbf1 100644 --- a/packages/rs-drive/src/drive/contract/apply/apply_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/apply/apply_contract/v0/mod.rs @@ -8,9 +8,9 @@ use dpp::fee::fee_result::FeeResult; use dpp::serialization::PlatformSerializableWithPlatformVersion; use crate::error::contract::DataContractError; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/mod.rs b/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/mod.rs index 44ae172aafe..02bdb338e09 100644 --- a/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/mod.rs +++ b/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/mod.rs @@ -7,9 +7,9 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/v0/mod.rs b/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/v0/mod.rs index 6b24e43270b..981b184bf93 100644 --- a/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/apply/apply_contract_with_serialization/v0/mod.rs @@ -9,16 +9,16 @@ use crate::util::grove_operations::QueryTarget::QueryTargetValue; use crate::util::grove_operations::{DirectQueryType, QueryType}; use crate::util::storage_flags::StorageFlags; use dpp::block::block_info::BlockInfo; +use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; use dpp::platform_value::string_encoding::Encoding; -use dpp::prelude::DataContract; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/mod.rs b/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/mod.rs index db5f85f037c..5d37d3b010d 100644 --- a/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/mod.rs +++ b/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::data_contract::DataContract; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/v0/mod.rs b/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/v0/mod.rs index e610363ca6b..d9bb458b76f 100644 --- a/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/estimation_costs/add_estimation_costs_for_contract_insertion/v0/mod.rs @@ -13,12 +13,12 @@ use dpp::serialization::PlatformSerializableWithPlatformVersion; use crate::drive::votes::paths::vote_contested_resource_active_polls_contract_document_tree_path; use crate::util::type_constants::{DEFAULT_FLOAT_SIZE, DEFAULT_FLOAT_SIZE_U8}; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerCount::{ApproximateElements, EstimatedLevel}; use grovedb::EstimatedLayerSizes::{AllSubtrees, Mix}; use grovedb::EstimatedSumTrees::NoSumTrees; use grovedb::{EstimatedLayerInformation, TreeType}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/mod.rs index 6d4e9ae0793..d94c901839a 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/mod.rs @@ -9,8 +9,8 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use grovedb_costs::{CostResult, CostsExt, OperationCost}; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::sync::Arc; diff --git a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/v0/mod.rs index 0d40cd945e0..6837f75a8b9 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract/v0/mod.rs @@ -9,11 +9,11 @@ use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; use dpp::data_contract::DataContract; use dpp::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; -use dpp::version::PlatformVersion; use grovedb::{Element, TransactionArg}; use grovedb_costs::{ cost_return_on_error_no_add, CostContext, CostResult, CostsExt, OperationCost, }; +use platform_version::version::PlatformVersion; use std::ops::AddAssign; use std::sync::Arc; diff --git a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/mod.rs index d6325232150..2d9197c6353 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/mod.rs @@ -3,8 +3,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::data_contract::DataContract; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; mod v0; @@ -95,7 +95,7 @@ mod tests { use dpp::data_contract::DataContract; use dpp::platform_value::{platform_value, ValueMapHelper}; use dpp::tests::fixtures::get_data_contract_fixture; - use dpp::version::PlatformVersion; + use platform_version::version::PlatformVersion; struct TestData { data_contract: DataContract, diff --git a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/v0/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/v0/mod.rs index 8bb977a5bc8..8771f9834fd 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/fetch_contract_with_history/v0/mod.rs @@ -8,9 +8,9 @@ use dpp::data_contract::DataContract; use dpp::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; -use dpp::version::PlatformVersion; use grovedb::query_result_type::{QueryResultElement, QueryResultType}; use grovedb::{Element, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/get_fetch/get_cached_contract_with_fetch_info/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/get_cached_contract_with_fetch_info/mod.rs index f2fd3f429d1..493bb3852be 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/get_cached_contract_with_fetch_info/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/get_cached_contract_with_fetch_info/mod.rs @@ -4,8 +4,8 @@ use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; use std::sync::Arc; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/mod.rs index 5bee42052d1..612ead61cf5 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/mod.rs @@ -8,8 +8,8 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::sync::Arc; impl Drive { @@ -194,7 +194,7 @@ mod tests { use dpp::prelude::Identifier; use dpp::tests::json_document::json_document_to_contract; - use dpp::version::PlatformVersion; + use platform_version::version::PlatformVersion; use std::sync::Arc; #[test] diff --git a/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/v0/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/v0/mod.rs index 4d7e51f7a1d..ae6d5077871 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/get_contract_with_fetch_info/v0/mod.rs @@ -7,8 +7,8 @@ use crate::fees::op::LowLevelDriveOperation::{CalculatedCostOperation, PreCalcul use dpp::block::epoch::Epoch; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::sync::Arc; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/mod.rs index c485bf3850c..0046810acd1 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/mod.rs @@ -5,8 +5,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; use std::sync::Arc; diff --git a/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/v0/mod.rs b/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/v0/mod.rs index be1654fc4d9..6713cdeb461 100644 --- a/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/get_fetch/get_contracts_with_fetch_info/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; use std::sync::Arc; diff --git a/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/mod.rs b/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/mod.rs index 66a55d37126..f1e11922961 100644 --- a/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/mod.rs +++ b/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/mod.rs @@ -6,11 +6,11 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::block::block_info::BlockInfo; use dpp::data_contract::DataContract; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/v0/mod.rs b/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/v0/mod.rs index facb7ff5cd6..25023a1ed60 100644 --- a/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/insert/add_contract_to_storage/v0/mod.rs @@ -15,11 +15,11 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::DataContract; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::KeyInfoPath; use grovedb::reference_path::ReferencePathType::SiblingReference; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/insert/insert_contract/mod.rs b/packages/rs-drive/src/drive/contract/insert/insert_contract/mod.rs index f3ef865746a..0dbe55a620d 100644 --- a/packages/rs-drive/src/drive/contract/insert/insert_contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/insert/insert_contract/mod.rs @@ -9,9 +9,9 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/insert/insert_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/insert/insert_contract/v0/mod.rs index 2dc73f217df..5d0c4329bf7 100644 --- a/packages/rs-drive/src/drive/contract/insert/insert_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/insert/insert_contract/v0/mod.rs @@ -19,9 +19,9 @@ use crate::drive::votes::paths::{ CONTESTED_DOCUMENT_INDEXES_TREE_KEY, CONTESTED_DOCUMENT_STORAGE_TREE_KEY, }; use crate::error::contract::DataContractError; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::{HashMap, HashSet}; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/mod.rs b/packages/rs-drive/src/drive/contract/mod.rs index c48343d6c45..cef8a0cf938 100644 --- a/packages/rs-drive/src/drive/contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/mod.rs @@ -50,11 +50,11 @@ mod tests { use dpp::data_contract::DataContract; use dpp::document::DocumentV0Getters; use dpp::identity::accessors::IdentityGettersV0; - use dpp::identity::contract_bounds::ContractBounds; use dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; - use dpp::identity::{Identity, KeyType, Purpose, SecurityLevel}; + use dpp::identity::{ + ContractBounds, Identity, IdentityPublicKey, KeyType, Purpose, SecurityLevel, + }; use dpp::platform_value::{platform_value, BinaryData}; - use dpp::prelude::IdentityPublicKey; use dpp::tests::fixtures::{ get_dashpay_contract_fixture, get_dashpay_contract_with_generalized_encryption_key_fixture, }; @@ -62,7 +62,7 @@ mod tests { use crate::drive::identity::key::fetch::{IdentityKeysRequest, KeyIDIdentityPublicKeyPairVec}; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; - use dpp::version::PlatformVersion; + use platform_version::version::PlatformVersion; #[allow(dead_code)] #[deprecated(note = "This function is marked as unused.")] diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contract/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contract/mod.rs index d2e2ee4d927..1c38afe961a 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contract/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of a specified contract. diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs index 94a6484ccd1..cee3fb01568 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::drive::contract::paths::contract_root_path; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of a specified contract. diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contract_history/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contract_history/mod.rs index 2c427665740..a89e24f17ed 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contract_history/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contract_history/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of the specified contract's history. diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contract_history/v0/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contract_history/v0/mod.rs index 7da6cb662e8..34caf142eda 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contract_history/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contract_history/v0/mod.rs @@ -1,8 +1,8 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of the specified contract's history. diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contracts/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contracts/mod.rs index 9e697e98bff..5f131c5fabb 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contracts/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contracts/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of the specified contracts. diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contracts/v0/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contracts/v0/mod.rs index fa5ad597a41..085724fc6a5 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contracts/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contracts/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::PlatformVersion; use grovedb::{Element, TransactionArg}; +use platform_version::version::PlatformVersion; impl Drive { /// Proves the existence of the specified contracts. diff --git a/packages/rs-drive/src/drive/contract/update/update_contract/mod.rs b/packages/rs-drive/src/drive/contract/update/update_contract/mod.rs index d0d8a744b51..cf0dcd80607 100644 --- a/packages/rs-drive/src/drive/contract/update/update_contract/mod.rs +++ b/packages/rs-drive/src/drive/contract/update/update_contract/mod.rs @@ -10,9 +10,9 @@ use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/contract/update/update_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/update/update_contract/v0/mod.rs index ec1fd49f720..b0175495d52 100644 --- a/packages/rs-drive/src/drive/contract/update/update_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/update/update_contract/v0/mod.rs @@ -17,9 +17,9 @@ use dpp::data_contract::document_type::methods::DocumentTypeBasicMethods; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::PlatformVersion; use std::collections::{HashMap, HashSet}; impl Drive { diff --git a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_processing_credits_for_distribution/mod.rs b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_processing_credits_for_distribution/mod.rs index db40e29f00b..275ebba7fbb 100644 --- a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_processing_credits_for_distribution/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_processing_credits_for_distribution/mod.rs @@ -6,8 +6,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; -use dpp::fee::Credits; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/mod.rs b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/mod.rs index 94d09298fb8..13b8aeb1d3e 100644 --- a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/mod.rs @@ -5,6 +5,7 @@ use grovedb::TransactionArg; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; use dpp::block::pool_credits::StorageAndProcessingPoolCredits; diff --git a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/v0/mod.rs b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/v0/mod.rs index 36c6fd1974a..64bbc44acb5 100644 --- a/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/v0/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/epochs/credit_distribution_pools/get_epoch_total_credits_for_distribution/v0/mod.rs @@ -4,6 +4,7 @@ use crate::drive::Drive; use crate::fees::get_overflow_error; use crate::error::Error; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; use dpp::block::pool_credits::StorageAndProcessingPoolCredits; @@ -47,8 +48,8 @@ mod tests { use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use crate::util::batch::GroveDbOpBatch; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; + use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; - use dpp::fee::Credits; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/credit_pools/epochs/operations_factory.rs b/packages/rs-drive/src/drive/credit_pools/epochs/operations_factory.rs index ac6f42c5b57..0573df6a3fd 100644 --- a/packages/rs-drive/src/drive/credit_pools/epochs/operations_factory.rs +++ b/packages/rs-drive/src/drive/credit_pools/epochs/operations_factory.rs @@ -15,13 +15,13 @@ use crate::drive::credit_pools::epochs::epoch_key_constants::{ use crate::drive::credit_pools::epochs::paths::EpochProposers; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use dpp::balances::credits::Creditable; +use dpp::balances::credits::Credits; use dpp::block::epoch::Epoch; -use dpp::fee::Credits; -use dpp::prelude::Identifier; use dpp::util::deserializer::ProtocolVersion; use dpp::version::PlatformVersion; use grovedb::batch::QualifiedGroveDbOp; use grovedb::{Element, TransactionArg, TreeType}; +use platform_value::Identifier; /// Operations on Epochs pub trait EpochOperations { diff --git a/packages/rs-drive/src/drive/credit_pools/epochs/proposers/is_epochs_proposers_tree_empty/mod.rs b/packages/rs-drive/src/drive/credit_pools/epochs/proposers/is_epochs_proposers_tree_empty/mod.rs index a1266856f07..a8190cf4805 100644 --- a/packages/rs-drive/src/drive/credit_pools/epochs/proposers/is_epochs_proposers_tree_empty/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/epochs/proposers/is_epochs_proposers_tree_empty/mod.rs @@ -7,7 +7,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::block::epoch::Epoch; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Returns true if the Epoch's Proposers Tree is empty diff --git a/packages/rs-drive/src/drive/credit_pools/mod.rs b/packages/rs-drive/src/drive/credit_pools/mod.rs index 9fb4eeca248..cb9e5699818 100644 --- a/packages/rs-drive/src/drive/credit_pools/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/mod.rs @@ -14,13 +14,13 @@ use epochs::paths::encode_epoch_index_key; #[cfg(feature = "server")] use epochs::paths::EpochProposers; +#[cfg(feature = "server")] +use dpp::balances::credits::SignedCredits; #[cfg(feature = "server")] use dpp::block::epoch::{Epoch, EpochIndex}; #[cfg(feature = "server")] use dpp::fee::epoch::SignedCreditsPerEpoch; #[cfg(feature = "server")] -use dpp::fee::SignedCredits; -#[cfg(feature = "server")] use grovedb::query_result_type::QueryResultType; #[cfg(feature = "server")] use grovedb::{Element, PathQuery, Query, TransactionArg}; @@ -185,9 +185,9 @@ mod tests { use super::*; use crate::drive::credit_pools::epochs::operations_factory::EpochOperations; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; + use dpp::balances::credits::Credits; use dpp::block::epoch::EpochIndex; use dpp::fee::epoch::GENESIS_EPOCH_INDEX; - use dpp::fee::Credits; use dpp::version::PlatformVersion; use grovedb::batch::GroveOp; diff --git a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/add_delete_pending_epoch_refunds_except_specified/mod.rs b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/add_delete_pending_epoch_refunds_except_specified/mod.rs index 3f1617241f2..9971586478b 100644 --- a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/add_delete_pending_epoch_refunds_except_specified/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/add_delete_pending_epoch_refunds_except_specified/mod.rs @@ -5,8 +5,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::util::batch::GroveDbOpBatch; use dpp::fee::epoch::CreditsPerEpoch; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Adds operations to delete pending epoch refunds except epochs from provided collection based on the drive version diff --git a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_and_add_pending_epoch_refunds_to_collection/mod.rs b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_and_add_pending_epoch_refunds_to_collection/mod.rs index ffeb59f44cb..759aa644e0a 100644 --- a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_and_add_pending_epoch_refunds_to_collection/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_and_add_pending_epoch_refunds_to_collection/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::fee::epoch::CreditsPerEpoch; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Fetches pending epoch refunds and adds them to specified collection based on the drive version diff --git a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_pending_epoch_refunds/mod.rs b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_pending_epoch_refunds/mod.rs index af8d8323fa5..dc149477268 100644 --- a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_pending_epoch_refunds/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/methods/fetch_pending_epoch_refunds/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::fee::epoch::CreditsPerEpoch; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Fetches all pending epoch refunds based on the drive version diff --git a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/operations/add_update_pending_epoch_refunds_operations/mod.rs b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/operations/add_update_pending_epoch_refunds_operations/mod.rs index b0097ab6fe7..d5ff81c6383 100644 --- a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/operations/add_update_pending_epoch_refunds_operations/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/operations/add_update_pending_epoch_refunds_operations/mod.rs @@ -6,7 +6,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::fee::epoch::CreditsPerEpoch; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Adds GroveDB batch operations to update pending epoch storage pool updates diff --git a/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/mod.rs b/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/mod.rs index a93b2c636b1..fb41e2605bc 100644 --- a/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::version::PlatformVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/v0/mod.rs b/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/v0/mod.rs index ee90eec06c4..4e10a9af444 100644 --- a/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/v0/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/storage_fee_distribution_pool/get_storage_fees_from_distribution_pool/v0/mod.rs @@ -3,7 +3,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::balances::credits::Creditable; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use grovedb::{Element, TransactionArg}; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/mod.rs index 616d27de6c6..d871d5d2f46 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/mod.rs @@ -8,7 +8,7 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::identifier::Identifier; diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/v0/mod.rs index 86505ec6a03..1020046f95a 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract/v0/mod.rs @@ -6,10 +6,10 @@ use dpp::data_contract::DataContract; use dpp::fee::fee_result::FeeResult; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/mod.rs index 5aef315d8f7..d16b96afa4c 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/mod.rs @@ -6,10 +6,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::DataContract; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/v0/mod.rs index db151c9e972..d445cc22851 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_apply_and_add_to_operations/v0/mod.rs @@ -3,10 +3,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::DataContract; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/mod.rs index 3737d85c356..2b340eeab9d 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/mod.rs @@ -12,7 +12,7 @@ use crate::error::Error; use dpp::fee::fee_result::FeeResult; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Deletes a document and returns the associated fee. diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/v0/mod.rs index 70e4e5716e6..7537bc45888 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id/v0/mod.rs @@ -14,7 +14,7 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::fee::fee_result::FeeResult; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Deletes a document and returns the associated fee. diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/mod.rs index 5e8efed9771..748789c9ebd 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/mod.rs @@ -6,10 +6,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/v0/mod.rs index 85d082fd4a3..5e835c1185d 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_id_with_named_type_operations/v0/mod.rs @@ -14,7 +14,7 @@ use dpp::block::epoch::Epoch; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Prepares the operations for deleting a document. diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/mod.rs index 74fefe304d9..996d81e2697 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/mod.rs @@ -8,10 +8,10 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/v0/mod.rs index 55420aceeb7..8c3226930ce 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_operations/v0/mod.rs @@ -31,7 +31,7 @@ use dpp::data_contract::document_type::methods::DocumentTypeV0Methods; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Prepares the operations for deleting a document. diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/mod.rs index 5c57a29a1a1..9c68d270e2c 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/mod.rs @@ -7,10 +7,10 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::DataContract; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/v0/mod.rs index f7babbe7f7c..482d0f6d4a9 100644 --- a/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/delete_document_for_contract_with_named_type_operations/v0/mod.rs @@ -14,7 +14,7 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Prepares the operations for deleting a document. diff --git a/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/mod.rs b/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/mod.rs index 7fe17619b5d..5b2272d120e 100644 --- a/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::data_contract::document_type::DocumentTypeRef; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/v0/mod.rs index ce3ca4d6e5b..3a76b0f8f9b 100644 --- a/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/internal/add_estimation_costs_for_remove_document_to_primary_storage/v0/mod.rs @@ -20,7 +20,7 @@ use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::document_type::methods::DocumentTypeV0Methods; use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Adds estimation costs for removing a document to the primary storage with version v0. diff --git a/packages/rs-drive/src/drive/document/delete/mod.rs b/packages/rs-drive/src/drive/document/delete/mod.rs index 159cdd41a70..88222f7b192 100644 --- a/packages/rs-drive/src/drive/document/delete/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/mod.rs @@ -77,8 +77,8 @@ mod tests { use dpp::tests::json_document::{json_document_to_contract, json_document_to_document}; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; - use dpp::version::fee::FeeVersion; - use dpp::version::PlatformVersion; + use platform_version::version::fee::FeeVersion; + use platform_version::version::PlatformVersion; static EPOCH_CHANGE_FEE_VERSION_TEST: Lazy = Lazy::new(|| BTreeMap::from([(0, FeeVersion::first())])); diff --git a/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/mod.rs index b158eb7ed33..0bf7510d9ce 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/mod.rs @@ -6,10 +6,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::document_type::DocumentTypeRef; -use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/v0/mod.rs index 75a03dd83cc..2b4f1b1fe40 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_document_from_primary_storage/v0/mod.rs @@ -19,7 +19,7 @@ use dpp::data_contract::document_type::methods::DocumentTypeV0Methods; use dpp::identifier::Identifier; use crate::util::type_constants::DEFAULT_HASH_SIZE_U32; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Removes the document from primary storage. diff --git a/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/mod.rs index 7ce1ad04227..e50a299d8a8 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/mod.rs @@ -9,9 +9,9 @@ use crate::util::storage_flags::StorageFlags; use dpp::data_contract::document_type::IndexLevel; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/v0/mod.rs index f92a34005d3..8de1b72ac9a 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_indices_for_index_level_for_contract_operations/v0/mod.rs @@ -22,7 +22,7 @@ use crate::error::fee::FeeError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Removes indices for an index level and recurses. diff --git a/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/mod.rs index c22ab61d614..7f3a5210f16 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/mod.rs @@ -8,7 +8,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/v0/mod.rs index 050982c266f..c6fbc616153 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_indices_for_top_index_level_for_contract_operations/v0/mod.rs @@ -22,7 +22,7 @@ use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use crate::drive::document::paths::contract_document_type_path_vec; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Removes indices for the top index level and calls for lower levels. diff --git a/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/mod.rs index 2356e89090e..ac36f3a465a 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/mod.rs @@ -7,7 +7,7 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::{DocumentAndContractInfo, PathInfo}; use crate::util::storage_flags::StorageFlags; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/v0/mod.rs index 2232ce058b9..243fd461606 100644 --- a/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/remove_reference_for_index_level_for_contract_operations/v0/mod.rs @@ -21,7 +21,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Removes the terminal reference. diff --git a/packages/rs-drive/src/drive/document/estimation_costs/stateless_delete_of_non_tree_for_costs/mod.rs b/packages/rs-drive/src/drive/document/estimation_costs/stateless_delete_of_non_tree_for_costs/mod.rs index d31bad5cf55..e9d20605e43 100644 --- a/packages/rs-drive/src/drive/document/estimation_costs/stateless_delete_of_non_tree_for_costs/mod.rs +++ b/packages/rs-drive/src/drive/document/estimation_costs/stateless_delete_of_non_tree_for_costs/mod.rs @@ -7,8 +7,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::error::drive::DriveError; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::PlatformVersion; use grovedb::{EstimatedLayerInformation, EstimatedLayerSizes, MaybeTree}; diff --git a/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/mod.rs b/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/mod.rs index 32823a82e9c..3ea5b903520 100644 --- a/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/mod.rs +++ b/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/mod.rs @@ -7,7 +7,7 @@ use crate::error::Error; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; -use dpp::identifier::Identifier; +use dpp::platform_value::Identifier; use dpp::platform_value::Value; use dpp::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis}; diff --git a/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/v0/mod.rs b/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/v0/mod.rs index acc70692f62..6104dc8b73d 100644 --- a/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/index_uniqueness/internal/validate_uniqueness_of_data/v0/mod.rs @@ -4,10 +4,10 @@ use crate::drive::document::index_uniqueness::internal::validate_uniqueness_of_d use crate::drive::document::query::QueryDocumentsOutcomeV0Methods; use crate::error::Error; use crate::query::{DriveDocumentQuery, InternalClauses, WhereClause, WhereOperator}; -use dpp::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; -use dpp::consensus::state::state_error::StateError; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::document::{property_names, DocumentV0Getters}; +use dpp::errors::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; +use dpp::errors::consensus::state::state_error::StateError; use dpp::platform_value::platform_value; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/document/insert/add_document/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document/mod.rs index f118660eb6b..280e7f855c7 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document/mod.rs @@ -10,8 +10,8 @@ use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document using bincode serialization diff --git a/packages/rs-drive/src/drive/document/insert/add_document/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document/v0/mod.rs index dd9d2687964..7263d8fca33 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document/v0/mod.rs @@ -8,8 +8,8 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::fee::fee_result::FeeResult; use dpp::identifier::Identifier; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document using bincode serialization diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract/mod.rs index df06944d777..720887a1652 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract/mod.rs @@ -10,8 +10,8 @@ use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document to a contract. diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract/v0/mod.rs index cca2580f36f..cbc40549dbf 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract/v0/mod.rs @@ -7,8 +7,8 @@ use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document to a contract. diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/mod.rs index 6f317eb55f1..765ea01a93c 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/mod.rs @@ -7,7 +7,7 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/v0/mod.rs index 3fc5b026c47..33d3c440d84 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_apply_and_add_to_operations/v0/mod.rs @@ -4,9 +4,9 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/mod.rs index 7cbb6b67688..3f7bfea29c5 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/mod.rs @@ -7,9 +7,9 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/v0/mod.rs index 2993e01b996..6093ba82d12 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_for_contract_operations/v0/mod.rs @@ -10,9 +10,9 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::document_type::methods::DocumentTypeV0Methods; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/mod.rs index d1d69acf6ae..39cf7dd3928 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/mod.rs @@ -14,7 +14,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document to primary storage. diff --git a/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/v0/mod.rs index e9df07d11fc..23d3f177b9f 100644 --- a/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_document_to_primary_storage/v0/mod.rs @@ -45,7 +45,7 @@ use crate::drive::document::paths::{ contract_documents_primary_key_path, }; use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Adds a document to primary storage. diff --git a/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/mod.rs index 1de0a643320..537e98ba5c4 100644 --- a/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/mod.rs @@ -10,8 +10,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::data_contract::document_type::IndexLevel; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::PlatformVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/v0/mod.rs index 94662fd923a..13e94b036d7 100644 --- a/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_indices_for_index_level_for_contract_operations/v0/mod.rs @@ -9,12 +9,12 @@ use crate::util::storage_flags::StorageFlags; use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; use dpp::data_contract::document_type::IndexLevel; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerCount::{ApproximateElements, PotentiallyAtMaxElements}; use grovedb::EstimatedLayerSizes::AllSubtrees; use grovedb::EstimatedSumTrees::NoSumTrees; use grovedb::{EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert/add_indices_for_top_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_indices_for_top_index_level_for_contract_operations/v0/mod.rs index e7d56f81d7e..9c5200ec7d0 100644 --- a/packages/rs-drive/src/drive/document/insert/add_indices_for_top_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_indices_for_top_index_level_for_contract_operations/v0/mod.rs @@ -13,7 +13,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use crate::drive::document::paths::contract_document_type_path_vec; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/mod.rs index 25a6515b163..921ed7d0c18 100644 --- a/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/mod.rs @@ -7,12 +7,12 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::{DocumentAndContractInfo, PathInfo}; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use dpp::data_contract::document_type::IndexLevelTypeInfo; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/v0/mod.rs index 365353d7de9..58b96337763 100644 --- a/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/add_reference_for_index_level_for_contract_operations/v0/mod.rs @@ -18,12 +18,12 @@ use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; use dpp::data_contract::document_type::methods::DocumentTypeBasicMethods; use dpp::data_contract::document_type::IndexLevelTypeInfo; use dpp::document::DocumentV0Getters; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerCount::PotentiallyAtMaxElements; use grovedb::EstimatedLayerSizes::AllReference; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/mod.rs b/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/mod.rs index 75a5d9972ee..41494a27a21 100644 --- a/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/mod.rs @@ -7,11 +7,11 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::{DocumentAndContractInfo, PathInfo}; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/v0/mod.rs index d56dbce9f07..fcce00621ae 100644 --- a/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert_contested/add_contested_reference_and_vote_subtree_to_document_operations/v0/mod.rs @@ -15,13 +15,13 @@ use crate::util::object_size_info::{DocumentAndContractInfo, PathInfo, PathKeyEl use crate::util::storage_flags::StorageFlags; use crate::util::type_constants::{DEFAULT_HASH_SIZE_U8, U8_SIZE_U32, U8_SIZE_U8}; use dpp::data_contract::document_type::methods::DocumentTypeBasicMethods; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerCount::{ApproximateElements, PotentiallyAtMaxElements}; use grovedb::EstimatedLayerSizes::{AllItems, Mix}; use grovedb::EstimatedSumTrees::AllSumTrees; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/mod.rs b/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/mod.rs index e2461f5c489..671cf3e2252 100644 --- a/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/mod.rs @@ -7,11 +7,11 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/v0/mod.rs index c6d8faedcbb..784ee6e46b3 100644 --- a/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/insert_contested/add_contested_vote_subtrees_for_non_identities_operations/v0/mod.rs @@ -7,12 +7,12 @@ use crate::util::object_size_info::DriveKeyInfo::KeyRef; use crate::util::object_size_info::PathInfo; use crate::util::storage_flags::StorageFlags; use crate::util::type_constants::{DEFAULT_HASH_SIZE_U8, U8_SIZE_U32, U8_SIZE_U8}; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerCount::{ApproximateElements, PotentiallyAtMaxElements}; use grovedb::EstimatedLayerSizes::{AllItems, Mix}; use grovedb::EstimatedSumTrees::AllSumTrees; use grovedb::{EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/mod.rs b/packages/rs-drive/src/drive/document/mod.rs index fb0cd21529a..c127ec1b546 100644 --- a/packages/rs-drive/src/drive/document/mod.rs +++ b/packages/rs-drive/src/drive/document/mod.rs @@ -147,11 +147,11 @@ pub(crate) mod tests { use crate::drive::Drive; use crate::util::storage_flags::StorageFlags; use dpp::block::block_info::BlockInfo; - use dpp::prelude::DataContract; + use dpp::data_contract::DataContract; use dpp::tests::json_document::json_document_to_contract; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; - use dpp::version::PlatformVersion; + use platform_version::version::PlatformVersion; /// Setup Dashpay pub fn setup_dashpay(_prefix: &str, mutable_contact_requests: bool) -> (Drive, DataContract) { diff --git a/packages/rs-drive/src/drive/document/paths.rs b/packages/rs-drive/src/drive/document/paths.rs index 9d1c0516d97..ccb47fc3c84 100644 --- a/packages/rs-drive/src/drive/document/paths.rs +++ b/packages/rs-drive/src/drive/document/paths.rs @@ -1,7 +1,11 @@ use crate::drive::{constants, RootTree}; +#[cfg(feature = "server")] use crate::util::type_constants::DEFAULT_HASH_SIZE_U8; +#[cfg(feature = "server")] use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; +#[cfg(feature = "server")] use dpp::data_contract::document_type::methods::DocumentTypeBasicMethods; +#[cfg(feature = "server")] use dpp::data_contract::document_type::DocumentTypeRef; #[cfg(feature = "server")] use grovedb::batch::key_info::KeyInfo; diff --git a/packages/rs-drive/src/drive/document/query/mod.rs b/packages/rs-drive/src/drive/document/query/mod.rs index 30bb4834e98..a0d3606a3e7 100644 --- a/packages/rs-drive/src/drive/document/query/mod.rs +++ b/packages/rs-drive/src/drive/document/query/mod.rs @@ -39,10 +39,10 @@ use crate::verify::RootHash; use dpp::data_contract::document_type::DocumentTypeRef; #[cfg(all(feature = "fixtures-and-mocks", feature = "cbor_query"))] use dpp::data_contract::DataContract; -#[cfg(feature = "fixtures-and-mocks")] -use dpp::version::PlatformVersion; #[cfg(all(feature = "fixtures-and-mocks", feature = "cbor_query"))] use dpp::version::PlatformVersionCurrentVersion; +#[cfg(feature = "fixtures-and-mocks")] +use platform_version::version::PlatformVersion; // TODO: Not using // /// The outcome of a query diff --git a/packages/rs-drive/src/drive/document/query/query_documents/v0/mod.rs b/packages/rs-drive/src/drive/document/query/query_documents/v0/mod.rs index b41ae676a23..ada48d8fd94 100644 --- a/packages/rs-drive/src/drive/document/query/query_documents/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/query/query_documents/v0/mod.rs @@ -5,9 +5,9 @@ use crate::query::DriveDocumentQuery; use dpp::block::epoch::Epoch; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::document::Document; -use dpp::version::PlatformVersion; use dpp::ProtocolError; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; /// The outcome of a query #[derive(Debug, Default)] diff --git a/packages/rs-drive/src/drive/document/update/add_update_multiple_documents_operations/mod.rs b/packages/rs-drive/src/drive/document/update/add_update_multiple_documents_operations/mod.rs index 28bfd1748f4..a5ec606593c 100644 --- a/packages/rs-drive/src/drive/document/update/add_update_multiple_documents_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/update/add_update_multiple_documents_operations/mod.rs @@ -7,7 +7,7 @@ use crate::util::batch::DriveOperation; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; use dpp::document::Document; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Adds multiple document update operations to the drive. diff --git a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/mod.rs b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/mod.rs index 112b42c86cd..ac1154bac5d 100644 --- a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/mod.rs @@ -7,9 +7,9 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/v0/mod.rs index 0ceebab996e..48c7ed054f9 100644 --- a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_apply_and_add_to_operations/v0/mod.rs @@ -3,9 +3,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DocumentAndContractInfo; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/mod.rs b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/mod.rs index 58486487b9e..f99919c4845 100644 --- a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/mod.rs +++ b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/mod.rs @@ -8,9 +8,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs index b903ca123c1..3316ba56834 100644 --- a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs @@ -30,11 +30,11 @@ use crate::drive::document::paths::{ contract_documents_primary_key_path, }; use dpp::data_contract::document_type::methods::DocumentTypeBasicMethods; -use dpp::version::PlatformVersion; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::key_info::KeyInfo::KnownKey; use grovedb::batch::KeyInfoPath; use grovedb::{Element, EstimatedLayerInformation, MaybeTree, TransactionArg, TreeType}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::{HashMap, HashSet}; diff --git a/packages/rs-drive/src/drive/document/update/update_document_for_contract/mod.rs b/packages/rs-drive/src/drive/document/update/update_document_for_contract/mod.rs index 5c3658a7b2f..380e7f8467b 100644 --- a/packages/rs-drive/src/drive/document/update/update_document_for_contract/mod.rs +++ b/packages/rs-drive/src/drive/document/update/update_document_for_contract/mod.rs @@ -12,7 +12,7 @@ use dpp::data_contract::DataContract; use dpp::document::Document; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/mod.rs b/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/mod.rs index d6563600f27..d6a8bcf3b32 100644 --- a/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/mod.rs +++ b/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/mod.rs @@ -10,7 +10,7 @@ use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/v0/mod.rs b/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/v0/mod.rs index d67b7c98eea..c0cd1cea476 100644 --- a/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/update/update_document_for_contract_id/v0/mod.rs @@ -12,9 +12,9 @@ use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::document::Document; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/mod.rs b/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/mod.rs index b6f5740684e..46f535d4d0e 100644 --- a/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/mod.rs +++ b/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/mod.rs @@ -11,7 +11,7 @@ use dpp::data_contract::DataContract; use dpp::document::Document; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/v0/mod.rs b/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/v0/mod.rs index 75cb88ed761..c27d6724587 100644 --- a/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/update/update_document_with_serialization_for_contract/v0/mod.rs @@ -11,9 +11,9 @@ use dpp::document::Document; use dpp::fee::fee_result::FeeResult; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/group/estimated_costs/for_add_group_action/mod.rs b/packages/rs-drive/src/drive/group/estimated_costs/for_add_group_action/mod.rs index 03dae869a07..1492be30df9 100644 --- a/packages/rs-drive/src/drive/group/estimated_costs/for_add_group_action/mod.rs +++ b/packages/rs-drive/src/drive/group/estimated_costs/for_add_group_action/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::data_contract::GroupContractPosition; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/group/estimated_costs/for_add_groups/mod.rs b/packages/rs-drive/src/drive/group/estimated_costs/for_add_groups/mod.rs index 14b8dca32ef..e31274d1943 100644 --- a/packages/rs-drive/src/drive/group/estimated_costs/for_add_groups/mod.rs +++ b/packages/rs-drive/src/drive/group/estimated_costs/for_add_groups/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::data_contract::group::Group; use dpp::data_contract::GroupContractPosition; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::{BTreeMap, HashMap}; impl Drive { diff --git a/packages/rs-drive/src/drive/group/insert/add_group_action/mod.rs b/packages/rs-drive/src/drive/group/insert/add_group_action/mod.rs index 37642fc5bf3..82bb41a9a85 100644 --- a/packages/rs-drive/src/drive/group/insert/add_group_action/mod.rs +++ b/packages/rs-drive/src/drive/group/insert/add_group_action/mod.rs @@ -9,9 +9,9 @@ use dpp::version::PlatformVersion; use dpp::data_contract::group::GroupMemberPower; use dpp::data_contract::GroupContractPosition; use dpp::group::group_action::GroupAction; -use dpp::prelude::Identifier; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/group/insert/add_new_groups/mod.rs b/packages/rs-drive/src/drive/group/insert/add_new_groups/mod.rs index a5fe50e5458..a45f060256f 100644 --- a/packages/rs-drive/src/drive/group/insert/add_new_groups/mod.rs +++ b/packages/rs-drive/src/drive/group/insert/add_new_groups/mod.rs @@ -8,9 +8,9 @@ use dpp::version::PlatformVersion; use dpp::data_contract::group::Group; use dpp::data_contract::GroupContractPosition; -use dpp::prelude::Identifier; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; use std::collections::{BTreeMap, HashMap}; mod v0; diff --git a/packages/rs-drive/src/drive/group/prove/prove_group_info/v0/mod.rs b/packages/rs-drive/src/drive/group/prove/prove_group_info/v0/mod.rs index bab7fbe6036..79eeb22a0da 100644 --- a/packages/rs-drive/src/drive/group/prove/prove_group_info/v0/mod.rs +++ b/packages/rs-drive/src/drive/group/prove/prove_group_info/v0/mod.rs @@ -55,9 +55,9 @@ mod tests { use dpp::data_contract::group::v0::GroupV0; use dpp::data_contract::group::Group; use dpp::data_contract::v1::DataContractV1; + use dpp::data_contract::DataContract; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::Identity; - use dpp::prelude::DataContract; use dpp::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/group/prove/prove_group_infos/v0/mod.rs b/packages/rs-drive/src/drive/group/prove/prove_group_infos/v0/mod.rs index 68b20c7b812..6f02a8f5b72 100644 --- a/packages/rs-drive/src/drive/group/prove/prove_group_infos/v0/mod.rs +++ b/packages/rs-drive/src/drive/group/prove/prove_group_infos/v0/mod.rs @@ -62,10 +62,10 @@ mod tests { use dpp::data_contract::group::v0::GroupV0; use dpp::data_contract::group::Group; use dpp::data_contract::v1::DataContractV1; + use dpp::data_contract::DataContract; use dpp::data_contract::GroupContractPosition; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::Identity; - use dpp::prelude::DataContract; use dpp::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/identity/balance/prove.rs b/packages/rs-drive/src/drive/identity/balance/prove.rs index 0fcdd61cb5a..6b1880f4556 100644 --- a/packages/rs-drive/src/drive/identity/balance/prove.rs +++ b/packages/rs-drive/src/drive/identity/balance/prove.rs @@ -1,7 +1,7 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; @@ -106,7 +106,7 @@ mod tests { mod prove_many_identity_balances { use super::*; - use dpp::fee::Credits; + use dpp::balances::credits::Credits; use dpp::identity::accessors::IdentityGettersV0; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/identity/balance/update.rs b/packages/rs-drive/src/drive/identity/balance/update.rs index aed30f9b248..bd251a58433 100644 --- a/packages/rs-drive/src/drive/identity/balance/update.rs +++ b/packages/rs-drive/src/drive/identity/balance/update.rs @@ -1,19 +1,19 @@ #[cfg(test)] mod tests { - use dpp::prelude::*; - use crate::error::drive::DriveError; use crate::error::Error; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; use crate::util::test_helpers::test_utils::identities::create_test_identity; use dpp::block::epoch::Epoch; use dpp::identity::accessors::IdentityGettersV0; + use dpp::identity::Identity; mod add_to_identity_balance { use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; use dpp::identity::accessors::IdentityGettersV0; + use dpp::version::PlatformVersion; use crate::fees::op::LowLevelDriveOperation; diff --git a/packages/rs-drive/src/drive/identity/contract_info/keys/add_potential_contract_info_for_contract_bounded_key/v0/mod.rs b/packages/rs-drive/src/drive/identity/contract_info/keys/add_potential_contract_info_for_contract_bounded_key/v0/mod.rs index 55fc9ba8013..890f4527172 100644 --- a/packages/rs-drive/src/drive/identity/contract_info/keys/add_potential_contract_info_for_contract_bounded_key/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/contract_info/keys/add_potential_contract_info_for_contract_bounded_key/v0/mod.rs @@ -20,7 +20,7 @@ use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::reference_path::ReferencePathType::{SiblingReference, UpstreamRootHeightReference}; diff --git a/packages/rs-drive/src/drive/identity/contract_info/keys/mod.rs b/packages/rs-drive/src/drive/identity/contract_info/keys/mod.rs index 27df5d4a0da..26475fa6997 100644 --- a/packages/rs-drive/src/drive/identity/contract_info/keys/mod.rs +++ b/packages/rs-drive/src/drive/identity/contract_info/keys/mod.rs @@ -7,8 +7,10 @@ use dpp::block::epoch::Epoch; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identifier::Identifier; -use dpp::identity::contract_bounds::ContractBounds; -use dpp::identity::{KeyID, Purpose}; +use dpp::identity::{ + identity_public_key::{contract_bounds::ContractBounds, Purpose}, + KeyID, +}; use grovedb::TransactionArg; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/identity/contract_info/keys/refresh_potential_contract_info_key_references/v0/mod.rs b/packages/rs-drive/src/drive/identity/contract_info/keys/refresh_potential_contract_info_key_references/v0/mod.rs index 25f20f62385..2e175940c6e 100644 --- a/packages/rs-drive/src/drive/identity/contract_info/keys/refresh_potential_contract_info_key_references/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/contract_info/keys/refresh_potential_contract_info_key_references/v0/mod.rs @@ -14,7 +14,7 @@ use dpp::data_contract::config::v0::DataContractConfigGettersV0; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::storage_requirements::keys_for_document_type::StorageKeyRequirements; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::reference_path::ReferencePathType::{SiblingReference, UpstreamRootHeightReference}; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/mod.rs index cff6fbbc96b..d2ae685209a 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/mod.rs @@ -1,10 +1,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::identity::SecurityLevel; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::SecurityLevel; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/v0/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/v0/mod.rs index 529b56477f6..00301693131 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_authentication_keys_security_level_in_key_reference_tree/v0/mod.rs @@ -8,7 +8,7 @@ use grovedb::{EstimatedLayerInformation, TreeType}; use crate::drive::identity::identity_query_keys_security_level_tree_path_vec; use crate::drive::identity::estimation_costs::KEY_REFERENCE_SIZE; -use dpp::identity::SecurityLevel; +use dpp::identity::identity_public_key::SecurityLevel; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_balances/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_balances/mod.rs index d4c567e33ff..0a372cd8d90 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_balances/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_balances/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info/mod.rs index 759b4e5c9d7..0a4029adf22 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group/mod.rs index a3a18e9d505..9e482873c96 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/mod.rs index 253f3ef74e4..057c67bb19a 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/mod.rs @@ -3,10 +3,10 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::identity::Purpose; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::Purpose; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/v0/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/v0/mod.rs index 195a04d3c7c..14256b92f0a 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_key_purpose/v0/mod.rs @@ -7,7 +7,7 @@ use grovedb::{EstimatedLayerInformation, TreeType}; use crate::drive::identity::estimation_costs::KEY_REFERENCE_SIZE; use crate::drive::identity::identity_contract_info_group_path_key_purpose_vec; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_keys/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_keys/mod.rs index 5a097e92d48..c7e0aa2cc69 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_keys/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_identity_contract_info_group_keys/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_keys_for_identity_id/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_keys_for_identity_id/mod.rs index ec77be1a208..84e9ebc3358 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_keys_for_identity_id/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_keys_for_identity_id/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_negative_credit/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_negative_credit/mod.rs index 1fc6b8a0d32..e13bc717c58 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_negative_credit/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_negative_credit/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/mod.rs index 7f079d4beef..49e108dca19 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/mod.rs @@ -1,10 +1,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::identity::Purpose; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::Purpose; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/v0/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/v0/mod.rs index 6951d86eda7..2061cf2dbb8 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_purpose_in_key_reference_tree/v0/mod.rs @@ -8,7 +8,7 @@ use grovedb::{EstimatedLayerInformation, TreeType}; use crate::drive::identity::identity_query_keys_purpose_tree_path_vec; use crate::drive::identity::estimation_costs::KEY_REFERENCE_SIZE; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use grovedb::EstimatedSumTrees::NoSumTrees; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_root_key_reference_tree/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_root_key_reference_tree/mod.rs index 711db39fdde..695a3879543 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_root_key_reference_tree/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_root_key_reference_tree/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_update_nonce/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_update_nonce/mod.rs index 91df3ac0f69..2320982f3ff 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_update_nonce/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_update_nonce/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/estimation_costs/for_update_revision/mod.rs b/packages/rs-drive/src/drive/identity/estimation_costs/for_update_revision/mod.rs index 718583e8d5a..af1f0856c8e 100644 --- a/packages/rs-drive/src/drive/identity/estimation_costs/for_update_revision/mod.rs +++ b/packages/rs-drive/src/drive/identity/estimation_costs/for_update_revision/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/mod.rs b/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/mod.rs index 1c55b9bcad5..b903917b3c3 100644 --- a/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/v0/mod.rs index 31c0eb6b9cf..14a01888258 100644 --- a/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/balance/fetch_identity_balance/v0/mod.rs @@ -6,9 +6,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; use crate::util::grove_operations::QueryTarget::QueryTargetValue; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use grovedb::Element::SumItem; diff --git a/packages/rs-drive/src/drive/identity/fetch/contract_keys/mod.rs b/packages/rs-drive/src/drive/identity/fetch/contract_keys/mod.rs index 20f41d6507b..864079e1b87 100644 --- a/packages/rs-drive/src/drive/identity/fetch/contract_keys/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/contract_keys/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use std::collections::BTreeMap; use dpp::identifier::Identifier; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use grovedb::TransactionArg; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/fetch/contract_keys/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/contract_keys/v0/mod.rs index edab5df7ccf..c4ad71fb883 100644 --- a/packages/rs-drive/src/drive/identity/fetch/contract_keys/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/contract_keys/v0/mod.rs @@ -2,10 +2,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::identity::Purpose; -use dpp::prelude::Identifier; +use dpp::identity::identity_public_key::Purpose; use grovedb::query_result_type::QueryResultType; use grovedb::TransactionArg; +use platform_value::Identifier; use platform_version::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/mod.rs index 7fa958a13cf..94180dac4f4 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Checks if a key with a given public key hash already exists in the non-unique set. diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/v0/mod.rs index a978bb98385..a41f8ed46f4 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash/v0/mod.rs @@ -4,7 +4,7 @@ use crate::util::grove_operations::DirectQueryType::StatefulDirectQuery; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/mod.rs index 4be7dd8dcc0..a467e1f8fc6 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Checks if a key with a given public key hash already exists in the non-unique set for a specific identity. diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/v0/mod.rs index a30aa3d9761..d30bf618b91 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_non_unique_public_key_hash_already_for_identity/v0/mod.rs @@ -4,7 +4,7 @@ use crate::util::grove_operations::DirectQueryType::StatefulDirectQuery; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/mod.rs index dee523f0800..affdc6246ee 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Checks if a key with a given public key hash already exists in the unique tree. diff --git a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/v0/mod.rs index 7dcfbc03aa1..1da38911d11 100644 --- a/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/fetch_by_public_key_hashes/has_unique_public_key_hash/v0/mod.rs @@ -4,7 +4,7 @@ use crate::util::grove_operations::DirectQueryType::StatefulDirectQuery; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/identity/fetch/full_identity/fetch_full_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/full_identity/fetch_full_identity/v0/mod.rs index 845f7ca37d3..2eff8a46800 100644 --- a/packages/rs-drive/src/drive/identity/fetch/full_identity/fetch_full_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/full_identity/fetch_full_identity/v0/mod.rs @@ -5,7 +5,7 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use dpp::fee::fee_result::FeeResult; use dpp::identifier::Identifier; -use dpp::identity::{Identity, IdentityV0}; +use dpp::identity::{v0::IdentityV0, Identity}; use dpp::version::PlatformVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/mod.rs index 4757577c6ef..56cce0134cb 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves identities with all their information from the given identity ids. diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs index 1bac303eee0..b416f4d89ab 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs @@ -1,8 +1,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves identities with all its information from an identity ids. diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/mod.rs index 8a950ad251a..a3f8d631758 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves an identity with all its information from an identity id. diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs index 1f8cc5580cc..4dbe51ef1a8 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs @@ -1,8 +1,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves an identity with all its information from an identity id. diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/mod.rs index 7556fca4253..bc08f5c9750 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::identity::Purpose; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::Purpose; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves identities contract keys given identity ids, contract id, optional document type name and purposes diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs index d2f644995bc..70cb842ff90 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::identity::Purpose; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::Purpose; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves identities keys bound to specified contract diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/mod.rs index e1a41d0d900..9f1ce14ec5d 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves an identity id against a public key hash. diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs index 83af15538f1..d015d0c67ac 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs @@ -2,8 +2,8 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves an identity id against a public key hash. diff --git a/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs b/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs index 258ea68153d..b244865c657 100644 --- a/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs @@ -13,7 +13,7 @@ use crate::drive::identity::{ identity_contract_info_group_path_vec, identity_path_vec, IdentityRootStructure, }; use crate::error::query::QuerySyntaxError; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use grovedb::query_result_type::Key; use grovedb::{PathQuery, Query, QueryItem, SizedQuery}; use grovedb_version::version::GroveVersion; diff --git a/packages/rs-drive/src/drive/identity/key/fetch/mod.rs b/packages/rs-drive/src/drive/identity/key/fetch/mod.rs index d7230b0c64b..08fa81f84b6 100644 --- a/packages/rs-drive/src/drive/identity/key/fetch/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/fetch/mod.rs @@ -15,7 +15,7 @@ use { }, dpp::{ identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0, - identity::{KeyID, Purpose, SecurityLevel}, + identity::identity_public_key::{KeyID, Purpose, SecurityLevel}, }, grovedb::{PathQuery, SizedQuery}, integer_encoding::VarInt, @@ -27,7 +27,6 @@ use { crate::error::{drive::DriveError, fee::FeeError, identity::IdentityError, Error}, dpp::{ fee::Credits, identity::IdentityPublicKey, serialization::PlatformDeserializable, - version::PlatformVersion, }, grovedb::{ query_result_type::{ @@ -36,6 +35,7 @@ use { Element, Element::Item, }, + platform_version::version::PlatformVersion, std::collections::HashSet, }; diff --git a/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/mod.rs index dde4f4d05e3..e1600365def 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/v0/mod.rs index 0e5c38f85cd..5424011b563 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/create_new_identity_key_query_trees/v0/mod.rs @@ -5,10 +5,10 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::DriveKeyInfo; -use dpp::identity::{Purpose, SecurityLevel}; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::identity_public_key::{Purpose, SecurityLevel}; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/mod.rs index 1df714b032e..8ca1261b74a 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/mod.rs @@ -5,8 +5,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/v0/mod.rs index 59e899f71d6..9760de9b999 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/insert_key_searchable_references/v0/mod.rs @@ -12,11 +12,14 @@ use crate::util::object_size_info::PathKeyElementInfo::PathFixedSizeKeyRefElemen use crate::util::object_size_info::PathKeyInfo::PathFixedSizeKey; use crate::util::storage_flags::SINGLE_EPOCH_FLAGS_SIZE; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose, SecurityLevel}; -use dpp::version::drive_versions::DriveVersion; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + IdentityPublicKey, +}; use grovedb::batch::KeyInfoPath; use grovedb::reference_path::ReferencePathType; use grovedb::{Element, EstimatedLayerInformation, TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/key/insert/insert_new_non_unique_key/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/insert_new_non_unique_key/v0/mod.rs index 7791a0ec437..e5476636cd4 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/insert_new_non_unique_key/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/insert_new_non_unique_key/v0/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/identity/key/insert/insert_new_unique_key/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/insert_new_unique_key/v0/mod.rs index 220083d45eb..f6a53a48f9a 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/insert_new_unique_key/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/insert_new_unique_key/v0/mod.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/identity/key/insert/replace_key_in_storage/mod.rs b/packages/rs-drive/src/drive/identity/key/insert/replace_key_in_storage/mod.rs index 928956a6658..e3ff05fe63f 100644 --- a/packages/rs-drive/src/drive/identity/key/insert/replace_key_in_storage/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert/replace_key_in_storage/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Generates a set of operations to replace a key in storage. diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_non_unique_public_key_hash_reference/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_non_unique_public_key_hash_reference/mod.rs index 478a0d84f76..f5bc0138246 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_non_unique_public_key_hash_reference/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_non_unique_public_key_hash_reference/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; mod v0; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_unique_public_key_hash_reference/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_unique_public_key_hash_reference/mod.rs index f927ef796ec..c8520e5a591 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_unique_public_key_hash_reference/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/estimation_costs/add_estimation_costs_for_insert_unique_public_key_hash_reference/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/mod.rs index 99dd457ccff..14e4438016f 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/mod.rs @@ -7,8 +7,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/v0/mod.rs index 11affc461d7..670513e1f4d 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_non_unique_public_key_hash_reference_to_identity/v0/mod.rs @@ -10,11 +10,11 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; -use dpp::prelude::Identifier; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/mod.rs index e2a2b933783..c21376aa9c5 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/mod.rs @@ -7,8 +7,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/v0/mod.rs index 174f1574bc2..ecd7a70d724 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_non_unique_key/v0/mod.rs @@ -7,8 +7,8 @@ use crate::fees::op::{FunctionOp, HashFunction, LowLevelDriveOperation}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::identity_public_key::methods::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/mod.rs index 9535b3ec088..8483f5b50cd 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/mod.rs @@ -7,8 +7,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/v0/mod.rs index 924f5a429e1..2d516a91ff4 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_reference_to_unique_key/v0/mod.rs @@ -7,8 +7,8 @@ use crate::fees::op::{FunctionOp, HashFunction, LowLevelDriveOperation}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::identity_public_key::methods::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::IdentityPublicKey; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/mod.rs index 4129f4424a6..1813718261c 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/mod.rs @@ -7,8 +7,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/v0/mod.rs index e498eb6c194..67b41624f3e 100644 --- a/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/insert_key_hash_identity_reference/insert_unique_public_key_hash_reference_to_identity/v0/mod.rs @@ -7,8 +7,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/mod.rs b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/mod.rs index 6af12df8227..b6e5643f509 100644 --- a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/mod.rs @@ -2,8 +2,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves the existence of all keys associated with the specified identities. diff --git a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs index 4802df1e5fd..e202354c53a 100644 --- a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs @@ -1,7 +1,7 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Proves the existence of all keys associated with the specified identities. diff --git a/packages/rs-drive/src/drive/identity/mod.rs b/packages/rs-drive/src/drive/identity/mod.rs index c4bcc1802dd..cc7fe0fa1b9 100644 --- a/packages/rs-drive/src/drive/identity/mod.rs +++ b/packages/rs-drive/src/drive/identity/mod.rs @@ -10,18 +10,18 @@ use crate::util::object_size_info::DriveKeyInfo; use std::fmt; #[cfg(feature = "server")] -use dpp::identity::KeyID; +use dpp::identity::identity_public_key::KeyID; #[cfg(any(feature = "server", feature = "verify"))] -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; #[cfg(any(feature = "server", feature = "verify"))] -use dpp::identity::SecurityLevel; +use dpp::identity::identity_public_key::SecurityLevel; #[cfg(feature = "server")] /// Everything related to withdrawals pub mod withdrawals; #[cfg(any(feature = "server", feature = "verify"))] -use dpp::identity::Purpose::AUTHENTICATION; +use dpp::identity::identity_public_key::Purpose::AUTHENTICATION; #[cfg(feature = "server")] use integer_encoding::VarInt; diff --git a/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/mod.rs index aaa3db05935..093e3e08477 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/v0/mod.rs index 8876c58ce12..6fb281a2f0a 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/add_to_identity_balance/v0/mod.rs @@ -3,9 +3,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/identity/update/methods/add_to_previous_balance/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/add_to_previous_balance/v0/mod.rs index 379e6219daf..c48d9d18784 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/add_to_previous_balance/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/add_to_previous_balance/v0/mod.rs @@ -6,8 +6,8 @@ use crate::error::drive::DriveError; use crate::error::identity::IdentityError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::balances::credits::MAX_CREDITS; -use dpp::fee::Credits; use dpp::version::PlatformVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/identity/update/methods/apply_balance_change_from_fee_to_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/apply_balance_change_from_fee_to_identity/v0/mod.rs index 6b290a7d70c..54c53441558 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/apply_balance_change_from_fee_to_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/apply_balance_change_from_fee_to_identity/v0/mod.rs @@ -7,7 +7,7 @@ use crate::error::drive::DriveError; use crate::error::identity::IdentityError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::fee::fee_result::{BalanceChange, BalanceChangeForIdentity, FeeResult}; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/update/methods/refresh_identity_key_reference_operations/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/refresh_identity_key_reference_operations/v0/mod.rs index b4ee370d859..baf4504111c 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/refresh_identity_key_reference_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/refresh_identity_key_reference_operations/v0/mod.rs @@ -7,7 +7,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::epoch::Epoch; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use grovedb::batch::KeyInfoPath; use grovedb::reference_path::ReferencePathType; use grovedb::{Element, EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/mod.rs index 1a1618e28d8..67c4f05f4b4 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/v0/mod.rs index 58cfcf759eb..7c759c70a3e 100644 --- a/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/methods/remove_from_identity_balance/v0/mod.rs @@ -3,10 +3,10 @@ use crate::error::drive::DriveError; use crate::error::identity::IdentityError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::balances::credits::MAX_CREDITS; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/update/mod.rs b/packages/rs-drive/src/drive/identity/update/mod.rs index 0d209c88a66..35b31a3dee8 100644 --- a/packages/rs-drive/src/drive/identity/update/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/mod.rs @@ -11,6 +11,8 @@ mod tests { use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; use dpp::identity::accessors::IdentityGettersV0; + use dpp::identity::Identity; + use dpp::identity::IdentityPublicKey; mod add_new_keys_to_identity { use super::*; diff --git a/packages/rs-drive/src/drive/identity/update/operations/insert_identity_balance_operation/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/operations/insert_identity_balance_operation/v0/mod.rs index 599a1fd0425..e4d777a267e 100644 --- a/packages/rs-drive/src/drive/identity/update/operations/insert_identity_balance_operation/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/operations/insert_identity_balance_operation/v0/mod.rs @@ -3,8 +3,8 @@ use crate::drive::Drive; use crate::error::identity::IdentityError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::balances::credits::MAX_CREDITS; -use dpp::fee::Credits; use grovedb::Element; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/update/operations/update_identity_balance_operation/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/operations/update_identity_balance_operation/v0/mod.rs index 91440b173c3..836d8aa0d20 100644 --- a/packages/rs-drive/src/drive/identity/update/operations/update_identity_balance_operation/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/operations/update_identity_balance_operation/v0/mod.rs @@ -3,8 +3,8 @@ use crate::drive::Drive; use crate::error::identity::IdentityError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; +use dpp::balances::credits::Credits; use dpp::balances::credits::MAX_CREDITS; -use dpp::fee::Credits; use grovedb::Element; impl Drive { diff --git a/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/mod.rs b/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/mod.rs index f32a083f03a..4166dd00482 100644 --- a/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/mod.rs @@ -1,5 +1,5 @@ use derive_more::From; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; mod v0; diff --git a/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/v0/mod.rs b/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/v0/mod.rs index 7ad433ba17c..e0ae4089ece 100644 --- a/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/update/structs/add_to_previous_balance_outcome/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::fee::Credits; +use dpp::balances::credits::Credits; /// The outcome of adding to a previous balance #[derive(Debug)] diff --git a/packages/rs-drive/src/drive/prefunded_specialized_balances/estimation_costs/for_prefunded_specialized_balance_update/mod.rs b/packages/rs-drive/src/drive/prefunded_specialized_balances/estimation_costs/for_prefunded_specialized_balance_update/mod.rs index 31eeebb6753..23359848d67 100644 --- a/packages/rs-drive/src/drive/prefunded_specialized_balances/estimation_costs/for_prefunded_specialized_balance_update/mod.rs +++ b/packages/rs-drive/src/drive/prefunded_specialized_balances/estimation_costs/for_prefunded_specialized_balance_update/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/mod.rs index dcf358d9405..68f91caae9b 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/mod.rs @@ -1,8 +1,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; mod v0; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/v0/mod.rs index 9dabded2266..7fede3c7925 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/clear_version_information/v0/mod.rs @@ -3,8 +3,8 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Clear all version information from the backing store, this is done on epoch change in diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/mod.rs index aba2c52abb6..ab9f6b749ba 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs index e21bfcc6e46..68a1b2cf072 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs @@ -5,8 +5,8 @@ use std::ops::RangeFull; use crate::error::query::QuerySyntaxError; use crate::query::QueryItem; -use dpp::version::drive_versions::DriveVersion; use grovedb::{PathQuery, Query, SizedQuery, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Fetch versions by validators for the upgrade window and return them as a proved item diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/mod.rs index 0ad1ab1260c..475062f8dbf 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/mod.rs @@ -4,7 +4,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs index 5ed6a7d3b83..324504d74f3 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs @@ -3,8 +3,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::query::QueryItem; -use dpp::version::drive_versions::DriveVersion; use grovedb::{PathQuery, Query, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::ops::RangeFull; impl Drive { diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/mod.rs index f2bd0b430af..33d1de6922e 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use std::collections::BTreeMap; use dpp::util::deserializer::ProtocolVersion; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/v0/mod.rs index b3de7313280..87d8e6e52b1 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_validator_version_votes/v0/mod.rs @@ -8,10 +8,10 @@ use crate::error::drive::DriveError; use crate::error::query::QuerySyntaxError; use crate::query::QueryItem; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; use grovedb::query_result_type::QueryResultType; use grovedb::{PathQuery, Query, SizedQuery, TransactionArg}; use integer_encoding::VarInt; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Fetch versions by validators for the upgrade window and return them as a proved item diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/mod.rs index 09f2b48b39c..1eb6be3df5f 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/v0/mod.rs index 05b5b2e0376..0982c6df828 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_versions_with_counter/v0/mod.rs @@ -5,11 +5,11 @@ use crate::error::Error; use crate::query::QueryItem; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; use grovedb::query_result_type::QueryResultType; use grovedb::{PathQuery, Query, TransactionArg}; use integer_encoding::VarInt; use nohash_hasher::IntMap; +use platform_version::version::drive_versions::DriveVersion; use std::ops::RangeFull; impl Drive { diff --git a/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/mod.rs index 1fc507bbfff..d7aabeb4cc5 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/mod.rs @@ -4,7 +4,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/v0/mod.rs index 871e5d7bceb..bdf4d3a96c6 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/remove_validators_proposed_app_versions/v0/mod.rs @@ -12,7 +12,7 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, MaybeTree, TransactionArg}; use integer_encoding::VarInt; diff --git a/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/mod.rs index 868528288d5..c09583eb30a 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/mod.rs @@ -5,8 +5,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Updates the proposed app version for a validator. diff --git a/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/v0/mod.rs index 6556ce2a411..9b1ffb538f1 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/update_validator_proposed_app_version/v0/mod.rs @@ -10,7 +10,7 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use crate::error::cache::CacheError; use grovedb::{Element, TransactionArg}; diff --git a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract/mod.rs b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract/mod.rs index fe1d0d7b945..9dd4b5e3a5a 100644 --- a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract/mod.rs +++ b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::EstimatedLayerInformation; diff --git a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract_document_type_excluded/mod.rs b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract_document_type_excluded/mod.rs index ccb294ad2ba..6dc82be81e6 100644 --- a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract_document_type_excluded/mod.rs +++ b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_contested_document_tree_levels_up_to_contract_document_type_excluded/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::EstimatedLayerInformation; diff --git a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract/mod.rs b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract/mod.rs index dce979e4e2c..f2b272fe4e6 100644 --- a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract/mod.rs +++ b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract/mod.rs @@ -3,8 +3,8 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::drive_versions::DriveVersion; use grovedb::EstimatedLayerInformation; diff --git a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/mod.rs b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/mod.rs index 4f4a58e70f8..67ee1520e8b 100644 --- a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/mod.rs +++ b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/mod.rs @@ -3,7 +3,7 @@ mod v0; use crate::drive::Drive; use dpp::data_contract::DataContract; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/v0/mod.rs b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/v0/mod.rs index 443349d04ad..e76735824c8 100644 --- a/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/v0/mod.rs +++ b/packages/rs-drive/src/drive/shared/shared_estimation_costs/add_estimation_costs_for_levels_up_to_contract_document_type_excluded/v0/mod.rs @@ -13,8 +13,8 @@ use crate::drive::contract::paths::contract_root_path; use crate::error::Error; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::config::v0::DataContractConfigGettersV0; -use dpp::version::drive_versions::DriveVersion; use grovedb::EstimatedSumTrees::NoSumTrees; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/system/estimation_costs/for_total_system_credits_update/mod.rs b/packages/rs-drive/src/drive/system/estimation_costs/for_total_system_credits_update/mod.rs index 67ea1644af2..50704ea8a14 100644 --- a/packages/rs-drive/src/drive/system/estimation_costs/for_total_system_credits_update/mod.rs +++ b/packages/rs-drive/src/drive/system/estimation_costs/for_total_system_credits_update/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/system/genesis_time/mod.rs b/packages/rs-drive/src/drive/system/genesis_time/mod.rs index b0d0496d83d..18d8953d1ad 100644 --- a/packages/rs-drive/src/drive/system/genesis_time/mod.rs +++ b/packages/rs-drive/src/drive/system/genesis_time/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use dpp::block::epoch::Epoch; use dpp::fee::epoch::GENESIS_EPOCH_INDEX; use dpp::prelude::TimestampMillis; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; impl Drive { /// Returns the genesis time. Checks cache first, then storage. diff --git a/packages/rs-drive/src/drive/tokens/balance/fetch_identities_token_balances/mod.rs b/packages/rs-drive/src/drive/tokens/balance/fetch_identities_token_balances/mod.rs index 9e45812091c..23841897524 100644 --- a/packages/rs-drive/src/drive/tokens/balance/fetch_identities_token_balances/mod.rs +++ b/packages/rs-drive/src/drive/tokens/balance/fetch_identities_token_balances/mod.rs @@ -7,9 +7,9 @@ use crate::fees::op::LowLevelDriveOperation; use dpp::balances::credits::TokenAmount; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_value::Identifier; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/balance/prove_identities_token_balances/v0/mod.rs b/packages/rs-drive/src/drive/tokens/balance/prove_identities_token_balances/v0/mod.rs index b2a7667a713..b6ce80979a2 100644 --- a/packages/rs-drive/src/drive/tokens/balance/prove_identities_token_balances/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/balance/prove_identities_token_balances/v0/mod.rs @@ -55,8 +55,8 @@ mod tests { use dpp::identity::Identity; use std::collections::BTreeMap; + use dpp::data_contract::DataContract; use dpp::identity::accessors::IdentityGettersV0; - use dpp::prelude::DataContract; use dpp::version::PlatformVersion; #[test] diff --git a/packages/rs-drive/src/drive/tokens/balance/prove_identity_token_balances/v0/mod.rs b/packages/rs-drive/src/drive/tokens/balance/prove_identity_token_balances/v0/mod.rs index 354251fe180..24a6b0b63d0 100644 --- a/packages/rs-drive/src/drive/tokens/balance/prove_identity_token_balances/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/balance/prove_identity_token_balances/v0/mod.rs @@ -52,9 +52,9 @@ mod tests { use dpp::data_contract::config::v0::DataContractConfigV0; use dpp::data_contract::config::DataContractConfig; use dpp::data_contract::v1::DataContractV1; + use dpp::data_contract::DataContract; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::Identity; - use dpp::prelude::DataContract; use dpp::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/tokens/balance/update.rs b/packages/rs-drive/src/drive/tokens/balance/update.rs index dc7c94e3e76..9e63ffe9e4a 100644 --- a/packages/rs-drive/src/drive/tokens/balance/update.rs +++ b/packages/rs-drive/src/drive/tokens/balance/update.rs @@ -1,14 +1,12 @@ #[cfg(test)] mod tests { - - use dpp::prelude::*; - use crate::error::drive::DriveError; use crate::error::Error; use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; use crate::util::test_helpers::test_utils::identities::create_test_identity; use dpp::block::epoch::Epoch; use dpp::identity::accessors::IdentityGettersV0; + use dpp::identity::Identity; mod add_to_identity_balance { use dpp::block::block_info::BlockInfo; diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_root_token_ms_interval_distribution/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_root_token_ms_interval_distribution/mod.rs index 9e3a49a5bea..739def3c450 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_root_token_ms_interval_distribution/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_root_token_ms_interval_distribution/mod.rs @@ -3,9 +3,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::prelude::TimestampMillis; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_balances/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_balances/mod.rs index fcce3e3dff7..a6839a30e8a 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_balances/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_balances/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_identity_infos/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_identity_infos/mod.rs index a5225fa37be..042f418d6af 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_identity_infos/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_identity_infos/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_pre_programmed_distribution/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_pre_programmed_distribution/mod.rs index 97bfd007159..2887353b8de 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_pre_programmed_distribution/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_pre_programmed_distribution/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use dpp::prelude::TimestampMillis; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_status_infos/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_status_infos/mod.rs index 59cb58e5461..2a47e16a5ac 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_status_infos/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_status_infos/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_total_supply/mod.rs b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_total_supply/mod.rs index 51e3fc30f26..5479e335ea2 100644 --- a/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_total_supply/mod.rs +++ b/packages/rs-drive/src/drive/tokens/estimated_costs/for_token_total_supply/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/freeze/mod.rs b/packages/rs-drive/src/drive/tokens/freeze/mod.rs index d2339bd4c87..a2f038c0d5e 100644 --- a/packages/rs-drive/src/drive/tokens/freeze/mod.rs +++ b/packages/rs-drive/src/drive/tokens/freeze/mod.rs @@ -6,9 +6,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use grovedb::{batch::KeyInfoPath, EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/tokens/info/prove_identities_token_infos/v0/mod.rs b/packages/rs-drive/src/drive/tokens/info/prove_identities_token_infos/v0/mod.rs index edc445f0df3..4e01fae3673 100644 --- a/packages/rs-drive/src/drive/tokens/info/prove_identities_token_infos/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/info/prove_identities_token_infos/v0/mod.rs @@ -54,8 +54,8 @@ mod tests { use dpp::identity::Identity; use std::collections::BTreeMap; + use dpp::data_contract::DataContract; use dpp::identity::accessors::IdentityGettersV0; - use dpp::prelude::DataContract; use dpp::tokens::info::IdentityTokenInfo; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/tokens/info/prove_identity_token_infos/v0/mod.rs b/packages/rs-drive/src/drive/tokens/info/prove_identity_token_infos/v0/mod.rs index 18e1a3e920f..f226a515be4 100644 --- a/packages/rs-drive/src/drive/tokens/info/prove_identity_token_infos/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/info/prove_identity_token_infos/v0/mod.rs @@ -51,9 +51,9 @@ mod tests { use dpp::data_contract::config::v0::DataContractConfigV0; use dpp::data_contract::config::DataContractConfig; use dpp::data_contract::v1::DataContractV1; + use dpp::data_contract::DataContract; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::Identity; - use dpp::prelude::DataContract; use dpp::tokens::info::v0::IdentityTokenInfoV0; use dpp::tokens::info::IdentityTokenInfo; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/tokens/status/prove_token_statuses/v0/mod.rs b/packages/rs-drive/src/drive/tokens/status/prove_token_statuses/v0/mod.rs index c7f6d5afdc8..81bb1b6e77a 100644 --- a/packages/rs-drive/src/drive/tokens/status/prove_token_statuses/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/status/prove_token_statuses/v0/mod.rs @@ -48,7 +48,7 @@ mod tests { use dpp::data_contract::config::v0::DataContractConfigV0; use dpp::data_contract::config::DataContractConfig; use dpp::data_contract::v1::DataContractV1; - use dpp::prelude::DataContract; + use dpp::data_contract::DataContract; use dpp::tokens::status::v0::TokenStatusV0; use dpp::tokens::status::TokenStatus; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/tokens/system/prove_token_total_supply_and_aggregated_identity_balances/v0/mod.rs b/packages/rs-drive/src/drive/tokens/system/prove_token_total_supply_and_aggregated_identity_balances/v0/mod.rs index 5d1858139bd..c8591553381 100644 --- a/packages/rs-drive/src/drive/tokens/system/prove_token_total_supply_and_aggregated_identity_balances/v0/mod.rs +++ b/packages/rs-drive/src/drive/tokens/system/prove_token_total_supply_and_aggregated_identity_balances/v0/mod.rs @@ -50,7 +50,7 @@ mod tests { use dpp::data_contract::config::v0::DataContractConfigV0; use dpp::data_contract::config::DataContractConfig; use dpp::data_contract::v1::DataContractV1; - use dpp::prelude::DataContract; + use dpp::data_contract::DataContract; use dpp::version::PlatformVersion; use std::collections::BTreeMap; diff --git a/packages/rs-drive/src/drive/tokens/unfreeze/mod.rs b/packages/rs-drive/src/drive/tokens/unfreeze/mod.rs index 0e483c0c244..8bfa98c908d 100644 --- a/packages/rs-drive/src/drive/tokens/unfreeze/mod.rs +++ b/packages/rs-drive/src/drive/tokens/unfreeze/mod.rs @@ -6,9 +6,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use grovedb::{batch::KeyInfoPath, EstimatedLayerInformation, TransactionArg}; +use platform_value::Identifier; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/drive/votes/cleanup/remove_all_votes_given_by_identities/v0/mod.rs b/packages/rs-drive/src/drive/votes/cleanup/remove_all_votes_given_by_identities/v0/mod.rs index 2f2346d88b6..619c4d9eb88 100644 --- a/packages/rs-drive/src/drive/votes/cleanup/remove_all_votes_given_by_identities/v0/mod.rs +++ b/packages/rs-drive/src/drive/votes/cleanup/remove_all_votes_given_by_identities/v0/mod.rs @@ -12,10 +12,11 @@ use crate::drive::votes::storage_form::contested_document_resource_reference_sto use crate::query::QueryItem; use crate::util::grove_operations::BatchDeleteApplyType; use dpp::dashcore::Network; -use dpp::prelude::{BlockHeight, Identifier}; +use dpp::prelude::BlockHeight; use dpp::version::PlatformVersion; use grovedb::query_result_type::QueryResultType::QueryPathKeyElementTrioResultType; use grovedb::{MaybeTree, PathQuery, Query, SizedQuery, TransactionArg}; +use platform_value::Identifier; impl Drive { /// We remove votes for an identity when that identity is somehow disabled. Currently there is diff --git a/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/mod.rs b/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/mod.rs index 191d6a4952d..82d927d842e 100644 --- a/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/mod.rs +++ b/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/mod.rs @@ -6,9 +6,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_value::Identifier; impl Drive { /// We remove the references of specific votes given by an identity when the vote poll ends diff --git a/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/v0/mod.rs b/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/v0/mod.rs index 1802e9ab242..2c66c53b764 100644 --- a/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/votes/cleanup/remove_specific_votes_given_by_identity/v0/mod.rs @@ -4,9 +4,9 @@ use crate::error::Error; use crate::drive::votes::paths::vote_contested_resource_identity_votes_tree_path_for_identity; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchDeleteApplyType; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use grovedb::{MaybeTree, TransactionArg}; +use platform_value::Identifier; impl Drive { /// We remove votes for an identity when that identity is somehow disabled. Currently there is diff --git a/packages/rs-drive/src/drive/votes/resolved/vote_polls/contested_document_resource_vote_poll/resolve.rs b/packages/rs-drive/src/drive/votes/resolved/vote_polls/contested_document_resource_vote_poll/resolve.rs index 933c7477241..f8fb22e78c8 100644 --- a/packages/rs-drive/src/drive/votes/resolved/vote_polls/contested_document_resource_vote_poll/resolve.rs +++ b/packages/rs-drive/src/drive/votes/resolved/vote_polls/contested_document_resource_vote_poll/resolve.rs @@ -16,12 +16,13 @@ use crate::util::object_size_info::DataContractOwnedResolvedInfo; use crate::util::object_size_info::DataContractResolvedInfo; use dpp::data_contract::accessors::v0::DataContractV0Getters; #[cfg(any(feature = "server", feature = "verify"))] -use dpp::prelude::DataContract; +use dpp::data_contract::DataContract; use dpp::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; #[cfg(feature = "server")] use grovedb::TransactionArg; +#[cfg(feature = "server")] use platform_version::version::PlatformVersion; -#[cfg(any(feature = "server", feature = "verify"))] +#[cfg(any(feature = "server"))] use std::sync::Arc; /// A trait for resolving information related to a contested document resource vote poll. diff --git a/packages/rs-drive/src/drive/votes/storage_form/contested_document_resource_storage_form/mod.rs b/packages/rs-drive/src/drive/votes/storage_form/contested_document_resource_storage_form/mod.rs index a8367c0ae5c..04a46c10d21 100644 --- a/packages/rs-drive/src/drive/votes/storage_form/contested_document_resource_storage_form/mod.rs +++ b/packages/rs-drive/src/drive/votes/storage_form/contested_document_resource_storage_form/mod.rs @@ -8,9 +8,9 @@ use crate::error::Error; use crate::util::type_constants::DEFAULT_HASH_SIZE_USIZE; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; +use dpp::data_contract::DataContract; use dpp::identifier::Identifier; use dpp::platform_value::Value; -use dpp::prelude::DataContract; use dpp::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; use dpp::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; use dpp::voting::vote_polls::VotePoll; diff --git a/packages/rs-drive/src/error/drive.rs b/packages/rs-drive/src/error/drive.rs index 48402e06ca5..22fe36c19a4 100644 --- a/packages/rs-drive/src/error/drive.rs +++ b/packages/rs-drive/src/error/drive.rs @@ -1,7 +1,7 @@ use crate::drive::contract::MAX_CONTRACT_HISTORY_FETCH_LIMIT; use dpp::fee::Credits; -use dpp::identifier::Identifier; -use dpp::version::FeatureVersion; +use platform_value::Identifier; +use versioned_feature_core::FeatureVersion; /// Drive errors #[derive(Debug, thiserror::Error)] diff --git a/packages/rs-drive/src/fees/calculate_fee/mod.rs b/packages/rs-drive/src/fees/calculate_fee/mod.rs index f2a6516a5ed..c75d35cc388 100644 --- a/packages/rs-drive/src/fees/calculate_fee/mod.rs +++ b/packages/rs-drive/src/fees/calculate_fee/mod.rs @@ -5,8 +5,8 @@ use crate::fees::op::{BaseOp, LowLevelDriveOperation}; use dpp::block::epoch::Epoch; use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::fee::fee_result::FeeResult; -use dpp::version::PlatformVersion; use enum_map::EnumMap; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/prove/prove_multiple_state_transition_results/mod.rs b/packages/rs-drive/src/prove/prove_multiple_state_transition_results/mod.rs index 1d8dbe40ac9..d3b7e835dc9 100644 --- a/packages/rs-drive/src/prove/prove_multiple_state_transition_results/mod.rs +++ b/packages/rs-drive/src/prove/prove_multiple_state_transition_results/mod.rs @@ -7,8 +7,8 @@ use crate::query::{IdentityBasedVoteDriveQuery, SingleDocumentDriveQuery}; use crate::query::identity_token_balance_drive_query::IdentityTokenBalanceDriveQuery; use crate::query::identity_token_info_drive_query::IdentityTokenInfoDriveQuery; use crate::query::token_status_drive_query::TokenStatusDriveQuery; -use dpp::version::PlatformVersion; use grovedb::TransactionArg; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/prove/prove_multiple_state_transition_results/v0/mod.rs b/packages/rs-drive/src/prove/prove_multiple_state_transition_results/v0/mod.rs index cf792e5ea42..d867693c94f 100644 --- a/packages/rs-drive/src/prove/prove_multiple_state_transition_results/v0/mod.rs +++ b/packages/rs-drive/src/prove/prove_multiple_state_transition_results/v0/mod.rs @@ -6,9 +6,9 @@ use crate::query::{IdentityBasedVoteDriveQuery, SingleDocumentDriveQuery}; use crate::query::identity_token_balance_drive_query::IdentityTokenBalanceDriveQuery; use crate::query::identity_token_info_drive_query::IdentityTokenInfoDriveQuery; use crate::query::token_status_drive_query::TokenStatusDriveQuery; -use dpp::version::PlatformVersion; use grovedb::{PathQuery, TransactionArg}; use itertools::{Either, Itertools}; +use platform_version::version::PlatformVersion; impl Drive { /// This function query requested identities, documents and contracts and provide cryptographic proofs diff --git a/packages/rs-drive/src/query/conditions.rs b/packages/rs-drive/src/query/conditions.rs index 73aecb76768..44e10f17135 100644 --- a/packages/rs-drive/src/query/conditions.rs +++ b/packages/rs-drive/src/query/conditions.rs @@ -19,7 +19,7 @@ use dpp::data_contract::document_type::{DocumentPropertyType, DocumentType, Docu use dpp::document::document_methods::DocumentMethodsV0; use dpp::document::Document; use dpp::platform_value::Value; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; /// Converts SQL values to CBOR. fn sql_value_to_platform_value(sql_value: ast::Value) -> Option { diff --git a/packages/rs-drive/src/query/drive_contested_document_query.rs b/packages/rs-drive/src/query/drive_contested_document_query.rs index da161609955..f99bd411336 100644 --- a/packages/rs-drive/src/query/drive_contested_document_query.rs +++ b/packages/rs-drive/src/query/drive_contested_document_query.rs @@ -12,11 +12,11 @@ use dpp::block::block_info::BlockInfo; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; -use dpp::prelude::Identifier; #[cfg(feature = "server")] use grovedb::TransactionArg; #[cfg(any(feature = "server", feature = "verify"))] use grovedb::{PathQuery, SizedQuery}; +use platform_value::Identifier; use platform_version::version::PlatformVersion; use std::ops::BitXor; diff --git a/packages/rs-drive/src/query/mod.rs b/packages/rs-drive/src/query/mod.rs index 1d67a1f0e29..d0a90628b7d 100644 --- a/packages/rs-drive/src/query/mod.rs +++ b/packages/rs-drive/src/query/mod.rs @@ -11,6 +11,10 @@ pub use { vote_query::IdentityBasedVoteDriveQuery, }; // Imports available when either "server" or "verify" features are enabled +#[cfg(all(feature = "server", feature = "verify"))] +use crate::verify::RootHash; +#[cfg(feature = "server")] +use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; #[cfg(any(feature = "server", feature = "verify"))] use { crate::{ @@ -24,15 +28,13 @@ use { document_type::{DocumentTypeRef, Index, IndexProperty}, DataContract, }, - document::{ - document_methods::DocumentMethodsV0, - serialization_traits::DocumentPlatformConversionMethodsV0, Document, DocumentV0Getters, - }, - platform_value::{btreemap_extensions::BTreeValueRemoveFromMapHelper, Value}, - version::PlatformVersion, + document::{document_methods::DocumentMethodsV0, Document, DocumentV0Getters}, + platform_value::btreemap_extensions::BTreeValueRemoveFromMapHelper, ProtocolError, }, indexmap::IndexMap, + platform_value::Value, + platform_version::version::PlatformVersion, sqlparser::{ ast::{self, OrderByExpr, Select, Statement, TableFactor::Table, Value::Number}, dialect::MySqlDialect, @@ -41,9 +43,6 @@ use { std::{collections::BTreeMap, ops::BitXor}, }; -#[cfg(feature = "verify")] -use crate::verify::RootHash; - #[cfg(feature = "server")] pub use grovedb::{ query_result_type::{QueryResultElements, QueryResultType}, @@ -51,7 +50,7 @@ pub use grovedb::{ }; use dpp::document; -use dpp::prelude::Identifier; +use platform_value::Identifier; #[cfg(feature = "server")] use { crate::{drive::Drive, fees::op::LowLevelDriveOperation}, @@ -103,8 +102,8 @@ pub mod vote_polls_by_document_type_query; /// It should be implemented by the caller in order to provide data /// contract required for operations like proof verification. #[cfg(any(feature = "server", feature = "verify"))] -pub type ContractLookupFn<'a> = dyn Fn(&dpp::identifier::Identifier) -> Result>, crate::error::Error> - + 'a; +pub type ContractLookupFn<'a> = + dyn Fn(&Identifier) -> Result>, Error> + 'a; /// Creates a [ContractLookupFn] function that returns provided data contract when requested. /// @@ -120,13 +119,12 @@ pub type ContractLookupFn<'a> = dyn Fn(&dpp::identifier::Identifier) -> Result( data_contract: Arc, ) -> Box> { - let func = move - |id: &dpp::identifier::Identifier| -> Result>, crate::error::Error> { - if data_contract.id().ne(id) { - return Ok(None); - } - Ok(Some(Arc::clone(&data_contract))) - }; + let func = move |id: &Identifier| -> Result>, Error> { + if data_contract.id().ne(id) { + return Ok(None); + } + Ok(Some(Arc::clone(&data_contract))) + }; Box::new(func) } @@ -2281,9 +2279,9 @@ mod tests { use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; - use dpp::prelude::Identifier; use grovedb::Query; use indexmap::IndexMap; + use platform_value::Identifier; use rand::prelude::StdRng; use rand::SeedableRng; use serde_json::json; diff --git a/packages/rs-drive/src/query/vote_poll_vote_state_query.rs b/packages/rs-drive/src/query/vote_poll_vote_state_query.rs index 8393eccfb3a..dd2437d4103 100644 --- a/packages/rs-drive/src/query/vote_poll_vote_state_query.rs +++ b/packages/rs-drive/src/query/vote_poll_vote_state_query.rs @@ -19,10 +19,12 @@ use dpp::data_contract::DataContract; use dpp::identifier::Identifier; #[cfg(feature = "server")] use dpp::serialization::PlatformDeserializable; +#[cfg(feature = "server")] +use dpp::voting::contender_structs::ContenderWithSerializedDocumentV0; use dpp::voting::contender_structs::{ - ContenderWithSerializedDocument, ContenderWithSerializedDocumentV0, - FinalizedContenderWithSerializedDocument, + ContenderWithSerializedDocument, FinalizedContenderWithSerializedDocument, }; +#[cfg(feature = "server")] use dpp::voting::vote_info_storage::contested_document_vote_poll_stored_info::{ ContestedDocumentVotePollStoredInfo, ContestedDocumentVotePollStoredInfoV0Getters, }; diff --git a/packages/rs-drive/src/query/vote_polls_by_end_date_query.rs b/packages/rs-drive/src/query/vote_polls_by_end_date_query.rs index c702496708b..b99b059bd74 100644 --- a/packages/rs-drive/src/query/vote_polls_by_end_date_query.rs +++ b/packages/rs-drive/src/query/vote_polls_by_end_date_query.rs @@ -1,14 +1,18 @@ use crate::drive::votes::paths::vote_end_date_queries_tree_path_vec; +#[cfg(feature = "server")] use crate::drive::Drive; #[cfg(feature = "server")] use crate::error::drive::DriveError; +#[cfg(feature = "server")] use crate::error::Error; #[cfg(feature = "server")] use crate::fees::op::LowLevelDriveOperation; #[cfg(feature = "server")] use crate::query::GroveError; use crate::query::Query; -use crate::util::common::encode::{decode_u64, encode_u64}; +#[cfg(feature = "server")] +use crate::util::common::encode::decode_u64; +use crate::util::common::encode::encode_u64; use bincode::{Decode, Encode}; #[cfg(feature = "server")] use dpp::block::block_info::BlockInfo; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/batch_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/batch_transition.rs index 31a92022373..04f1bf2305b 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/batch_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/batch_transition.rs @@ -4,8 +4,8 @@ use crate::state_transition_action::action_convert_to_operations::DriveHighLevel use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; use crate::util::batch::DriveOperation; use dpp::block::epoch::Epoch; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; +use platform_value::Identifier; impl DriveHighLevelBatchOperationConverter for BatchedTransitionAction { fn into_high_level_batch_drive_operations<'b>( diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_create_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_create_transition.rs index 16859a60aed..d654ec960c0 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_create_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_create_transition.rs @@ -10,7 +10,7 @@ use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; use dpp::document::Document; -use dpp::prelude::Identifier; +use platform_value::Identifier; use std::borrow::Cow; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenEffect; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_purchase_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_purchase_transition.rs index 5f782fb4f1a..bef3b30667c 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_purchase_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_purchase_transition.rs @@ -7,7 +7,7 @@ use crate::util::object_size_info::{DataContractInfo, DocumentTypeInfo, OwnedDoc use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; -use dpp::prelude::Identifier; +use platform_value::Identifier; use std::borrow::Cow; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenEffect; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_replace_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_replace_transition.rs index 3bfe76d3940..8cc9da13c11 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_replace_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_replace_transition.rs @@ -8,7 +8,7 @@ use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; use dpp::document::Document; -use dpp::prelude::Identifier; +use platform_value::Identifier; use std::borrow::Cow; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenEffect; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transfer_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transfer_transition.rs index b8e772caa5a..af26ee04357 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transfer_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transfer_transition.rs @@ -8,7 +8,7 @@ use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; use dpp::document::DocumentV0Getters; -use dpp::prelude::Identifier; +use platform_value::Identifier; use std::borrow::Cow; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenEffect; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transition.rs index 15e0a62f2e6..90d98786dba 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_transition.rs @@ -3,8 +3,8 @@ use crate::state_transition_action::action_convert_to_operations::batch::DriveHi use crate::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; use crate::util::batch::DriveOperation; use dpp::block::epoch::Epoch; -use dpp::prelude::Identifier; -use dpp::version::PlatformVersion; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; impl DriveHighLevelBatchOperationConverter for DocumentTransitionAction { fn into_high_level_batch_drive_operations<'b>( diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_update_price_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_update_price_transition.rs index 76d5552b0ca..e17ccf54b52 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_update_price_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/document/document_update_price_transition.rs @@ -7,7 +7,7 @@ use crate::util::object_size_info::{DataContractInfo, DocumentTypeInfo, OwnedDoc use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; -use dpp::prelude::Identifier; +use platform_value::Identifier; use std::borrow::Cow; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenEffect; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/mod.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/mod.rs index 99c1c40408a..96f67fcc090 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/mod.rs @@ -2,7 +2,7 @@ use crate::error::Error; use crate::util::batch::DriveOperation; use dpp::block::epoch::Epoch; use dpp::platform_value::Identifier; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; mod batch_transition; mod document; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/token/token_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/token/token_transition.rs index 54c8009d197..e8c46eaec21 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/token/token_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/batch/token/token_transition.rs @@ -3,7 +3,7 @@ use crate::state_transition_action::action_convert_to_operations::batch::DriveHi use crate::state_transition_action::batch::batched_transition::token_transition::TokenTransitionAction; use crate::util::batch::DriveOperation; use dpp::block::epoch::Epoch; -use dpp::prelude::Identifier; +use platform_value::Identifier; use dpp::tokens::token_event::TokenEvent; use dpp::version::PlatformVersion; use crate::state_transition_action::batch::batched_transition::token_transition::token_burn_transition_action::TokenBurnTransitionActionAccessorsV0; diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/identity/identity_create_transition.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/identity/identity_create_transition.rs index c888c3a18de..1c3b1864cac 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/identity/identity_create_transition.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/identity/identity_create_transition.rs @@ -9,7 +9,7 @@ use crate::state_transition_action::identity::identity_create::{ IdentityCreateTransitionAction, IdentityFromIdentityCreateTransitionAction, }; use dpp::block::epoch::Epoch; -use dpp::prelude::Identity; +use dpp::identity::Identity; use dpp::version::PlatformVersion; impl DriveHighLevelOperationConverter for IdentityCreateTransitionAction { diff --git a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/mod.rs b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/mod.rs index 28c69e3f883..9d05de6fbca 100644 --- a/packages/rs-drive/src/state_transition_action/action_convert_to_operations/mod.rs +++ b/packages/rs-drive/src/state_transition_action/action_convert_to_operations/mod.rs @@ -12,7 +12,7 @@ use crate::error::Error; use crate::state_transition_action::StateTransitionAction; use crate::util::batch::DriveOperation; use dpp::block::epoch::Epoch; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; /// A converter that will get High Level Drive Operations from State transitions pub trait DriveHighLevelOperationConverter { diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/transformer.rs index 84fb5fcf744..0b1d202202c 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/transformer.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use dpp::data_contract::document_type::DocumentType; use dpp::prelude::ConsensusValidationResult; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; +use dpp::state_transitions::document::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenCost; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/v0/transformer.rs index a4bbfc86333..6b40968ac8f 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_base_transition_action/v0/transformer.rs @@ -7,9 +7,9 @@ use dpp::consensus::state::state_error::StateError; use dpp::consensus::state::token::{IdentityHasNotAgreedToPayRequiredTokenAmountError, IdentityTryingToPayWithWrongTokenError, RequiredTokenPaymentInfoNotSetError}; use dpp::prelude::ConsensusValidationResult; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::document_base_transition::v1::v1_methods::DocumentBaseTransitionV1Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v1::v1_methods::DocumentBaseTransitionV1Methods; use dpp::tokens::calculate_token_id; use dpp::tokens::gas_fees_paid_by::GasFeesPaidBy; use dpp::tokens::token_amount_on_contract_token::DocumentActionTokenCost; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/transformer.rs index cce4ec18856..24fa3830633 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/transformer.rs @@ -5,7 +5,7 @@ use grovedb::TransactionArg; use std::sync::Arc; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; use platform_version::version::PlatformVersion; use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/v0/transformer.rs index 7fdbaba02e9..960af75e20d 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_create_transition_action/v0/transformer.rs @@ -6,7 +6,7 @@ use grovedb::TransactionArg; use std::sync::Arc; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::document_create_transition::v0::DocumentCreateTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::DocumentCreateTransitionV0; use dpp::voting::vote_info_storage::contested_document_vote_poll_stored_info::ContestedDocumentVotePollStoredInfo; use dpp::voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/transformer.rs index 30e506013b7..0137e8b252c 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/transformer.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::DocumentDeleteTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentDeleteTransition; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/v0/transformer.rs index ec815461626..3cf09bac0e4 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_delete_transition_action/v0/transformer.rs @@ -4,7 +4,7 @@ use dpp::data_contract::document_type::accessors::DocumentTypeV1Getters; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/mod.rs index e91b681f104..2cce68ee7f7 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/mod.rs @@ -1,8 +1,8 @@ mod v0; use derive_more::From; +use dpp::balances::credits::Credits; use dpp::document::Document; -use dpp::fee::Credits; use dpp::platform_value::Identifier; use dpp::ProtocolError; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/transformer.rs index d6082362fc6..65c271e8087 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/transformer.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::DocumentPurchaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentPurchaseTransition; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/mod.rs index dd0fe6acb8d..5a67ccaeb86 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/mod.rs @@ -1,7 +1,7 @@ pub mod transformer; +use dpp::balances::credits::Credits; use dpp::document::Document; -use dpp::fee::Credits; use dpp::identifier::Identifier; use crate::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/transformer.rs index c0a706aa30c..a5d8deb9322 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_purchase_transition_action/v0/transformer.rs @@ -7,7 +7,7 @@ use dpp::data_contract::document_type::accessors::DocumentTypeV1Getters; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::DocumentPurchaseTransitionV0; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/transformer.rs index 7cd6cfb39bc..a3d6fe80f2d 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/transformer.rs @@ -5,7 +5,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::identity::TimestampMillis; use dpp::prelude::{BlockHeight, ConsensusValidationResult, CoreBlockHeight, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::DocumentReplaceTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentReplaceTransition; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/v0/transformer.rs index 8642bc34221..354d41014d5 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_replace_transition_action/v0/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::identity::TimestampMillis; use dpp::prelude::{BlockHeight, ConsensusValidationResult, CoreBlockHeight, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/transformer.rs index a5035f8951e..89b257065f2 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/transformer.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::DocumentTransferTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentTransferTransition; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/v0/transformer.rs index 17264725946..3619eac4256 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transfer_transition_action/v0/transformer.rs @@ -7,7 +7,7 @@ use dpp::data_contract::document_type::accessors::DocumentTypeV1Getters; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transition_action_type.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transition_action_type.rs index 83d41158eaf..c6048092f71 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transition_action_type.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_transition_action_type.rs @@ -1,5 +1,5 @@ use crate::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; -use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::{ DocumentTransitionActionType, DocumentTransitionActionTypeGetter, }; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/transformer.rs index 03b1e93d597..3fb2ba1eebd 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/transformer.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::DocumentUpdatePriceTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentUpdatePriceTransition; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/v0/transformer.rs index f18dca6085d..b4b3b84b6df 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/document_update_price_transition_action/v0/transformer.rs @@ -7,7 +7,7 @@ use dpp::data_contract::document_type::accessors::DocumentTypeV1Getters; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::DocumentUpdatePriceTransitionV0; use crate::drive::contract::DataContractFetchInfo; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/mod.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/mod.rs index 7c40b645318..2ace9256f7c 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/document_transition/mod.rs @@ -14,7 +14,7 @@ mod document_transition_action_type; /// document_update_price_transition_action pub mod document_update_price_transition_action; -pub use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; +pub use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; use derive_more::From; use crate::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::DocumentBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs index cbbef1173cf..ebbaa904bc4 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/mod.rs @@ -32,12 +32,13 @@ pub mod token_set_price_for_direct_purchase_transition_action; use derive_more::From; use dpp::block::block_info::BlockInfo; use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dpp::data_contract::DataContract; use dpp::data_contract::associated_token::token_configuration::accessors::v0::TokenConfigurationV0Getters; use dpp::data_contract::associated_token::token_keeps_history_rules::accessors::v0::TokenKeepsHistoryRulesV0Getters; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::document::Document; use dpp::identifier::Identifier; -use dpp::prelude::{DataContract, IdentityNonce}; +use dpp::prelude::IdentityNonce; use dpp::ProtocolError; use platform_version::version::PlatformVersion; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/transformer.rs index 98a3e377676..29396b155f2 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/transformer.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::prelude::ConsensusValidationResult; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use platform_version::version::PlatformVersion; use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/v0/transformer.rs index 3b0d1ce2049..f39cf15f709 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_base_transition_action/v0/transformer.rs @@ -2,16 +2,16 @@ use dpp::group::{GroupStateTransitionInfo, GroupStateTransitionResolvedInfo}; use dpp::platform_value::Identifier; use grovedb::TransactionArg; use std::sync::Arc; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionDoesNotExistError, IdentityNotMemberOfGroupError}; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::InvalidGroupPositionError; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionDoesNotExistError, IdentityNotMemberOfGroupError}; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::InvalidGroupPositionError; use dpp::data_contract::accessors::v1::DataContractV1Getters; use dpp::data_contract::group::accessors::v0::GroupV0Getters; use dpp::group::group_action::GroupActionAccessors; use dpp::prelude::ConsensusValidationResult; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::TokenBaseTransitionV0; use platform_version::version::PlatformVersion; use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/transformer.rs index 50480d1016a..b43195a2d99 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/transformer.rs @@ -9,7 +9,7 @@ use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_burn_transition_action::{ TokenBurnTransitionAction, TokenBurnTransitionActionV0, }; -use dpp::state_transition::batch_transition::token_burn_transition::TokenBurnTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_burn_transition::TokenBurnTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/v0/transformer.rs index 021239e60b9..9a2e1c75b78 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_burn_transition_action/v0/transformer.rs @@ -1,5 +1,5 @@ use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_burn_transition::v0::TokenBurnTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_burn_transition::v0::TokenBurnTransitionV0; use dpp::ProtocolError; use grovedb::TransactionArg; use std::sync::Arc; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_claim_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_claim_transition_action/transformer.rs index 558baa6a132..5cce5727928 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_claim_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_claim_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_claim_transition_action::{TokenClaimTransitionActionV0, TokenClaimTransitionAction}; -use dpp::state_transition::batch_transition::token_claim_transition::TokenClaimTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_claim_transition::TokenClaimTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/transformer.rs index bc814e2b077..2f1a42a4cb2 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_config_update_transition_action::{TokenConfigUpdateTransitionActionV0, TokenConfigUpdateTransitionAction}; -use dpp::state_transition::batch_transition::token_config_update_transition::TokenConfigUpdateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_config_update_transition::TokenConfigUpdateTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/v0/transformer.rs index acbfe8a3c23..2fb68ac4766 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_config_update_transition_action/v0/transformer.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_config_update_transition::v0::TokenConfigUpdateTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_config_update_transition::v0::TokenConfigUpdateTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/transformer.rs index 23c062fcd36..e3fa5b1834e 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_destroy_frozen_funds_transition_action::{TokenDestroyFrozenFundsTransitionActionV0, TokenDestroyFrozenFundsTransitionAction}; -use dpp::state_transition::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::TokenDestroyFrozenFundsTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/v0/transformer.rs index 6a9f10a19be..2a2052756d4 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_destroy_frozen_funds_transition_action/v0/transformer.rs @@ -1,17 +1,17 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::IdentityDoesNotHaveEnoughTokenBalanceError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::IdentityDoesNotHaveEnoughTokenBalanceError; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_destroy_frozen_funds_transition::v0::TokenDestroyFrozenFundsTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::v0::TokenDestroyFrozenFundsTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; use crate::state_transition_action::batch::batched_transition::token_transition::token_destroy_frozen_funds_transition_action::v0::TokenDestroyFrozenFundsTransitionActionV0; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/transformer.rs index 110b25e6046..4422229fc75 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_direct_purchase_transition_action::{TokenDirectPurchaseTransitionActionV0, TokenDirectPurchaseTransitionAction}; -use dpp::state_transition::batch_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_direct_purchase_transition::TokenDirectPurchaseTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/v0/transformer.rs index 41c1debe07f..b72e110b9bd 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_direct_purchase_transition_action/v0/transformer.rs @@ -1,18 +1,18 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::state::token::{TokenAmountUnderMinimumSaleAmount, TokenDirectPurchaseUserPriceTooLow, TokenNotForDirectSale}; +use dpp::errors::consensus::ConsensusError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::state::token::{TokenAmountUnderMinimumSaleAmount, TokenDirectPurchaseUserPriceTooLow, TokenNotForDirectSale}; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_direct_purchase_transition::v0::TokenDirectPurchaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_direct_purchase_transition::v0::TokenDirectPurchaseTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; use crate::state_transition_action::batch::batched_transition::token_transition::token_direct_purchase_transition_action::v0::TokenDirectPurchaseTransitionActionV0; use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use dpp::tokens::token_pricing_schedule::TokenPricingSchedule; use platform_version::version::PlatformVersion; use crate::drive::Drive; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/transformer.rs index 64a345a04fe..f158faf0934 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_emergency_action_transition_action::{TokenEmergencyActionTransitionActionV0, TokenEmergencyActionTransitionAction}; -use dpp::state_transition::batch_transition::token_emergency_action_transition::TokenEmergencyActionTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_emergency_action_transition::TokenEmergencyActionTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/v0/transformer.rs index c58c69f7fa8..a72694ab7c3 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_emergency_action_transition_action/v0/transformer.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_emergency_action_transition::v0::TokenEmergencyActionTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_emergency_action_transition::v0::TokenEmergencyActionTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/transformer.rs index 039223e7174..3ddc9b935e3 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_freeze_transition_action::{TokenFreezeTransitionActionV0, TokenFreezeTransitionAction}; -use dpp::state_transition::batch_transition::token_freeze_transition::TokenFreezeTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_freeze_transition::TokenFreezeTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/v0/transformer.rs index 0eb3dcaa4a9..2765dd51790 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_freeze_transition_action/v0/transformer.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_freeze_transition::v0::TokenFreezeTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::TokenFreezeTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/transformer.rs index 6801171fd56..35adae0f728 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_mint_transition_action::{TokenMintTransitionActionV0, TokenMintTransitionAction}; -use dpp::state_transition::batch_transition::token_mint_transition::TokenMintTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::TokenMintTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/v0/transformer.rs index 808ee91c375..2c6c57707ba 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_mint_transition_action/v0/transformer.rs @@ -1,13 +1,13 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; -use dpp::consensus::basic::BasicError; -use dpp::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, DestinationIdentityForTokenMintingNotSetError}; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, DestinationIdentityForTokenMintingNotSetError}; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_mint_transition::v0::TokenMintTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::TokenMintTransitionV0; use dpp::ProtocolError; use dpp::data_contract::accessors::v1::DataContractV1Getters; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::{TokenBaseTransitionAction, TokenBaseTransitionActionAccessorsV0}; use crate::state_transition_action::batch::batched_transition::token_transition::token_mint_transition_action::v0::TokenMintTransitionActionV0; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/transformer.rs index 950121f112b..d8f045e5f17 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/transformer.rs @@ -4,7 +4,7 @@ use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; use dpp::platform_value::Identifier; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::TokenTransferTransition; +use dpp::state_transition::state_transitions::document::batch_transition::TokenTransferTransition; use platform_version::version::PlatformVersion; use crate::drive::contract::DataContractFetchInfo; use crate::drive::Drive; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/v0/transformer.rs index 0f92b809fa1..7eb0d4df718 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/v0/transformer.rs @@ -1,5 +1,5 @@ use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_transfer_transition::v0::TokenTransferTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_transfer_transition::v0::TokenTransferTransitionV0; use dpp::ProtocolError; use grovedb::TransactionArg; use std::sync::Arc; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transition_action_type.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transition_action_type.rs index d9a06b61de8..ee08add3f3a 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transition_action_type.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transition_action_type.rs @@ -1,5 +1,5 @@ use crate::state_transition_action::batch::batched_transition::token_transition::TokenTransitionAction; -use dpp::state_transition::batch_transition::batched_transition::token_transition_action_type::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition_action_type::{ TokenTransitionActionType, TokenTransitionActionTypeGetter, }; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/transformer.rs index 895716e1489..dd528be971a 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/transformer.rs @@ -7,7 +7,7 @@ use dpp::fee::fee_result::FeeResult; use dpp::prelude::{ConsensusValidationResult, UserFeeIncrease}; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_unfreeze_transition_action::{TokenUnfreezeTransitionActionV0, TokenUnfreezeTransitionAction}; -use dpp::state_transition::batch_transition::token_unfreeze_transition::TokenUnfreezeTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::TokenUnfreezeTransition; use platform_version::version::PlatformVersion; use crate::drive::Drive; use crate::error::Error; diff --git a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/v0/transformer.rs index 2c4833d9150..08b0702c245 100644 --- a/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_unfreeze_transition_action/v0/transformer.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use grovedb::TransactionArg; use dpp::block::block_info::BlockInfo; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::token_unfreeze_transition::v0::TokenUnfreezeTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::TokenUnfreezeTransitionV0; use dpp::ProtocolError; use crate::drive::contract::DataContractFetchInfo; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/batch/mod.rs b/packages/rs-drive/src/state_transition_action/batch/mod.rs index a01f5b14c2e..9704f907c45 100644 --- a/packages/rs-drive/src/state_transition_action/batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/mod.rs @@ -3,8 +3,8 @@ use crate::state_transition_action::batch::v0::BatchTransitionActionV0; use derive_more::From; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; -use dpp::fee::Credits; -use dpp::identity::SecurityLevel; +use dpp::balances::credits::Credits; +use dpp::identity::identity_public_key::SecurityLevel; use dpp::platform_value::Identifier; use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; diff --git a/packages/rs-drive/src/state_transition_action/batch/v0/mod.rs b/packages/rs-drive/src/state_transition_action/batch/v0/mod.rs index 83b4928e4b8..d9cabb4e4cf 100644 --- a/packages/rs-drive/src/state_transition_action/batch/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/batch/v0/mod.rs @@ -1,9 +1,9 @@ -use dpp::fee::Credits; -use crate::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; +use dpp::balances::credits::Credits; use dpp::identifier::Identifier; use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; +use crate::state_transition_action::batch::batched_transition::document_transition::DocumentTransitionAction; use crate::state_transition_action::batch::batched_transition::document_transition::document_create_transition_action::DocumentCreateTransitionActionAccessorsV0; use crate::state_transition_action::batch::batched_transition::document_transition::document_purchase_transition_action::DocumentPurchaseTransitionActionAccessorsV0; use crate::state_transition_action::batch::batched_transition::token_transition::token_direct_purchase_transition_action::TokenDirectPurchaseTransitionActionAccessorsV0; diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/transformer.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/transformer.rs index 3dafecf3d2c..3090dcde958 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/transformer.rs @@ -1,7 +1,7 @@ use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use crate::state_transition_action::contract::data_contract_create::DataContractCreateTransitionAction; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::validation::operations::ProtocolValidationOperation; use dpp::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/transformer.rs index 8b829dfeccb..96d1c2a7e51 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/transformer.rs @@ -1,8 +1,8 @@ use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use dpp::block::block_info::BlockInfo; +use dpp::data_contract::DataContract; use dpp::data_contract::accessors::v1::DataContractV1Setters; -use dpp::prelude::DataContract; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; use dpp::validation::operations::ProtocolValidationOperation; use dpp::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/transformer.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/transformer.rs index adf23f48b50..ce358766610 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/transformer.rs @@ -1,7 +1,7 @@ use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use crate::state_transition_action::contract::data_contract_update::DataContractUpdateTransitionAction; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::validation::operations::ProtocolValidationOperation; use dpp::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/transformer.rs index 413320d903f..3c359533808 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/transformer.rs @@ -2,7 +2,7 @@ use crate::state_transition_action::contract::data_contract_update::v0::DataCont use dpp::block::block_info::BlockInfo; use dpp::data_contract::accessors::v1::DataContractV1Setters; use dpp::data_contract::DataContract; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; use dpp::validation::operations::ProtocolValidationOperation; use dpp::ProtocolError; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/transformer.rs index dc69bfea035..007324fff75 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/transformer.rs @@ -1,9 +1,9 @@ use crate::state_transition_action::identity::identity_create::v0::IdentityCreateTransitionActionV0; use crate::state_transition_action::identity::identity_create::IdentityCreateTransitionAction; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::consensus::ConsensusError; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::errors::consensus::ConsensusError; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; impl IdentityCreateTransitionAction { /// try from diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/mod.rs index d8dda5fe292..5919f089a23 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/mod.rs @@ -2,14 +2,14 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::identity::{IdentityPublicKey, IdentityV0, PartialIdentity}; +use dpp::identity::{v0::IdentityV0, IdentityPublicKey, PartialIdentity}; use dpp::asset_lock::reduced_asset_lock_value::{AssetLockValue, AssetLockValueGettersV0}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::Identity; use dpp::platform_value::Bytes36; use dpp::prelude::UserFeeIncrease; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::version::PlatformVersion; use dpp::ProtocolError; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/transformer.rs index aa2e3796810..d1199d62b81 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/v0/transformer.rs @@ -1,9 +1,9 @@ use crate::state_transition_action::identity::identity_create::v0::IdentityCreateTransitionActionV0; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::Bytes36; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; use dpp::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/mod.rs index 01dabf088d7..4bb6ab20207 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/mod.rs @@ -5,7 +5,7 @@ pub mod v0; use crate::state_transition_action::identity::identity_credit_transfer::v0::IdentityCreditTransferTransitionActionV0; use derive_more::From; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::Identifier; use dpp::prelude::{IdentityNonce, UserFeeIncrease}; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/transformer.rs index df05b80c1b7..bbbccf03034 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/transformer.rs @@ -1,6 +1,6 @@ use crate::state_transition_action::identity::identity_credit_transfer::v0::IdentityCreditTransferTransitionActionV0; use crate::state_transition_action::identity::identity_credit_transfer::IdentityCreditTransferTransitionAction; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; impl From for IdentityCreditTransferTransitionAction { fn from(value: IdentityCreditTransferTransition) -> Self { diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/mod.rs index 887f05fb19f..cc9e587c71b 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/mod.rs @@ -1,6 +1,6 @@ mod transformer; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::Identifier; use dpp::prelude::{IdentityNonce, UserFeeIncrease}; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/transformer.rs index 23e97d51b7d..401d70ce5ce 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/transformer.rs @@ -3,7 +3,7 @@ use crate::error::Error; use crate::state_transition_action::identity::identity_credit_withdrawal::v0::IdentityCreditWithdrawalTransitionActionV0; use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; use dpp::block::block_info::BlockInfo; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::validation::ConsensusValidationResult; use grovedb::TransactionArg; use platform_version::version::PlatformVersion; @@ -49,7 +49,7 @@ mod tests { use crate::util::test_helpers::setup::setup_drive_with_initial_state_structure; use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::{Identity, IdentityPublicKey}; - use dpp::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; + use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; #[test] fn test_try_from_identity_credit_withdrawal_without_address_and_multiple_transfer_keys() { diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/transformer.rs index bf4f38b651a..118fad42797 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/transformer.rs @@ -5,21 +5,21 @@ use crate::drive::Drive; use crate::error::Error; use crate::state_transition_action::identity::identity_credit_withdrawal::v0::IdentityCreditWithdrawalTransitionActionV0; use dpp::block::block_info::BlockInfo; -use dpp::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; -use dpp::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; -use dpp::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; -use dpp::consensus::state::state_error::StateError; -use dpp::consensus::ConsensusError; use dpp::data_contracts::withdrawals_contract; use dpp::data_contracts::withdrawals_contract::v1::document_types::withdrawal; use dpp::document::{Document, DocumentV0}; +use dpp::errors::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; +use dpp::errors::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; +use dpp::errors::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; +use dpp::errors::consensus::state::state_error::StateError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::core_script::CoreScript; -use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; +use dpp::identity::identity_public_key::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::{IdentityPublicKey, KeyType}; use dpp::platform_value::platform_value; -use dpp::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; use dpp::validation::ConsensusValidationResult; use dpp::withdrawal::Pooling; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/transformer.rs index fb5083963b7..396d6b7fdbd 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/transformer.rs @@ -1,9 +1,9 @@ use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpTransitionActionV0; use crate::state_transition_action::identity::identity_topup::IdentityTopUpTransitionAction; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::consensus::ConsensusError; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::errors::consensus::ConsensusError; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; impl IdentityTopUpTransitionAction { /// try from diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/mod.rs index 6d76476587e..3c0e2e3e732 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/mod.rs @@ -5,7 +5,7 @@ use dpp::identifier::Identifier; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; use dpp::platform_value::Bytes36; use dpp::prelude::UserFeeIncrease; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; /// action v0 #[derive(Debug, Clone)] diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/transformer.rs index fb6cd13b9b1..b8d8519b368 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/v0/transformer.rs @@ -1,11 +1,11 @@ use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpTransitionActionV0; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::Bytes36; -use dpp::state_transition::signable_bytes_hasher::SignableBytesHasher; use dpp::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use dpp::state_transition::state_transitions::signable_bytes_hasher::SignableBytesHasher; impl IdentityTopUpTransitionActionV0 { /// try from diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/transformer.rs index c739546a854..9cca40baf8e 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/transformer.rs @@ -1,6 +1,6 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdateTransitionActionV0; use crate::state_transition_action::identity::identity_update::IdentityUpdateTransitionAction; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; impl From for IdentityUpdateTransitionAction { fn from(value: IdentityUpdateTransition) -> Self { diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/transformer.rs index 9d548b9d12b..7ac9dbf6b26 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/transformer.rs @@ -1,5 +1,5 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdateTransitionActionV0; -use dpp::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; impl From for IdentityUpdateTransitionActionV0 { fn from(value: IdentityUpdateTransitionV0) -> Self { diff --git a/packages/rs-drive/src/state_transition_action/identity/masternode_vote/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/masternode_vote/transformer.rs index cfe706fcd9a..7c0917659c5 100644 --- a/packages/rs-drive/src/state_transition_action/identity/masternode_vote/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/masternode_vote/transformer.rs @@ -4,7 +4,7 @@ use crate::state_transition_action::identity::masternode_vote::v0::{ MasternodeVoteTransitionActionV0, PreviousVoteCount, }; use crate::state_transition_action::identity::masternode_vote::MasternodeVoteTransitionAction; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; use grovedb::TransactionArg; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/transformer.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/transformer.rs index 7e9b021b171..27d28785e5a 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/transformer.rs @@ -1,12 +1,12 @@ use dpp::platform_value::Identifier; use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; -use dpp::state_transition::batch_transition::batched_transition::BatchedTransitionRef; -use dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; -use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use dpp::state_transition::batch_transition::token_base_transition::TokenBaseTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::DocumentTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::TokenTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::DocumentBaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_base_transition::TokenBaseTransition; use crate::error::Error; use crate::state_transition_action::batch::batched_transition::BatchedTransitionAction; use crate::state_transition_action::contract::data_contract_update::DataContractUpdateTransitionAction; diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/transformer.rs index d9b2bf74e96..00ca6b9c4ff 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/transformer.rs @@ -1,11 +1,11 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::platform_value::Identifier; use dpp::prelude::UserFeeIncrease; -use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::token_base_transition::TokenBaseTransition; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::DocumentBaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::TokenBaseTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use crate::state_transition_action::batch::batched_transition::document_transition::document_base_transition_action::{DocumentBaseTransitionAction, DocumentBaseTransitionActionAccessorsV0}; use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::{TokenBaseTransitionAction, TokenBaseTransitionActionAccessorsV0}; diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/transformer.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/transformer.rs index ae5afef5ff1..658df86c685 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/transformer.rs @@ -5,10 +5,10 @@ use crate::state_transition_action::identity::identity_update::IdentityUpdateTra use crate::state_transition_action::system::bump_identity_nonce_action::{ BumpIdentityNonceAction, BumpIdentityNonceActionV0, }; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; impl BumpIdentityNonceAction { /// from identity update diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/transformer.rs index 8c5520f7d7d..cee81b0f14d 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/transformer.rs @@ -4,11 +4,11 @@ use crate::state_transition_action::identity::identity_credit_withdrawal::v0::Id use crate::state_transition_action::identity::identity_update::v0::IdentityUpdateTransitionActionV0; use crate::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceActionV0; use dpp::data_contract::accessors::v0::DataContractV0Getters; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; -use dpp::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; -use dpp::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::v0::IdentityUpdateTransitionV0; use dpp::state_transition::StateTransitionLike; impl BumpIdentityNonceActionV0 { diff --git a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/mod.rs index bd7ad593348..2865349d560 100644 --- a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/mod.rs @@ -1,6 +1,6 @@ use crate::state_transition_action::system::partially_use_asset_lock_action::v0::PartiallyUseAssetLockActionV0; use derive_more::From; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::{Bytes32, Bytes36}; use dpp::prelude::UserFeeIncrease; diff --git a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/transformer.rs b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/transformer.rs index 973683ed025..40b1f86f20d 100644 --- a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/transformer.rs @@ -2,14 +2,14 @@ use crate::state_transition_action::identity::identity_create::IdentityCreateTra use crate::state_transition_action::identity::identity_topup::IdentityTopUpTransitionAction; use crate::state_transition_action::system::partially_use_asset_lock_action::v0::PartiallyUseAssetLockActionV0; use crate::state_transition_action::system::partially_use_asset_lock_action::PartiallyUseAssetLockAction; -use dpp::consensus::basic::value_error::ValueError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; +use dpp::errors::consensus::basic::value_error::ValueError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::Bytes32; use dpp::serialization::Signable; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; impl PartiallyUseAssetLockAction { /// try from identity create transition diff --git a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/mod.rs index 56ff3f5047c..d1be271dfae 100644 --- a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/mod.rs @@ -1,4 +1,4 @@ -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::{Bytes32, Bytes36}; use dpp::prelude::UserFeeIncrease; mod transformer; diff --git a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/transformer.rs index ced93e1e265..6217839e6e7 100644 --- a/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/system/partially_use_asset_lock_action/v0/transformer.rs @@ -2,12 +2,12 @@ use crate::state_transition_action::identity::identity_create::v0::IdentityCreat use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpTransitionActionV0; use crate::state_transition_action::system::partially_use_asset_lock_action::v0::PartiallyUseAssetLockActionV0; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValueGettersV0; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; -use dpp::consensus::ConsensusError; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::{Bytes32, Bytes36}; -use dpp::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; -use dpp::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::v0::IdentityCreateTransitionV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::v0::IdentityTopUpTransitionV0; use dpp::util::hash::hash_double; impl PartiallyUseAssetLockActionV0 { diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/contract.rs b/packages/rs-drive/src/util/batch/drive_op_batch/contract.rs index 7f976a769ac..0cf9781e3da 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/contract.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/contract.rs @@ -12,9 +12,9 @@ use crate::util::batch::drive_op_batch::finalize_task::{ }; use dpp::data_contract::accessors::v0::DataContractV0Getters; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::{Borrow, Cow}; use std::collections::HashMap; diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/document.rs b/packages/rs-drive/src/util/batch/drive_op_batch/document.rs index ed95e0c5aaf..4a1688b2328 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/document.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/document.rs @@ -12,16 +12,16 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; use dpp::document::Document; -use dpp::prelude::Identifier; +use platform_value::Identifier; use dpp::system_data_contracts::withdrawals_contract::v1::document_types::withdrawal; use crate::drive::votes::resolved::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePollWithContractInfo; -use dpp::version::PlatformVersion; use dpp::voting::vote_info_storage::contested_document_vote_poll_stored_info::ContestedDocumentVotePollStoredInfo; use dpp::ProtocolError; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::borrow::Cow; use std::collections::HashMap; diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/mod.rs b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/mod.rs index ad7452524df..e69b6011377 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/mod.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/mod.rs @@ -11,7 +11,7 @@ use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::fee::fee_result::FeeResult; use grovedb::TransactionArg; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Applies a list of high level DriveOperations to the drive, and calculates the fee for them. diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/v0/mod.rs b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/v0/mod.rs index 0f707af00b8..7c5877cdf6d 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/apply_drive_operations/v0/mod.rs @@ -10,8 +10,8 @@ use grovedb::{EstimatedLayerInformation, TransactionArg}; use crate::util::batch::drive_op_batch::DriveLowLevelOperationConverter; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; +use platform_version::version::PlatformVersion; use crate::util::batch::drive_op_batch::finalize_task::{ DriveOperationFinalizationTasks, DriveOperationFinalizeTask, diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs index 40f84db04b4..b2bad1ef420 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs @@ -6,7 +6,7 @@ use crate::util::batch::{DriveOperation, GroveDbOpBatch}; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs index 0b719f85d48..aabcd29c704 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs @@ -6,10 +6,10 @@ use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use crate::util::batch::{DriveOperation, GroveDbOpBatch}; use dpp::block::block_info::BlockInfo; -use dpp::version::PlatformVersion; use grovedb::batch::QualifiedGroveDbOp; use grovedb::TransactionArg; use itertools::Itertools; +use platform_version::version::PlatformVersion; impl Drive { /// Convert a batch of drive operations to a batch of grove database operations. diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/finalize_task.rs b/packages/rs-drive/src/util/batch/drive_op_batch/finalize_task.rs index b45d7c154d6..45b94b3de6e 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/finalize_task.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/finalize_task.rs @@ -1,7 +1,7 @@ use crate::drive::Drive; use crate::error::Error; -use dpp::prelude::Identifier; -use dpp::version::PlatformVersion; +use platform_value::Identifier; +use platform_version::version::PlatformVersion; pub enum DriveOperationFinalizeTask { RemoveDataContractFromCache { contract_id: Identifier }, diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/identity.rs b/packages/rs-drive/src/util/batch/drive_op_batch/identity.rs index e3ed135a519..e2cc1362983 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/identity.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/identity.rs @@ -9,10 +9,10 @@ use dpp::prelude::{IdentityNonce, Revision}; use crate::drive::identity::update::methods::merge_identity_nonce::MergeIdentityContractNonceResultToResult; use crate::drive::votes::resolved::votes::ResolvedVote; use crate::state_transition_action::identity::masternode_vote::v0::PreviousVoteCount; -use dpp::version::PlatformVersion; use dpp::voting::vote_choices::resource_vote_choice::ResourceVoteChoice; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; /// Operations on Identities diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/mod.rs b/packages/rs-drive/src/util/batch/drive_op_batch/mod.rs index 800661cbefb..04a94c98001 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/mod.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/mod.rs @@ -32,8 +32,8 @@ use grovedb::{EstimatedLayerInformation, TransactionArg}; use crate::fees::op::LowLevelDriveOperation::GroveOperation; -use dpp::version::PlatformVersion; use grovedb::batch::{KeyInfoPath, QualifiedGroveDbOp}; +use platform_version::version::PlatformVersion; use crate::error::drive::DriveError; use crate::util::batch::drive_op_batch::finalize_task::{ diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/system.rs b/packages/rs-drive/src/util/batch/drive_op_batch/system.rs index 7a6afbedacf..ff381d60525 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/system.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/system.rs @@ -2,15 +2,15 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::drive_op_batch::DriveLowLevelOperationConverter; +use dpp::balances::credits::Credits; use dpp::block::block_info::BlockInfo; -use dpp::fee::Credits; use dpp::platform_value::Bytes36; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::PlatformVersion; use std::collections::HashMap; /// Operations on the System diff --git a/packages/rs-drive/src/util/batch/drive_op_batch/withdrawals.rs b/packages/rs-drive/src/util/batch/drive_op_batch/withdrawals.rs index d1144a7d68d..5bb59cc783a 100644 --- a/packages/rs-drive/src/util/batch/drive_op_batch/withdrawals.rs +++ b/packages/rs-drive/src/util/batch/drive_op_batch/withdrawals.rs @@ -16,10 +16,10 @@ use super::DriveLowLevelOperationConverter; use crate::query::Query; use dpp::fee::{Credits, SignedCredits}; use dpp::prelude::TimestampMillis; -use dpp::version::PlatformVersion; use dpp::withdrawal::{WithdrawalTransactionIndex, WithdrawalTransactionIndexAndBytes}; use grovedb::{batch::KeyInfoPath, EstimatedLayerInformation, MaybeTree, TransactionArg}; use grovedb::{Element, PathQuery, SizedQuery}; +use platform_version::version::PlatformVersion; /// Operations for Withdrawals #[derive(Clone, Debug)] diff --git a/packages/rs-drive/src/util/batch/grovedb_op_batch/mod.rs b/packages/rs-drive/src/util/batch/grovedb_op_batch/mod.rs index 44c64473a81..c34cfd22d38 100644 --- a/packages/rs-drive/src/util/batch/grovedb_op_batch/mod.rs +++ b/packages/rs-drive/src/util/batch/grovedb_op_batch/mod.rs @@ -13,12 +13,12 @@ use crate::util::batch::grovedb_op_batch::KnownPath::{ }; use crate::util::storage_flags::StorageFlags; use dpp::block::epoch::Epoch; -use dpp::identity::{Purpose, SecurityLevel}; -use dpp::prelude::Identifier; +use dpp::identity::identity_public_key::{Purpose, SecurityLevel}; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::{GroveDbOpConsistencyResults, GroveOp, KeyInfoPath, QualifiedGroveDbOp}; use grovedb::operations::proof::util::hex_to_ascii; use grovedb::{Element, TreeType}; +use platform_value::Identifier; use std::borrow::Cow; use std::fmt; diff --git a/packages/rs-drive/src/util/grove_operations/batch_delete/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_delete/mod.rs index 78199741aab..bfffa913654 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_delete/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_delete/mod.rs @@ -7,7 +7,7 @@ use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchDeleteApplyType; use grovedb::operations::delete::DeleteOptions; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/batch_delete_items_in_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_delete_items_in_path_query/mod.rs index 24b03094ef4..6e78d9d41ad 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_delete_items_in_path_query/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_delete_items_in_path_query/mod.rs @@ -6,9 +6,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchDeleteApplyType; -use dpp::version::drive_versions::DriveVersion; - use grovedb::{PathQuery, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes multiple "delete element" operations for items in a given path based on a `PathQuery` to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_delete_up_tree_while_empty/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_delete_up_tree_while_empty/mod.rs index 607d84181f4..488e4754117 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_delete_up_tree_while_empty/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_delete_up_tree_while_empty/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchDeleteUpTreeApplyType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert/mod.rs index 45c9ec6bd3a..43b25cef332 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_sum_tree/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_sum_tree/mod.rs index 2a2a033ff46..7d103292cd8 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_sum_tree/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_sum_tree/mod.rs @@ -7,7 +7,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree/mod.rs index 2a2aaf74f04..d6f107ee1e0 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree/mod.rs @@ -7,7 +7,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/mod.rs index ff4a1bf14e7..8a049fbf984 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/mod.rs @@ -9,8 +9,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::{TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree where path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/v0/mod.rs index 2b3e5750f39..4efc56f2b03 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists/v0/mod.rs @@ -9,9 +9,9 @@ use crate::util::object_size_info::PathKeyInfo::{ PathFixedSizeKey, PathFixedSizeKeyRef, PathKey, PathKeyRef, PathKeySize, }; use crate::util::storage_flags::StorageFlags; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::GroveOp; use grovedb::{TransactionArg, TreeType}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree where path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/mod.rs index 113af548bb0..a096fd5f6af 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/mod.rs @@ -9,8 +9,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree where path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/v0/mod.rs index 16f0cf08790..36049a2a888 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_empty_tree_if_not_exists_check_existing_operations/v0/mod.rs @@ -9,8 +9,8 @@ use crate::util::object_size_info::PathKeyInfo::{ }; use crate::util::storage_flags::StorageFlags; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert empty tree where path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/mod.rs index 6a2256a6277..3245af96f43 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element if element was changed or is new" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/v0/mod.rs index f464fc3c18d..d3871166e40 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_changed_value/v0/mod.rs @@ -10,8 +10,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::CalculatedCostOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, GroveDb, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element if element was changed or is new" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/mod.rs index c08390ba86f..0b414d8ed3f 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element if the path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/v0/mod.rs index cdf15dc489f..173734ad3e9 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists/v0/mod.rs @@ -10,8 +10,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::CalculatedCostOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{GroveDb, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element if the path key does not yet exist" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/mod.rs index df437be5b29..cdb8dde3093 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert element if the path key does not yet exist" operation to `drive_operations` diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/v0/mod.rs index ed3e3568800..c3254df8dec 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_if_not_exists_return_existing_element/v0/mod.rs @@ -10,8 +10,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::CalculatedCostOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, GroveDb, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Version 0 implementation of the "insert element if the path key does not yet exist" operation. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/mod.rs index 9200949046b..aeadbf2b8f8 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Attempts to batch insert a sum item at the specified path and key if it doesn't already exist. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/v0/mod.rs index 902f806e797..112b4ad996c 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_if_not_exists/v0/mod.rs @@ -10,8 +10,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::CalculatedCostOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, GroveDb, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts a sum item at the specified path and key if it doesn't already exist. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/mod.rs index 87331adad07..9b183a77a3b 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/mod.rs @@ -8,8 +8,8 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "insert sum item or add to it if the item already exists" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/v0/mod.rs index c9abd72a501..568cdc027bb 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_insert_sum_item_or_add_to_if_already_exists/v0/mod.rs @@ -10,9 +10,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::CalculatedCostOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; use dpp::ProtocolError; use grovedb::{Element, GroveDb, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Version 0 implementation of the "insert sum item or add to it if the item already exists" operation. diff --git a/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs index 7c31d0b7a66..c6ecca1048b 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs @@ -6,10 +6,9 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchMoveApplyType; -use dpp::version::drive_versions::DriveVersion; - use grovedb::{PathQuery, TransactionArg}; use grovedb_epoch_based_storage_flags::StorageFlags; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes multiple "delete element" and "insert element operations for items in a given path based on a `PathQuery` to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_refresh_reference/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_refresh_reference/mod.rs index 27fb7665b22..e28d25f6f69 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_refresh_reference/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_refresh_reference/mod.rs @@ -4,8 +4,8 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::Element; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes an "refresh reference" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/batch_remove_raw/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_remove_raw/mod.rs index a85f405c502..1d683f4f48a 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_remove_raw/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_remove_raw/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::BatchDeleteApplyType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/batch_remove_raw/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_remove_raw/v0/mod.rs index 89902830ef6..c2ad039c8ae 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_remove_raw/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_remove_raw/v0/mod.rs @@ -5,13 +5,13 @@ use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::GroveOperation; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use crate::util::grove_operations::{push_drive_operation_result, BatchDeleteApplyType}; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::key_info::KeyInfo; use grovedb::batch::{GroveOp, KeyInfoPath}; use grovedb::operations::delete::DeleteOptions; use grovedb::{Element, GroveDb, TransactionArg}; use grovedb_path::SubtreePath; use grovedb_storage::rocksdb_storage::RocksDbStorage; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes a "delete element" operation to `drive_operations` and returns the current element. diff --git a/packages/rs-drive/src/util/grove_operations/batch_replace/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_replace/mod.rs index 47524c8fa66..b2fca60da0f 100644 --- a/packages/rs-drive/src/util/grove_operations/batch_replace/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/batch_replace/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::object_size_info::PathKeyElementInfo; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Pushes a "replace element" operation to `drive_operations`. diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_batch/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_batch/mod.rs index ecc212e1e23..44fa6c08e0c 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_batch/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_batch/mod.rs @@ -1,8 +1,8 @@ use crate::drive::Drive; use crate::error::Error; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Applies the given groveDB operations batch. diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/mod.rs index ccea6a9242a..d12230f1220 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_batch_with_add_costs/mod.rs @@ -7,7 +7,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_operation/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_operation/mod.rs index f77862a3591..9c825c19714 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_operation/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_operation/mod.rs @@ -3,9 +3,9 @@ mod v0; use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::QualifiedGroveDbOp; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Applies the given groveDB operation. diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_operation/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_operation/v0/mod.rs index 9bb4ab95c48..ff5fac705c8 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_operation/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_operation/v0/mod.rs @@ -1,9 +1,9 @@ use crate::drive::Drive; use crate::error::Error; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::QualifiedGroveDbOp; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Applies the given groveDB operation diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch/mod.rs index 8174d224c34..d97d04f301a 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch/mod.rs @@ -2,10 +2,10 @@ use crate::drive::Drive; use crate::error::Error; use crate::query::GroveError; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{OpsByLevelPath, QualifiedGroveDbOp}; use grovedb::TransactionArg; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Applies the given groveDB operations batch. diff --git a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/mod.rs index 7ba94976f5b..2bffad66666 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_apply_partial_batch_with_add_costs/mod.rs @@ -8,10 +8,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::query::GroveError; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{OpsByLevelPath, QualifiedGroveDbOp}; use grovedb::TransactionArg; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Applies the given groveDB operations batch, gets and passes the costs to `push_drive_operation_result`. diff --git a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/mod.rs index 05e8b12c751..7a496b27481 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_batch_operations_costs/mod.rs @@ -7,7 +7,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::EstimatedLayerInformation; diff --git a/packages/rs-drive/src/util/grove_operations/grove_clear/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_clear/mod.rs index 868112b08eb..7729a4b3b28 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_clear/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_clear/mod.rs @@ -4,7 +4,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_delete/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_delete/mod.rs index 55290ee483d..aa6b71a5d24 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_delete/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_delete/mod.rs @@ -4,7 +4,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get/mod.rs index e4082ad71f6..c120f81faa4 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::QueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves an element from GroveDB. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_big_sum_tree_total_value/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_big_sum_tree_total_value/mod.rs index 571cd7461b5..4f0a02aa689 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_big_sum_tree_total_value/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_big_sum_tree_total_value/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the total value from a sum tree within groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_optional_sum_tree_total_value/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_optional_sum_tree_total_value/mod.rs index 2be6d7a68e9..103243de12b 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_optional_sum_tree_total_value/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_optional_sum_tree_total_value/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the total value from a sum tree within groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_path_query/mod.rs index e863b6ad3a3..e4e63add50b 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_path_query/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_path_query/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::query_result_type::{QueryResultElements, QueryResultType}; use grovedb::{PathQuery, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the results of a path query from GroveDB. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_or_sum_results/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_or_sum_results/mod.rs index b728098a960..d18eebe4936 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_or_sum_results/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_or_sum_results/mod.rs @@ -4,10 +4,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::operations::QueryItemOrSumReturnType; use grovedb::PathQuery; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the serialized or sum results of a path query from GroveDB. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_results/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_results/mod.rs index c552903ddaf..ee4ae0b378d 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_results/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_serialized_results/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::PathQuery; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the serialized results of a path query from GroveDB. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_with_optional/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_with_optional/mod.rs index 4490d0a2866..febcf6f401a 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_path_query_with_optional/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_path_query_with_optional/mod.rs @@ -4,10 +4,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::query_result_type::PathKeyOptionalElementTrio; use grovedb::PathQuery; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the results of a path query from GroveDB with optional elements. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query/mod.rs index 9ab34a4dff1..b2aee137a16 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{PathQuery, TransactionArg}; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query_with_conditional/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query_with_conditional/mod.rs index 4fd62bffa35..bf047305e06 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query_with_conditional/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_proved_path_query_with_conditional/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, PathQuery, TransactionArg}; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw/mod.rs index 17b74e3966c..4915ab5f7d0 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_item/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_item/mod.rs index cd9d7a4d928..b2b3b11286b 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_item/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_item/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional/mod.rs index aa441c739b2..055bbd7eabd 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional_item/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional_item/mod.rs index 667e956ce9b..1f398b1104f 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional_item/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_optional_item/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query/mod.rs index 39c1927c236..93662ec0dbb 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query/mod.rs @@ -4,7 +4,7 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::query_result_type::{QueryResultElements, QueryResultType}; use grovedb::{PathQuery, TransactionArg}; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query_with_optional/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query_with_optional/mod.rs index fe0689a7e6b..cdf01fea9f0 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query_with_optional/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_path_query_with_optional/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::query_result_type::PathKeyOptionalElementTrio; use grovedb::{PathQuery, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the raw results of a path query from GroveDB with optional elements. diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/mod.rs index 4afcc024a09..342af438521 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/mod.rs @@ -5,8 +5,8 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; +use platform_version::version::drive_versions::DriveVersion; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/v0/mod.rs index 487fbfd949d..220ca50ccb4 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/v0/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_raw_value_u64_from_encoded_var_vec/v0/mod.rs @@ -3,10 +3,10 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; use integer_encoding::VarInt; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// grove_get_direct_u64 is a helper function to get a diff --git a/packages/rs-drive/src/util/grove_operations/grove_get_sum_tree_total_value/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_get_sum_tree_total_value/mod.rs index e4b06913dff..65780db639b 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_get_sum_tree_total_value/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_get_sum_tree_total_value/mod.rs @@ -5,9 +5,9 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Retrieves the total value from a sum tree within groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_has_raw/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_has_raw/mod.rs index 4f8f5bf6abd..b6f16da4d1e 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_has_raw/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_has_raw/mod.rs @@ -6,7 +6,7 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::grove_operations::DirectQueryType; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; use grovedb::TransactionArg; use grovedb_path::SubtreePath; diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert/mod.rs index bda84129135..87708d980e2 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert/mod.rs @@ -4,10 +4,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::operations::insert::InsertOptions; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts an element into groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_sum_tree/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_sum_tree/mod.rs index db17722d1a8..31c5702a694 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_sum_tree/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_sum_tree/mod.rs @@ -4,10 +4,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::operations::insert::InsertOptions; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts an empty sum tree into groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/mod.rs index 95a3fe8e7ba..37d9981a678 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert_empty_tree/mod.rs @@ -4,10 +4,10 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::operations::insert::InsertOptions; use grovedb::TransactionArg; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts an empty tree into groveDB at the specified path and key. diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists/mod.rs index 0524064598a..0d3476709eb 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts an element into groveDB only if the specified path and key do not exist. diff --git a/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists_return_existing_element/mod.rs b/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists_return_existing_element/mod.rs index 0b60ee181ac..35b32c13865 100644 --- a/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists_return_existing_element/mod.rs +++ b/packages/rs-drive/src/util/grove_operations/grove_insert_if_not_exists_return_existing_element/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::{Element, TransactionArg}; use grovedb_path::SubtreePath; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Inserts an element into groveDB only if the specified path and key do not exist. diff --git a/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/mod.rs b/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/mod.rs index 53c1334cabc..a70a822b996 100644 --- a/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/v0/mod.rs b/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/v0/mod.rs index 22622d5adf1..aa22f044ced 100644 --- a/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_batch_grovedb_operations/v0/mod.rs @@ -2,9 +2,9 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/mod.rs b/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/mod.rs index 64537fa5444..758cf40283e 100644 --- a/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/mod.rs @@ -4,9 +4,9 @@ use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; use crate::fees::op::LowLevelDriveOperation; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/v0/mod.rs b/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/v0/mod.rs index 74c318ee83e..1bfc5f3136f 100644 --- a/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_batch_low_level_drive_operations/v0/mod.rs @@ -2,9 +2,9 @@ use crate::drive::Drive; use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/mod.rs b/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/mod.rs index 20230350437..f31431ce6ec 100644 --- a/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/mod.rs @@ -6,10 +6,10 @@ use crate::fees::op::LowLevelDriveOperation; use crate::query::GroveError; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{KeyInfoPath, OpsByLevelPath, QualifiedGroveDbOp}; use grovedb::{EstimatedLayerInformation, TransactionArg}; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/v0/mod.rs b/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/v0/mod.rs index 129f74eb746..897068a8dcd 100644 --- a/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_partial_batch_grovedb_operations/v0/mod.rs @@ -4,11 +4,11 @@ use crate::fees::op::LowLevelDriveOperation; use crate::query::GroveError; use crate::util::batch::grovedb_op_batch::GroveDbOpBatchV0Methods; use crate::util::batch::GroveDbOpBatch; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{KeyInfoPath, OpsByLevelPath, QualifiedGroveDbOp}; use grovedb::{EstimatedLayerInformation, TransactionArg}; use grovedb_costs::storage_cost::StorageCost; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/mod.rs b/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/mod.rs index e97d8d7145a..ed1d9a9bc6a 100644 --- a/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/mod.rs @@ -6,10 +6,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::query::GroveError; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{KeyInfoPath, OpsByLevelPath}; use grovedb::{EstimatedLayerInformation, TransactionArg}; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/v0/mod.rs b/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/v0/mod.rs index c0b7b295c0f..ef8ea7e7498 100644 --- a/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/v0/mod.rs +++ b/packages/rs-drive/src/util/operations/apply_partial_batch_low_level_drive_operations/v0/mod.rs @@ -3,10 +3,10 @@ use crate::error::Error; use crate::fees::op::LowLevelDriveOperation; use crate::fees::op::LowLevelDriveOperation::GroveOperation; use crate::query::GroveError; -use dpp::version::drive_versions::DriveVersion; use grovedb::batch::{KeyInfoPath, OpsByLevelPath}; use grovedb::{EstimatedLayerInformation, TransactionArg}; use grovedb_costs::OperationCost; +use platform_version::version::drive_versions::DriveVersion; use std::collections::HashMap; impl Drive { diff --git a/packages/rs-drive/src/util/operations/commit_transaction/mod.rs b/packages/rs-drive/src/util/operations/commit_transaction/mod.rs index 2497052b6da..93ca47f4617 100644 --- a/packages/rs-drive/src/util/operations/commit_transaction/mod.rs +++ b/packages/rs-drive/src/util/operations/commit_transaction/mod.rs @@ -2,8 +2,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; -use dpp::version::drive_versions::DriveVersion; use grovedb::Transaction; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Commits a transaction. diff --git a/packages/rs-drive/src/util/operations/drop_cache/mod.rs b/packages/rs-drive/src/util/operations/drop_cache/mod.rs index df06080f5b5..306a60af8e7 100644 --- a/packages/rs-drive/src/util/operations/drop_cache/mod.rs +++ b/packages/rs-drive/src/util/operations/drop_cache/mod.rs @@ -2,7 +2,7 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; -use dpp::version::drive_versions::DriveVersion; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Drops the drive cache. diff --git a/packages/rs-drive/src/util/operations/rollback_transaction/mod.rs b/packages/rs-drive/src/util/operations/rollback_transaction/mod.rs index 8b68ca9e5ae..d595373b565 100644 --- a/packages/rs-drive/src/util/operations/rollback_transaction/mod.rs +++ b/packages/rs-drive/src/util/operations/rollback_transaction/mod.rs @@ -2,8 +2,8 @@ mod v0; use crate::drive::Drive; use crate::error::{drive::DriveError, Error}; -use dpp::version::drive_versions::DriveVersion; use grovedb::Transaction; +use platform_version::version::drive_versions::DriveVersion; impl Drive { /// Handles the rollback of a transaction. diff --git a/packages/rs-drive/src/util/test_helpers/mod.rs b/packages/rs-drive/src/util/test_helpers/mod.rs index 8600f2eddbd..a6a98484386 100644 --- a/packages/rs-drive/src/util/test_helpers/mod.rs +++ b/packages/rs-drive/src/util/test_helpers/mod.rs @@ -18,12 +18,12 @@ use dpp::data_contract::DataContract; #[cfg(feature = "fixtures-and-mocks")] use dpp::block::block_info::BlockInfo; #[cfg(feature = "fixtures-and-mocks")] -use dpp::prelude::Identifier; +use platform_value::Identifier; #[cfg(feature = "fixtures-and-mocks")] use dpp::tests::json_document::json_document_to_contract_with_ids; #[cfg(feature = "fixtures-and-mocks")] -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; #[cfg(test)] use ciborium::value::Value; diff --git a/packages/rs-drive/src/util/test_helpers/test_utils/identities.rs b/packages/rs-drive/src/util/test_helpers/test_utils/identities.rs index ac82a03462b..505ced26e6e 100644 --- a/packages/rs-drive/src/util/test_helpers/test_utils/identities.rs +++ b/packages/rs-drive/src/util/test_helpers/test_utils/identities.rs @@ -12,7 +12,7 @@ use dpp::block::block_info::BlockInfo; use dpp::block::epoch::Epoch; use dpp::identifier::Identifier; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{Identity, IdentityPublicKey, IdentityV0}; +use dpp::identity::{v0::IdentityV0, Identity, IdentityPublicKey}; use dpp::version::PlatformVersion; use grovedb::TransactionArg; use rand::rngs::StdRng; diff --git a/packages/rs-drive/src/verify/contract/verify_contract/mod.rs b/packages/rs-drive/src/verify/contract/verify_contract/mod.rs index 2cb72414417..aea3d4c63de 100644 --- a/packages/rs-drive/src/verify/contract/verify_contract/mod.rs +++ b/packages/rs-drive/src/verify/contract/verify_contract/mod.rs @@ -3,7 +3,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::verify::RootHash; use dpp::data_contract::DataContract; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/verify/contract/verify_contract/v0/mod.rs b/packages/rs-drive/src/verify/contract/verify_contract/v0/mod.rs index 9832f0e51e6..8c90994fc09 100644 --- a/packages/rs-drive/src/verify/contract/verify_contract/v0/mod.rs +++ b/packages/rs-drive/src/verify/contract/verify_contract/v0/mod.rs @@ -6,7 +6,7 @@ use crate::error::proof::ProofError; use crate::error::Error; use crate::error::Error::GroveDB; use crate::verify::RootHash; -use dpp::prelude::DataContract; +use dpp::data_contract::DataContract; use dpp::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/verify/contract/verify_contract_history/mod.rs b/packages/rs-drive/src/verify/contract/verify_contract_history/mod.rs index 3dcd0ed3389..eabc74475e0 100644 --- a/packages/rs-drive/src/verify/contract/verify_contract_history/mod.rs +++ b/packages/rs-drive/src/verify/contract/verify_contract_history/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::verify::RootHash; use dpp::data_contract::DataContract; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/verify/contract/verify_contract_history/v0/mod.rs b/packages/rs-drive/src/verify/contract/verify_contract_history/v0/mod.rs index 18fea92ee43..06ee2197f0c 100644 --- a/packages/rs-drive/src/verify/contract/verify_contract_history/v0/mod.rs +++ b/packages/rs-drive/src/verify/contract/verify_contract_history/v0/mod.rs @@ -4,14 +4,14 @@ use crate::error::proof::ProofError; use crate::error::Error; use crate::verify::RootHash; -use dpp::prelude::DataContract; +use dpp::data_contract::DataContract; use std::collections::BTreeMap; use crate::error::drive::DriveError; use crate::util::common::decode; use dpp::serialization::PlatformDeserializableWithPotentialValidationFromVersionedStructure; -use dpp::version::PlatformVersion; use grovedb::GroveDb; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies that the contract's history is included in the proof. diff --git a/packages/rs-drive/src/verify/document/verify_proof/mod.rs b/packages/rs-drive/src/verify/document/verify_proof/mod.rs index 729b2a2e211..4f4af3b85fa 100644 --- a/packages/rs-drive/src/verify/document/verify_proof/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_proof/mod.rs @@ -7,7 +7,7 @@ use crate::error::Error; use crate::query::DriveDocumentQuery; use dpp::document::Document; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies a proof for a collection of documents. diff --git a/packages/rs-drive/src/verify/document/verify_proof/v0/mod.rs b/packages/rs-drive/src/verify/document/verify_proof/v0/mod.rs index 136f9193a41..3d0aab35661 100644 --- a/packages/rs-drive/src/verify/document/verify_proof/v0/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_proof/v0/mod.rs @@ -5,7 +5,7 @@ use crate::query::DriveDocumentQuery; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::document::Document; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies a proof for a collection of documents. diff --git a/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/mod.rs b/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/mod.rs index 7be6a370000..911472fce9f 100644 --- a/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/mod.rs @@ -6,7 +6,7 @@ use crate::verify::RootHash; use crate::error::Error; use crate::query::DriveDocumentQuery; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies the given proof and returns the root hash of the GroveDB tree and a vector diff --git a/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/v0/mod.rs b/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/v0/mod.rs index bf73d5b66e3..ce4cf85eee8 100644 --- a/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/v0/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_proof_keep_serialized/v0/mod.rs @@ -4,8 +4,8 @@ use crate::error::proof::ProofError; use crate::error::Error; use crate::query::DriveDocumentQuery; -use dpp::version::PlatformVersion; use grovedb::GroveDb; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies the given proof and returns the root hash of the GroveDB tree and a vector diff --git a/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/mod.rs b/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/mod.rs index 59e142f9edf..df3eedf803a 100644 --- a/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/mod.rs @@ -6,7 +6,7 @@ use crate::verify::RootHash; use crate::error::Error; use crate::query::DriveDocumentQuery; use dpp::document::Document; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies if a document exists at the beginning of a proof, diff --git a/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/v0/mod.rs b/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/v0/mod.rs index ad8d8f227d3..877c295e1eb 100644 --- a/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/v0/mod.rs +++ b/packages/rs-drive/src/verify/document/verify_start_at_document_in_proof/v0/mod.rs @@ -5,8 +5,8 @@ use crate::error::Error; use crate::query::DriveDocumentQuery; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::document::Document; -use dpp::version::PlatformVersion; use grovedb::{GroveDb, PathQuery}; +use platform_version::version::PlatformVersion; impl DriveDocumentQuery<'_> { /// Verifies if a document exists at the beginning of a proof, diff --git a/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs index 7892c47a6c5..c37edc7ba6d 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs @@ -8,9 +8,9 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use std::iter::FromIterator; diff --git a/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs index 43ce89e6d00..387489cf6e8 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs @@ -5,9 +5,9 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the full identities of multiple users by their public key hashes. diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/mod.rs index 5a3059d91e4..d3a90b61e87 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/mod.rs @@ -8,9 +8,9 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the full identity of a user by their identity ID. diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/v0/mod.rs index e9fefdaaf2f..541989a45bc 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_identity_id/v0/mod.rs @@ -10,11 +10,14 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::identifier::Identifier; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, IdentityV0, KeyID}; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::identity::Identity; +use dpp::identity::{ + identity_public_key::IdentityPublicKey, identity_public_key::KeyID, v0::IdentityV0, +}; +pub use dpp::prelude::Revision; use dpp::serialization::PlatformDeserializable; -use dpp::version::PlatformVersion; use grovedb::GroveDb; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/mod.rs index 4e593caeb67..4bc01d745df 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; use crate::drive::identity::identity_and_non_unique_public_key_hash_double_proof::IdentityAndNonUniquePublicKeyHashDoubleProof; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/v0/mod.rs index 7f500fc7c8d..058dc704a70 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_non_unique_public_key_hash/v0/mod.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; use crate::drive::identity::identity_and_non_unique_public_key_hash_double_proof::IdentityAndNonUniquePublicKeyHashDoubleProof; use crate::error::proof::ProofError; diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/mod.rs index 17cd33c1995..86123f4374a 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/mod.rs @@ -8,9 +8,9 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the full identity of a user by their public key hash. diff --git a/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/v0/mod.rs index 342df383e39..6dd7acd1b74 100644 --- a/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_full_identity_by_unique_public_key_hash/v0/mod.rs @@ -4,9 +4,9 @@ use crate::error::Error; use crate::verify::RootHash; -pub use dpp::prelude::Identity; +pub use dpp::identity::Identity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the full identity of a user by their public key hash. diff --git a/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/mod.rs b/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/mod.rs index 9e18c30cf9b..d64aea18303 100644 --- a/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/mod.rs @@ -9,7 +9,7 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::identity::identities_contract_keys::IdentitiesContractKeys; -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/v0/mod.rs index 2ea58065062..abee64cca1b 100644 --- a/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identities_contract_keys/v0/mod.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::identifier::Identifier; -use dpp::identity::{IdentityPublicKey, Purpose}; +use dpp::identity::identity_public_key::{IdentityPublicKey, Purpose}; use crate::error::drive::DriveError; use dpp::identity::identities_contract_keys::IdentitiesContractKeys; diff --git a/packages/rs-drive/src/verify/identity/verify_identity_balance_for_identity_id/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_balance_for_identity_id/mod.rs index 5dc2788f85b..8618aceb30b 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_balance_for_identity_id/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_balance_for_identity_id/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::verify::RootHash; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the balance of an identity by their identity ID. diff --git a/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/mod.rs index 553f64661c6..acfc2b33c19 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/mod.rs @@ -5,11 +5,11 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use crate::verify::RootHash; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use std::iter::FromIterator; diff --git a/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs index b7742ebbb3c..4c76adade4f 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs @@ -2,7 +2,7 @@ use crate::drive::Drive; use crate::error::proof::ProofError; use crate::error::Error; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use crate::verify::RootHash; diff --git a/packages/rs-drive/src/verify/identity/verify_identity_id_by_unique_public_key_hash/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_id_by_unique_public_key_hash/mod.rs index 4422e600e01..b63746d17cd 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_id_by_unique_public_key_hash/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_id_by_unique_public_key_hash/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::verify::RootHash; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the identity ID of a user by their public key hash. diff --git a/packages/rs-drive/src/verify/identity/verify_identity_ids_by_unique_public_key_hashes/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_ids_by_unique_public_key_hashes/mod.rs index 6d1f70f8a04..7aa9ad41b6e 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_ids_by_unique_public_key_hashes/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_ids_by_unique_public_key_hashes/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::verify::RootHash; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use std::iter::FromIterator; diff --git a/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/mod.rs index 8ccbcb74654..a0f1d94c6ff 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/mod.rs @@ -10,7 +10,7 @@ use crate::verify::RootHash; use dpp::identity::PartialIdentity; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the identity keys of a user by their identity ID. diff --git a/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs b/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs index 9452a0b19db..821b05fc893 100644 --- a/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs +++ b/packages/rs-drive/src/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs @@ -9,12 +9,14 @@ use crate::drive::identity::key::fetch::IdentityKeysRequest; use crate::verify::RootHash; use dpp::identifier::Identifier; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::{IdentityPublicKey, KeyID, PartialIdentity}; +use dpp::identity::{ + identity_public_key::IdentityPublicKey, identity_public_key::KeyID, PartialIdentity, +}; use dpp::prelude::Revision; use dpp::serialization::PlatformDeserializable; -use dpp::version::PlatformVersion; use grovedb::{GroveDb, PathQuery}; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/verify/single_document/verify_proof/mod.rs b/packages/rs-drive/src/verify/single_document/verify_proof/mod.rs index 6d82dd32377..6fac0b86765 100644 --- a/packages/rs-drive/src/verify/single_document/verify_proof/mod.rs +++ b/packages/rs-drive/src/verify/single_document/verify_proof/mod.rs @@ -9,7 +9,7 @@ use dpp::document::Document; use crate::error::drive::DriveError; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl SingleDocumentDriveQuery { /// Verifies the proof of a single document query. diff --git a/packages/rs-drive/src/verify/single_document/verify_proof/v0/mod.rs b/packages/rs-drive/src/verify/single_document/verify_proof/v0/mod.rs index 480df57edac..7116755e056 100644 --- a/packages/rs-drive/src/verify/single_document/verify_proof/v0/mod.rs +++ b/packages/rs-drive/src/verify/single_document/verify_proof/v0/mod.rs @@ -6,7 +6,7 @@ use dpp::data_contract::document_type::DocumentTypeRef; use dpp::document::Document; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl SingleDocumentDriveQuery { /// Verifies the proof of a single document query. diff --git a/packages/rs-drive/src/verify/single_document/verify_proof_keep_serialized/mod.rs b/packages/rs-drive/src/verify/single_document/verify_proof_keep_serialized/mod.rs index 53d5be3c597..a9d594127c5 100644 --- a/packages/rs-drive/src/verify/single_document/verify_proof_keep_serialized/mod.rs +++ b/packages/rs-drive/src/verify/single_document/verify_proof_keep_serialized/mod.rs @@ -6,7 +6,7 @@ use crate::verify::RootHash; use crate::error::Error; use crate::query::SingleDocumentDriveQuery; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; impl SingleDocumentDriveQuery { /// Verifies the proof of a document while keeping it serialized. diff --git a/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/mod.rs b/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/mod.rs index 6255a829e87..6deb487ce3a 100644 --- a/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/mod.rs +++ b/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/mod.rs @@ -1,5 +1,5 @@ use dpp::identifier::Identifier; -use dpp::prelude::DataContract; +use dpp::data_contract::DataContract; use grovedb::PathQuery; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/token_transition.rs b/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/token_transition.rs index d1b2470bf6c..79ec28e6430 100644 --- a/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/token_transition.rs +++ b/packages/rs-drive/src/verify/state_transition/state_transition_execution_path_queries/token_transition.rs @@ -9,15 +9,15 @@ use dpp::data_contract::associated_token::token_keeps_history_rules::accessors:: use dpp::data_contracts::SystemDataContract; use dpp::group::GroupStateTransitionInfo; use dpp::identifier::Identifier; -use dpp::prelude::DataContract; -use dpp::state_transition::batch_transition::batched_transition::token_transition::{ +use dpp::data_contract::DataContract; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::{ TokenTransition, TokenTransitionV0Methods, }; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use dpp::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; -use dpp::state_transition::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; use dpp::system_data_contracts::load_system_data_contract; use grovedb::PathQuery; use platform_version::version::PlatformVersion; diff --git a/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/mod.rs b/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/mod.rs index c03ca05c168..d214f0a6195 100644 --- a/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/mod.rs +++ b/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/mod.rs @@ -8,7 +8,7 @@ use crate::verify::RootHash; use dpp::block::block_info::BlockInfo; use dpp::state_transition::proof_result::StateTransitionProofResult; use dpp::state_transition::StateTransition; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs b/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs index 439419461c3..401fa6626f0 100644 --- a/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs +++ b/packages/rs-drive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs @@ -10,36 +10,35 @@ use dpp::data_contract::serialized_version::DataContractInSerializationFormat; use dpp::document::{Document, DocumentV0Getters}; use dpp::document::document_methods::DocumentMethodsV0; use dpp::document::property_names::PRICE; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::group::group_action_status::GroupActionStatus; use dpp::identity::PartialIdentity; use dpp::platform_value::btreemap_extensions::BTreeValueMapHelper; -use dpp::prelude::Identifier; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::BatchedTransitionRef; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition::{DocumentTransition, DocumentTransitionV0Methods}; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransitionRef; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; use dpp::state_transition::{StateTransition, StateTransitionLike}; -use dpp::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use dpp::state_transition::batch_transition::document_create_transition::DocumentFromCreateTransition; -use dpp::state_transition::batch_transition::document_replace_transition::DocumentFromReplaceTransition; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_transition::{DocumentTransition, DocumentTransitionV0Methods}; -use dpp::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use dpp::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; -use dpp::state_transition::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentFromCreateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_replace_transition::DocumentFromReplaceTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::{TokenTransition, TokenTransitionV0Methods}; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; use dpp::state_transition::proof_result::StateTransitionProofResult; use dpp::state_transition::proof_result::StateTransitionProofResult::{VerifiedBalanceTransfer, VerifiedDataContract, VerifiedDocuments, VerifiedIdentity, VerifiedMasternodeVote, VerifiedPartialIdentity, VerifiedTokenActionWithDocument, VerifiedTokenBalance, VerifiedTokenGroupActionWithDocument, VerifiedTokenGroupActionWithTokenBalance, VerifiedTokenGroupActionWithTokenIdentityInfo, VerifiedTokenGroupActionWithTokenPricingSchedule, VerifiedTokenIdentitiesBalances, VerifiedTokenIdentityInfo, VerifiedTokenPricingSchedule}; use dpp::system_data_contracts::{load_system_data_contract, SystemDataContract}; @@ -47,6 +46,7 @@ use dpp::tokens::info::v0::IdentityTokenInfoV0Accessors; use dpp::voting::vote_polls::VotePoll; use dpp::voting::votes::resource_vote::accessors::v0::ResourceVoteGettersV0; use dpp::voting::votes::Vote; +use platform_value::Identifier; use platform_version::TryIntoPlatformVersioned; use platform_version::version::PlatformVersion; use crate::drive::Drive; diff --git a/packages/rs-drive/src/verify/system/verify_epoch_infos/mod.rs b/packages/rs-drive/src/verify/system/verify_epoch_infos/mod.rs index a75ea834f88..3bf779e76d8 100644 --- a/packages/rs-drive/src/verify/system/verify_epoch_infos/mod.rs +++ b/packages/rs-drive/src/verify/system/verify_epoch_infos/mod.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::block::epoch::EpochIndex; use dpp::block::extended_epoch_info::ExtendedEpochInfo; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/verify/system/verify_upgrade_state/mod.rs b/packages/rs-drive/src/verify/system/verify_upgrade_state/mod.rs index 2cce2235c8b..b309e3a08a5 100644 --- a/packages/rs-drive/src/verify/system/verify_upgrade_state/mod.rs +++ b/packages/rs-drive/src/verify/system/verify_upgrade_state/mod.rs @@ -4,8 +4,8 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::PlatformVersion; use nohash_hasher::IntMap; +use platform_version::version::PlatformVersion; mod v0; diff --git a/packages/rs-drive/src/verify/system/verify_upgrade_vote_status/mod.rs b/packages/rs-drive/src/verify/system/verify_upgrade_vote_status/mod.rs index 9a6e6a12abc..2428d3cf3c0 100644 --- a/packages/rs-drive/src/verify/system/verify_upgrade_vote_status/mod.rs +++ b/packages/rs-drive/src/verify/system/verify_upgrade_vote_status/mod.rs @@ -5,7 +5,7 @@ use crate::error::drive::DriveError; use crate::error::Error; use crate::verify::RootHash; use dpp::util::deserializer::ProtocolVersion; -use dpp::version::PlatformVersion; +use platform_version::version::PlatformVersion; use std::collections::BTreeMap; impl Drive { diff --git a/packages/rs-drive/src/verify/tokens/verify_token_total_supply_and_aggregated_identity_balance/v0/mod.rs b/packages/rs-drive/src/verify/tokens/verify_token_total_supply_and_aggregated_identity_balance/v0/mod.rs index 00a6d0822da..96d0f23ef72 100644 --- a/packages/rs-drive/src/verify/tokens/verify_token_total_supply_and_aggregated_identity_balance/v0/mod.rs +++ b/packages/rs-drive/src/verify/tokens/verify_token_total_supply_and_aggregated_identity_balance/v0/mod.rs @@ -6,8 +6,8 @@ use crate::error::Error; use crate::verify::RootHash; use dpp::balances::total_single_token_balance::TotalSingleTokenBalance; -use dpp::prelude::Identifier; use grovedb::GroveDb; +use platform_value::Identifier; use platform_version::version::PlatformVersion; impl Drive { diff --git a/packages/rs-drive/src/verify/voting/verify_masternode_vote/mod.rs b/packages/rs-drive/src/verify/voting/verify_masternode_vote/mod.rs index 92a063b8a95..d5f250ba9db 100644 --- a/packages/rs-drive/src/verify/voting/verify_masternode_vote/mod.rs +++ b/packages/rs-drive/src/verify/voting/verify_masternode_vote/mod.rs @@ -6,10 +6,9 @@ use crate::drive::Drive; use crate::error::drive::DriveError; use crate::error::Error; use crate::verify::RootHash; -use dpp::prelude::DataContract; -use dpp::version::PlatformVersion; +use dpp::data_contract::DataContract; use dpp::voting::votes::Vote; - +use platform_version::version::PlatformVersion; impl Drive { /// Verifies the authenticity of a masternode vote using the provided proof. /// diff --git a/packages/rs-drive/tests/query_tests.rs b/packages/rs-drive/tests/query_tests.rs index 61d30dcddee..c29722bac31 100644 --- a/packages/rs-drive/tests/query_tests.rs +++ b/packages/rs-drive/tests/query_tests.rs @@ -62,6 +62,8 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::config::v1::DataContractConfigSettersV1; use dpp::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; use dpp::data_contract::document_type::methods::DocumentTypeV0Methods; +#[cfg(feature = "server")] +use dpp::data_contract::DataContract; use dpp::document::serialization_traits::{ DocumentCborMethodsV0, DocumentPlatformConversionMethodsV0, DocumentPlatformValueMethodsV0, }; @@ -70,8 +72,6 @@ use dpp::fee::default_costs::CachedEpochIndexFeeVersions; use dpp::identity::TimestampMillis; use dpp::platform_value; use dpp::platform_value::string_encoding::Encoding; -#[cfg(feature = "server")] -use dpp::prelude::DataContract; use dpp::tests::json_document::json_document_to_contract; #[cfg(feature = "server")] use dpp::util::cbor_serializer; diff --git a/packages/rs-platform-serialization-derive/src/deserialize_struct.rs b/packages/rs-platform-serialization-derive/src/deserialize_struct.rs index 71d32f0dfd1..a5e0eb2524b 100644 --- a/packages/rs-platform-serialization-derive/src/deserialize_struct.rs +++ b/packages/rs-platform-serialization-derive/src/deserialize_struct.rs @@ -103,14 +103,14 @@ pub(super) fn derive_platform_deserialize_struct( quote! { impl #impl_generics #crate_name::serialization::PlatformDeserializableFromVersionedStructure for #name #ty_generics #where_clause { - fn versioned_deserialize(bytes: &[u8], platform_version: &#crate_name::version::PlatformVersion) -> Result { + fn versioned_deserialize(bytes: &[u8], platform_version: &platform_version::version::PlatformVersion) -> Result { #deserialize_into } } impl #impl_generics #crate_name::serialization::PlatformLimitDeserializableFromVersionedStructure for #name #ty_generics #where_clause { - fn versioned_limit_deserialize(bytes: &[u8], platform_version: &#crate_name::version::PlatformVersion) -> Result { + fn versioned_limit_deserialize(bytes: &[u8], platform_version: &platform_version::version::PlatformVersion) -> Result { #deserialize_into } } diff --git a/packages/rs-platform-serialization-derive/src/serialize_enum.rs b/packages/rs-platform-serialization-derive/src/serialize_enum.rs index bd8555448a2..88aa803dedd 100644 --- a/packages/rs-platform-serialization-derive/src/serialize_enum.rs +++ b/packages/rs-platform-serialization-derive/src/serialize_enum.rs @@ -137,12 +137,12 @@ pub(super) fn derive_platform_serialize_enum( impl #impl_generics #crate_name::serialization::PlatformSerializableWithPlatformVersion for #name #ty_generics #where_clause { type Error = #error_type; - fn serialize_to_bytes_with_platform_version(&self, platform_version: &#crate_name::version::PlatformVersion) -> Result, #error_type> { + fn serialize_to_bytes_with_platform_version(&self, platform_version: &platform_version::version::PlatformVersion) -> Result, #error_type> { #config platform_serialization::platform_encode_to_vec(self, config, platform_version)#limit_err } - fn serialize_consume_to_bytes_with_platform_version(self, platform_version: &#crate_name::version::PlatformVersion) -> Result, #error_type> { + fn serialize_consume_to_bytes_with_platform_version(self, platform_version: &platform_version::version::PlatformVersion) -> Result, #error_type> { #config platform_serialization::platform_encode_to_vec(self, config, platform_version)#limit_err } diff --git a/packages/rs-platform-serialization-derive/src/serialize_struct.rs b/packages/rs-platform-serialization-derive/src/serialize_struct.rs index d29ba1a9710..98e578ae29f 100644 --- a/packages/rs-platform-serialization-derive/src/serialize_struct.rs +++ b/packages/rs-platform-serialization-derive/src/serialize_struct.rs @@ -168,11 +168,11 @@ pub(super) fn derive_platform_serialize_struct( { type Error = #error_type; - fn serialize_to_bytes_with_platform_version(&self, platform_version: &#crate_name::version::PlatformVersion) -> Result, Self::Error> { + fn serialize_to_bytes_with_platform_version(&self, platform_version: &platform_version::version::PlatformVersion) -> Result, Self::Error> { #serialize_into } - fn serialize_consume_to_bytes_with_platform_version(self, platform_version: &#crate_name::version::PlatformVersion) -> Result, Self::Error> { + fn serialize_consume_to_bytes_with_platform_version(self, platform_version: &platform_version::version::PlatformVersion) -> Result, Self::Error> { #serialize_into_consume } } diff --git a/packages/rs-platform-serialization/src/features/impl_std.rs b/packages/rs-platform-serialization/src/features/impl_std.rs index 93c7327781c..07c089d5420 100644 --- a/packages/rs-platform-serialization/src/features/impl_std.rs +++ b/packages/rs-platform-serialization/src/features/impl_std.rs @@ -4,7 +4,7 @@ use crate::{ }; use bincode::{ config::Config, - de::{read::Reader, BorrowDecoder, Decode, Decoder, DecoderImpl}, + de::{read::Reader, BorrowDecoder, Decode, Decoder}, enc::{write::Writer, Encode, Encoder, EncoderImpl}, error::{DecodeError, EncodeError}, }; @@ -20,24 +20,6 @@ use std::{ time::SystemTime, }; -/// Decode type `D` from the given reader with the given `Config`. The reader can be any type that implements `std::io::Read`, e.g. `std::fs::File`. -/// -/// See the [config] module for more information about config options. -/// -/// [config]: config/index.html -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] -#[allow(dead_code)] -#[deprecated(note = "This function is marked as unused.")] -#[allow(deprecated)] -pub fn platform_versioned_decode_from_std_read( - src: &mut R, - config: C, -) -> Result { - let reader = IoReader::new(src); - let mut decoder = DecoderImpl::<_, C>::new(reader, config); - D::decode(&mut decoder) -} - pub(crate) struct IoReader { reader: R, } diff --git a/packages/rs-platform-value/Cargo.toml b/packages/rs-platform-value/Cargo.toml index 47029c286fb..5e65025f647 100644 --- a/packages/rs-platform-value/Cargo.toml +++ b/packages/rs-platform-value/Cargo.toml @@ -21,6 +21,7 @@ treediff = "5.0.0" platform-serialization = { path = "../rs-platform-serialization" } platform-version = { path = "../rs-platform-version" } indexmap = "2.0.2" +ferment-macro = { version = "0.2", package = "ferment-macro", optional = true } ### FEATURES ################################################################# @@ -30,3 +31,7 @@ cbor = ["ciborium"] json = ["serde_json"] std = ["serde/std"] +apple = ["ferment-macro"] + +#[lib] +#name = "platform_value" diff --git a/packages/rs-platform-value/src/btreemap_extensions/btreemap_path_extensions.rs b/packages/rs-platform-value/src/btreemap_extensions/btreemap_path_extensions.rs index e104e15e6c2..78a3dbfb728 100644 --- a/packages/rs-platform-value/src/btreemap_extensions/btreemap_path_extensions.rs +++ b/packages/rs-platform-value/src/btreemap_extensions/btreemap_path_extensions.rs @@ -1,5 +1,5 @@ -#[cfg(feature = "json")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "json")] +//use serde_json::Value as JsonValue; use std::borrow::Borrow; use std::convert::TryFrom; use std::iter::FromIterator; @@ -77,12 +77,12 @@ pub trait BTreeValueMapPathHelper { path: &str, ) -> Result; #[cfg(feature = "json")] - fn get_optional_inner_str_json_value_map_at_path>( + fn get_optional_inner_str_json_value_map_at_path>( &self, path: &str, ) -> Result, Error>; #[cfg(feature = "json")] - fn get_inner_str_json_value_map_at_path>( + fn get_inner_str_json_value_map_at_path>( &self, path: &str, ) -> Result; @@ -424,7 +424,9 @@ where } #[cfg(feature = "json")] - fn get_optional_inner_str_json_value_map_at_path>( + fn get_optional_inner_str_json_value_map_at_path< + I: FromIterator<(String, serde_json::Value)>, + >( &self, path: &str, ) -> Result, Error> { @@ -444,7 +446,7 @@ where } #[cfg(feature = "json")] - fn get_inner_str_json_value_map_at_path>( + fn get_inner_str_json_value_map_at_path>( &self, path: &str, ) -> Result { diff --git a/packages/rs-platform-value/src/btreemap_extensions/mod.rs b/packages/rs-platform-value/src/btreemap_extensions/mod.rs index 0476b489dd8..2edfa182372 100644 --- a/packages/rs-platform-value/src/btreemap_extensions/mod.rs +++ b/packages/rs-platform-value/src/btreemap_extensions/mod.rs @@ -1,5 +1,5 @@ -#[cfg(feature = "json")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "json")] +//use serde_json::Value as JsonValue; use std::borrow::Borrow; use std::collections::BTreeMap; use std::convert::TryFrom; @@ -96,12 +96,12 @@ pub trait BTreeValueMapHelper { key: &str, ) -> Result; #[cfg(feature = "json")] - fn get_optional_inner_str_json_value_map>( + fn get_optional_inner_str_json_value_map>( &self, key: &str, ) -> Result, Error>; #[cfg(feature = "json")] - fn get_inner_str_json_value_map>( + fn get_inner_str_json_value_map>( &self, key: &str, ) -> Result; @@ -365,7 +365,7 @@ where } #[cfg(feature = "json")] - fn get_optional_inner_str_json_value_map>( + fn get_optional_inner_str_json_value_map>( &self, key: &str, ) -> Result, Error> { @@ -387,7 +387,7 @@ where } #[cfg(feature = "json")] - fn get_inner_str_json_value_map>( + fn get_inner_str_json_value_map>( &self, key: &str, ) -> Result { diff --git a/packages/rs-platform-value/src/converter/serde_json.rs b/packages/rs-platform-value/src/converter/serde_json.rs index bc11794d560..23100f53116 100644 --- a/packages/rs-platform-value/src/converter/serde_json.rs +++ b/packages/rs-platform-value/src/converter/serde_json.rs @@ -2,13 +2,13 @@ use crate::value_map::ValueMap; use crate::{Error, Value}; use base64::prelude::BASE64_STANDARD; use base64::Engine; -use serde_json::{Map, Number, Value as JsonValue}; +use serde_json::{Map, Number}; use std::collections::BTreeMap; impl Value { pub fn convert_from_serde_json_map(map: I) -> R where - I: IntoIterator, + I: IntoIterator, R: FromIterator<(String, Value)>, { map.into_iter() @@ -16,13 +16,13 @@ impl Value { .collect() } - pub fn try_into_validating_json(self) -> Result { + pub fn try_into_validating_json(self) -> Result { Ok(match self { Value::U128(i) => { if i > u64::MAX as u128 { return Err(Error::IntegerSizeError); } - JsonValue::Number((i as u64).into()) + serde_json::Value::Number((i as u64).into()) } Value::I128(i) => { if i > i64::MAX as i128 { @@ -31,65 +31,67 @@ impl Value { if i < i64::MIN as i128 { return Err(Error::IntegerSizeError); } - JsonValue::Number((i as i64).into()) + serde_json::Value::Number((i as i64).into()) } - Value::U64(i) => JsonValue::Number(i.into()), - Value::I64(i) => JsonValue::Number(i.into()), - Value::U32(i) => JsonValue::Number(i.into()), - Value::I32(i) => JsonValue::Number(i.into()), - Value::U16(i) => JsonValue::Number(i.into()), - Value::I16(i) => JsonValue::Number(i.into()), - Value::U8(i) => JsonValue::Number(i.into()), - Value::I8(i) => JsonValue::Number(i.into()), - Value::Float(float) => JsonValue::Number(Number::from_f64(float).unwrap_or(0.into())), - Value::Text(string) => JsonValue::String(string), - Value::Bool(value) => JsonValue::Bool(value), - Value::Null => JsonValue::Null, - Value::Array(array) => JsonValue::Array( + Value::U64(i) => serde_json::Value::Number(i.into()), + Value::I64(i) => serde_json::Value::Number(i.into()), + Value::U32(i) => serde_json::Value::Number(i.into()), + Value::I32(i) => serde_json::Value::Number(i.into()), + Value::U16(i) => serde_json::Value::Number(i.into()), + Value::I16(i) => serde_json::Value::Number(i.into()), + Value::U8(i) => serde_json::Value::Number(i.into()), + Value::I8(i) => serde_json::Value::Number(i.into()), + Value::Float(float) => { + serde_json::Value::Number(Number::from_f64(float).unwrap_or(0.into())) + } + Value::Text(string) => serde_json::Value::String(string), + Value::Bool(value) => serde_json::Value::Bool(value), + Value::Null => serde_json::Value::Null, + Value::Array(array) => serde_json::Value::Array( array .into_iter() .map(|value| value.try_into_validating_json()) - .collect::, Error>>()?, + .collect::, Error>>()?, ), - Value::Map(map) => JsonValue::Object( + Value::Map(map) => serde_json::Value::Object( map.into_iter() .map(|(k, v)| { let string = k.into_text()?; Ok((string, v.try_into_validating_json()?)) }) - .collect::, Error>>()?, + .collect::, Error>>()?, ), Value::Identifier(bytes) => { // In order to be able to validate using JSON schema it needs to be in byte form - JsonValue::Array( + serde_json::Value::Array( bytes .into_iter() - .map(|a| JsonValue::Number(a.into())) + .map(|a| serde_json::Value::Number(a.into())) .collect(), ) } - Value::Bytes(bytes) => JsonValue::Array( + Value::Bytes(bytes) => serde_json::Value::Array( bytes .into_iter() - .map(|byte| JsonValue::Number(byte.into())) + .map(|byte| serde_json::Value::Number(byte.into())) .collect(), ), - Value::Bytes20(bytes) => JsonValue::Array( + Value::Bytes20(bytes) => serde_json::Value::Array( bytes .into_iter() - .map(|byte| JsonValue::Number(byte.into())) + .map(|byte| serde_json::Value::Number(byte.into())) .collect(), ), - Value::Bytes32(bytes) => JsonValue::Array( + Value::Bytes32(bytes) => serde_json::Value::Array( bytes .into_iter() - .map(|byte| JsonValue::Number(byte.into())) + .map(|byte| serde_json::Value::Number(byte.into())) .collect(), ), - Value::Bytes36(bytes) => JsonValue::Array( + Value::Bytes36(bytes) => serde_json::Value::Array( bytes .into_iter() - .map(|byte| JsonValue::Number(byte.into())) + .map(|byte| serde_json::Value::Number(byte.into())) .collect(), ), Value::EnumU8(_) => { @@ -105,20 +107,22 @@ impl Value { }) } - pub fn try_into_validating_btree_map_json(self) -> Result, Error> { + pub fn try_into_validating_btree_map_json( + self, + ) -> Result, Error> { self.into_btree_string_map()? .into_iter() .map(|(key, value)| Ok((key, value.try_into_validating_json()?))) .collect() } - pub fn try_to_validating_json(&self) -> Result { + pub fn try_to_validating_json(&self) -> Result { Ok(match self { Value::U128(i) => { if *i > u64::MAX as u128 { return Err(Error::IntegerSizeError); } - JsonValue::Number((*i as u64).into()) + serde_json::Value::Number((*i as u64).into()) } Value::I128(i) => { if *i > i64::MAX as i128 { @@ -127,65 +131,67 @@ impl Value { if *i < i64::MIN as i128 { return Err(Error::IntegerSizeError); } - JsonValue::Number((*i as i64).into()) + serde_json::Value::Number((*i as i64).into()) + } + Value::U64(i) => serde_json::Value::Number((*i).into()), + Value::I64(i) => serde_json::Value::Number((*i).into()), + Value::U32(i) => serde_json::Value::Number((*i).into()), + Value::I32(i) => serde_json::Value::Number((*i).into()), + Value::U16(i) => serde_json::Value::Number((*i).into()), + Value::I16(i) => serde_json::Value::Number((*i).into()), + Value::U8(i) => serde_json::Value::Number((*i).into()), + Value::I8(i) => serde_json::Value::Number((*i).into()), + Value::Float(float) => { + serde_json::Value::Number(Number::from_f64(*float).unwrap_or(0.into())) } - Value::U64(i) => JsonValue::Number((*i).into()), - Value::I64(i) => JsonValue::Number((*i).into()), - Value::U32(i) => JsonValue::Number((*i).into()), - Value::I32(i) => JsonValue::Number((*i).into()), - Value::U16(i) => JsonValue::Number((*i).into()), - Value::I16(i) => JsonValue::Number((*i).into()), - Value::U8(i) => JsonValue::Number((*i).into()), - Value::I8(i) => JsonValue::Number((*i).into()), - Value::Float(float) => JsonValue::Number(Number::from_f64(*float).unwrap_or(0.into())), - Value::Text(string) => JsonValue::String(string.clone()), - Value::Bool(value) => JsonValue::Bool(*value), - Value::Null => JsonValue::Null, - Value::Array(array) => JsonValue::Array( + Value::Text(string) => serde_json::Value::String(string.clone()), + Value::Bool(value) => serde_json::Value::Bool(*value), + Value::Null => serde_json::Value::Null, + Value::Array(array) => serde_json::Value::Array( array .iter() .map(|value| value.try_to_validating_json()) - .collect::, Error>>()?, + .collect::, Error>>()?, ), - Value::Map(map) => JsonValue::Object( + Value::Map(map) => serde_json::Value::Object( map.iter() .map(|(k, v)| { let string = k.to_text()?; Ok((string, v.try_to_validating_json()?)) }) - .collect::, Error>>()?, + .collect::, Error>>()?, ), Value::Identifier(bytes) => { // In order to be able to validate using JSON schema it needs to be in byte form - JsonValue::Array( + serde_json::Value::Array( bytes .iter() - .map(|a| JsonValue::Number((*a).into())) + .map(|a| serde_json::Value::Number((*a).into())) .collect(), ) } - Value::Bytes(bytes) => JsonValue::Array( + Value::Bytes(bytes) => serde_json::Value::Array( bytes .iter() - .map(|byte| JsonValue::Number((*byte).into())) + .map(|byte| serde_json::Value::Number((*byte).into())) .collect(), ), - Value::Bytes20(bytes) => JsonValue::Array( + Value::Bytes20(bytes) => serde_json::Value::Array( bytes .iter() - .map(|byte| JsonValue::Number((*byte).into())) + .map(|byte| serde_json::Value::Number((*byte).into())) .collect(), ), - Value::Bytes32(bytes) => JsonValue::Array( + Value::Bytes32(bytes) => serde_json::Value::Array( bytes .iter() - .map(|byte| JsonValue::Number((*byte).into())) + .map(|byte| serde_json::Value::Number((*byte).into())) .collect(), ), - Value::Bytes36(bytes) => JsonValue::Array( + Value::Bytes36(bytes) => serde_json::Value::Array( bytes .iter() - .map(|byte| JsonValue::Number((*byte).into())) + .map(|byte| serde_json::Value::Number((*byte).into())) .collect(), ), Value::EnumU8(_) => { @@ -202,12 +208,12 @@ impl Value { } } -impl From for Value { - fn from(value: JsonValue) -> Self { +impl From for Value { + fn from(value: serde_json::Value) -> Self { match value { - JsonValue::Null => Self::Null, - JsonValue::Bool(value) => Self::Bool(value), - JsonValue::Number(number) => { + serde_json::Value::Null => Self::Null, + serde_json::Value::Bool(value) => Self::Bool(value), + serde_json::Value::Number(number) => { if let Some(value) = number.as_u64() { return Self::U64(value); } else if let Some(value) = number.as_i64() { @@ -217,8 +223,8 @@ impl From for Value { } unreachable!("this shouldn't be reachable") } - JsonValue::String(string) => Self::Text(string), - JsonValue::Array(array) => { + serde_json::Value::String(string) => Self::Text(string), + serde_json::Value::Array(array) => { let u8_max = u8::MAX as u64; //todo: hacky solution, to fix let len = array.len(); @@ -241,19 +247,19 @@ impl From for Value { Self::Array(array.into_iter().map(|v| v.into()).collect()) } } - JsonValue::Object(map) => { + serde_json::Value::Object(map) => { Self::Map(map.into_iter().map(|(k, v)| (k.into(), v.into())).collect()) } } } } -impl From<&JsonValue> for Value { - fn from(value: &JsonValue) -> Self { +impl From<&serde_json::Value> for Value { + fn from(value: &serde_json::Value) -> Self { match value { - JsonValue::Null => Self::Null, - JsonValue::Bool(value) => Self::Bool(*value), - JsonValue::Number(number) => { + serde_json::Value::Null => Self::Null, + serde_json::Value::Bool(value) => Self::Bool(*value), + serde_json::Value::Number(number) => { if let Some(value) = number.as_u64() { return Self::U64(value); } else if let Some(value) = number.as_i64() { @@ -263,8 +269,8 @@ impl From<&JsonValue> for Value { } unreachable!("this shouldn't be reachable") } - JsonValue::String(string) => Self::Text(string.clone()), - JsonValue::Array(array) => { + serde_json::Value::String(string) => Self::Text(string.clone()), + serde_json::Value::Array(array) => { let u8_max = u8::MAX as u64; //todo: hacky solution, to fix let len = array.len(); @@ -282,7 +288,7 @@ impl From<&JsonValue> for Value { Self::Array(array.iter().map(|v| v.into()).collect()) } } - JsonValue::Object(map) => Self::Map( + serde_json::Value::Object(map) => Self::Map( map.into_iter() .map(|(k, v)| (k.clone().into(), v.into())) .collect(), @@ -291,45 +297,55 @@ impl From<&JsonValue> for Value { } } -impl TryInto for Value { +impl TryInto for Value { type Error = Error; - fn try_into(self) -> Result { + fn try_into(self) -> Result { Ok(match self { - Value::U128(i) => JsonValue::Number((i as u64).into()), - Value::I128(i) => JsonValue::Number((i as i64).into()), - Value::U64(i) => JsonValue::Number(i.into()), - Value::I64(i) => JsonValue::Number(i.into()), - Value::U32(i) => JsonValue::Number(i.into()), - Value::I32(i) => JsonValue::Number(i.into()), - Value::U16(i) => JsonValue::Number(i.into()), - Value::I16(i) => JsonValue::Number(i.into()), - Value::U8(i) => JsonValue::Number(i.into()), - Value::I8(i) => JsonValue::Number(i.into()), - Value::Bytes(bytes) => JsonValue::String(BASE64_STANDARD.encode(bytes.as_slice())), - Value::Bytes20(bytes) => JsonValue::String(BASE64_STANDARD.encode(bytes.as_slice())), - Value::Bytes32(bytes) => JsonValue::String(BASE64_STANDARD.encode(bytes.as_slice())), - Value::Bytes36(bytes) => JsonValue::String(BASE64_STANDARD.encode(bytes.as_slice())), - Value::Float(float) => JsonValue::Number(Number::from_f64(float).unwrap_or(0.into())), - Value::Text(string) => JsonValue::String(string), - Value::Bool(value) => JsonValue::Bool(value), - Value::Null => JsonValue::Null, - Value::Array(array) => JsonValue::Array( + Value::U128(i) => serde_json::Value::Number((i as u64).into()), + Value::I128(i) => serde_json::Value::Number((i as i64).into()), + Value::U64(i) => serde_json::Value::Number(i.into()), + Value::I64(i) => serde_json::Value::Number(i.into()), + Value::U32(i) => serde_json::Value::Number(i.into()), + Value::I32(i) => serde_json::Value::Number(i.into()), + Value::U16(i) => serde_json::Value::Number(i.into()), + Value::I16(i) => serde_json::Value::Number(i.into()), + Value::U8(i) => serde_json::Value::Number(i.into()), + Value::I8(i) => serde_json::Value::Number(i.into()), + Value::Bytes(bytes) => { + serde_json::Value::String(BASE64_STANDARD.encode(bytes.as_slice())) + } + Value::Bytes20(bytes) => { + serde_json::Value::String(BASE64_STANDARD.encode(bytes.as_slice())) + } + Value::Bytes32(bytes) => { + serde_json::Value::String(BASE64_STANDARD.encode(bytes.as_slice())) + } + Value::Bytes36(bytes) => { + serde_json::Value::String(BASE64_STANDARD.encode(bytes.as_slice())) + } + Value::Float(float) => { + serde_json::Value::Number(Number::from_f64(float).unwrap_or(0.into())) + } + Value::Text(string) => serde_json::Value::String(string), + Value::Bool(value) => serde_json::Value::Bool(value), + Value::Null => serde_json::Value::Null, + Value::Array(array) => serde_json::Value::Array( array .into_iter() .map(|value| value.try_into()) - .collect::, Error>>()?, + .collect::, Error>>()?, ), - Value::Map(map) => JsonValue::Object( + Value::Map(map) => serde_json::Value::Object( map.into_iter() .map(|(k, v)| { let string = k.into_text()?; Ok((string, v.try_into()?)) }) - .collect::, Error>>()?, + .collect::, Error>>()?, ), Value::Identifier(bytes) => { - JsonValue::String(bs58::encode(bytes.as_slice()).into_string()) + serde_json::Value::String(bs58::encode(bytes.as_slice()).into_string()) } Value::EnumU8(_) => { return Err(Error::Unsupported( @@ -346,56 +362,56 @@ impl TryInto for Value { } pub trait BTreeValueJsonConverter { - fn into_json_value(self) -> Result; - fn into_validating_json_value(self) -> Result; - fn to_json_value(&self) -> Result; - fn to_validating_json_value(&self) -> Result; - fn from_json_value(value: JsonValue) -> Result + fn into_json_value(self) -> Result; + fn into_validating_json_value(self) -> Result; + fn to_json_value(&self) -> Result; + fn to_validating_json_value(&self) -> Result; + fn from_json_value(value: serde_json::Value) -> Result where Self: Sized; } impl BTreeValueJsonConverter for BTreeMap { - fn into_json_value(self) -> Result { - Ok(JsonValue::Object( + fn into_json_value(self) -> Result { + Ok(serde_json::Value::Object( self.into_iter() .map(|(key, value)| Ok((key, value.try_into()?))) - .collect::, Error>>()?, + .collect::, Error>>()?, )) } - fn into_validating_json_value(self) -> Result { - Ok(JsonValue::Object( + fn into_validating_json_value(self) -> Result { + Ok(serde_json::Value::Object( self.into_iter() .map(|(key, value)| Ok((key, value.try_into_validating_json()?))) - .collect::, Error>>()?, + .collect::, Error>>()?, )) } - fn to_json_value(&self) -> Result { - Ok(JsonValue::Object( + fn to_json_value(&self) -> Result { + Ok(serde_json::Value::Object( self.iter() .map(|(key, value)| Ok((key.clone(), value.clone().try_into()?))) - .collect::, Error>>()?, + .collect::, Error>>()?, )) } - fn to_validating_json_value(&self) -> Result { - Ok(JsonValue::Object( + fn to_validating_json_value(&self) -> Result { + Ok(serde_json::Value::Object( self.iter() .map(|(key, value)| Ok((key.to_owned(), value.try_to_validating_json()?))) - .collect::, Error>>()?, + .collect::, Error>>()?, )) } - fn from_json_value(value: JsonValue) -> Result { + fn from_json_value(value: serde_json::Value) -> Result { let platform_value: Value = value.into(); platform_value.into_btree_string_map() } } -impl From> for Value { - fn from(value: BTreeMap) -> Self { +impl From> for Value { + fn from(value: BTreeMap) -> Self { let map: ValueMap = value .into_iter() .map(|(key, json_value)| { @@ -407,8 +423,8 @@ impl From> for Value { } } -impl From<&BTreeMap> for Value { - fn from(value: &BTreeMap) -> Self { +impl From<&BTreeMap> for Value { + fn from(value: &BTreeMap) -> Self { let map: ValueMap = value .iter() .map(|(key, json_value)| { diff --git a/packages/rs-platform-value/src/error.rs b/packages/rs-platform-value/src/error.rs index 129456bbc2b..a4f92685fe8 100644 --- a/packages/rs-platform-value/src/error.rs +++ b/packages/rs-platform-value/src/error.rs @@ -3,6 +3,7 @@ use std::fmt::Display; use thiserror::Error; #[derive(Error, Clone, Eq, PartialEq, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Error { #[error("unsupported: {0}")] Unsupported(String), diff --git a/packages/rs-platform-value/src/lib.rs b/packages/rs-platform-value/src/lib.rs index c372fc64787..27953b7755a 100644 --- a/packages/rs-platform-value/src/lib.rs +++ b/packages/rs-platform-value/src/lib.rs @@ -6,12 +6,14 @@ //! //! extern crate core; +#[cfg(feature = "apple")] +extern crate ferment_macro; pub mod btreemap_extensions; pub mod converter; pub mod display; mod eq; -mod error; +pub mod error; mod index; mod inner_array_value; pub mod inner_value; @@ -22,14 +24,15 @@ mod pointer; mod replace; pub mod string_encoding; pub mod system_bytes; -mod types; -mod value_map; +pub mod types; +pub mod value_map; mod value_serialization; pub use crate::value_map::{ValueMap, ValueMapHelper}; pub use error::Error; use std::collections::BTreeMap; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type Hash256 = [u8; 32]; pub use btreemap_extensions::btreemap_field_replacement::{ @@ -49,6 +52,7 @@ pub use patch::{patch, Patch}; /// A representation of a dynamic value that can handled dynamically #[non_exhaustive] #[derive(Clone, Debug, PartialEq, PartialOrd, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum Value { /// A u128 integer U128(u128), @@ -118,7 +122,7 @@ pub enum Value { /// An array Array(Vec), - /// A map + ///// A map Map(ValueMap), } @@ -1531,8 +1535,8 @@ implfrom! { Array(&[Value]), Array(Vec), - Map(&[(Value, Value)]), - Map(Vec<(Value, Value)>), + // Map(&[(Value, Value)]), + // Map(Vec<(Value, Value)>), } impl From<[(Value, Value); N]> for Value { diff --git a/packages/rs-platform-value/src/types/binary_data.rs b/packages/rs-platform-value/src/types/binary_data.rs index d3d39defd88..885421e6612 100644 --- a/packages/rs-platform-value/src/types/binary_data.rs +++ b/packages/rs-platform-value/src/types/binary_data.rs @@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Default, Clone, PartialEq, Eq, Ord, PartialOrd, Hash, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct BinaryData(pub Vec); impl fmt::Debug for BinaryData { diff --git a/packages/rs-platform-value/src/types/bytes_20.rs b/packages/rs-platform-value/src/types/bytes_20.rs index 1afe384baf1..df952a1a590 100644 --- a/packages/rs-platform-value/src/types/bytes_20.rs +++ b/packages/rs-platform-value/src/types/bytes_20.rs @@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Default, Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Hash, Copy, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Bytes20(pub [u8; 20]); impl AsRef<[u8]> for Bytes20 { diff --git a/packages/rs-platform-value/src/types/bytes_32.rs b/packages/rs-platform-value/src/types/bytes_32.rs index 041abb07d8e..2f108eb2ed5 100644 --- a/packages/rs-platform-value/src/types/bytes_32.rs +++ b/packages/rs-platform-value/src/types/bytes_32.rs @@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Default, Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Hash, Copy, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Bytes32(pub [u8; 32]); impl AsRef<[u8]> for Bytes32 { diff --git a/packages/rs-platform-value/src/types/identifier.rs b/packages/rs-platform-value/src/types/identifier.rs index 6ebf379350c..e61aa2a347b 100644 --- a/packages/rs-platform-value/src/types/identifier.rs +++ b/packages/rs-platform-value/src/types/identifier.rs @@ -7,8 +7,8 @@ use rand::rngs::StdRng; use rand::Rng; use serde::de::Visitor; use serde::{Deserialize, Serialize}; -#[cfg(feature = "json")] -use serde_json::Value as JsonValue; +//#[cfg(feature = "json")] +//use serde_json::Value as JsonValue; use std::convert::{TryFrom, TryInto}; use std::fmt; @@ -19,6 +19,7 @@ use crate::{string_encoding, Error, Value}; pub const IDENTIFIER_MEDIA_TYPE: &str = "application/x.dash.dpp.identifier"; #[derive(Default, Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, Copy, Encode, Decode)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct IdentifierBytes32(pub [u8; 32]); #[derive( @@ -36,6 +37,7 @@ pub struct IdentifierBytes32(pub [u8; 32]); Encode, Decode, )] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct Identifier(pub IdentifierBytes32); impl Distribution for Standard { @@ -234,10 +236,10 @@ impl Identifier { } #[cfg(feature = "json")] - pub fn to_json_value_vec(&self) -> Vec { + pub fn to_json_value_vec(&self) -> Vec { self.to_buffer() .iter() - .map(|v| JsonValue::from(*v)) + .map(|v| serde_json::Value::from(*v)) .collect() } diff --git a/packages/rs-platform-value/src/types/mod.rs b/packages/rs-platform-value/src/types/mod.rs index c4e712620b6..0daf2ed3730 100644 --- a/packages/rs-platform-value/src/types/mod.rs +++ b/packages/rs-platform-value/src/types/mod.rs @@ -1,10 +1,10 @@ use crate::string_encoding::Encoding; -pub(crate) mod binary_data; -pub(crate) mod bytes_20; -pub(crate) mod bytes_32; -pub(crate) mod bytes_36; -pub(crate) mod identifier; +pub mod binary_data; +pub mod bytes_20; +pub mod bytes_32; +pub mod bytes_36; +pub mod identifier; fn encoding_string_to_encoding(encoding_string: Option<&str>) -> Encoding { match encoding_string { diff --git a/packages/rs-platform-value/src/value_map.rs b/packages/rs-platform-value/src/value_map.rs index a067b87efba..c2d254611c2 100644 --- a/packages/rs-platform-value/src/value_map.rs +++ b/packages/rs-platform-value/src/value_map.rs @@ -3,6 +3,7 @@ use indexmap::IndexMap; use std::cmp::Ordering; use std::collections::BTreeMap; +#[cfg_attr(feature = "apple", ferment_macro::export)] pub type ValueMap = Vec<(Value, Value)>; pub trait ValueMapHelper { diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 2a6712e8934..7c4b0a792ab 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -13,6 +13,8 @@ bincode = { version = "=2.0.0-rc.3" } versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" } grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "221ca6ec6b8d2b192d334192bd5a7b2cab5b0aa8" } once_cell = "1.19.0" +ferment-macro = { version = "0.2", package = "ferment-macro" } [features] mock-versions = [] +apple = [] diff --git a/packages/rs-platform-version/src/error.rs b/packages/rs-platform-version/src/error.rs index 2db22a3b687..bd4c6b51958 100644 --- a/packages/rs-platform-version/src/error.rs +++ b/packages/rs-platform-version/src/error.rs @@ -1,6 +1,7 @@ use thiserror::Error; #[derive(Error, Debug)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub enum PlatformVersionError { #[error("unknown version error {0}")] UnknownVersionError(String), diff --git a/packages/rs-platform-version/src/version/drive_versions/mod.rs b/packages/rs-platform-version/src/version/drive_versions/mod.rs index 7ed30fe0a57..5837adb57b4 100644 --- a/packages/rs-platform-version/src/version/drive_versions/mod.rs +++ b/packages/rs-platform-version/src/version/drive_versions/mod.rs @@ -1,4 +1,3 @@ -use crate::version::FeatureVersion; use drive_contract_method_versions::DriveContractMethodVersions; use drive_credit_pool_method_versions::DriveCreditPoolMethodVersions; use drive_document_method_versions::DriveDocumentMethodVersions; @@ -11,6 +10,7 @@ use drive_token_method_versions::DriveTokenMethodVersions; use drive_verify_method_versions::DriveVerifyMethodVersions; use drive_vote_method_versions::DriveVoteMethodVersions; use grovedb_version::version::GroveVersion; +use versioned_feature_core::FeatureVersion; pub mod drive_contract_method_versions; pub mod drive_credit_pool_method_versions; diff --git a/packages/rs-platform-version/src/version/fee/data_contract_registration/mod.rs b/packages/rs-platform-version/src/version/fee/data_contract_registration/mod.rs index aa3eeb7940f..0bb8d66da56 100644 --- a/packages/rs-platform-version/src/version/fee/data_contract_registration/mod.rs +++ b/packages/rs-platform-version/src/version/fee/data_contract_registration/mod.rs @@ -7,6 +7,7 @@ pub mod v2; /// Re-Validation will happen on data contract update which is why we don't bundle them /// together. #[derive(Clone, Debug, Default, Encode, Decode, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeDataContractRegistrationVersion { pub base_contract_registration_fee: u64, pub document_type_registration_fee: u64, diff --git a/packages/rs-platform-version/src/version/fee/data_contract_validation/mod.rs b/packages/rs-platform-version/src/version/fee/data_contract_validation/mod.rs index 28ad0e6fb6b..fb5b5c839c6 100644 --- a/packages/rs-platform-version/src/version/fee/data_contract_validation/mod.rs +++ b/packages/rs-platform-version/src/version/fee/data_contract_validation/mod.rs @@ -3,6 +3,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Default, Encode, Decode, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeDataContractValidationVersion { pub document_type_base_fee: u64, pub document_type_schema_size_fee: u64, diff --git a/packages/rs-platform-version/src/version/fee/hashing/mod.rs b/packages/rs-platform-version/src/version/fee/hashing/mod.rs index 2d403156019..cd3783f1235 100644 --- a/packages/rs-platform-version/src/version/fee/hashing/mod.rs +++ b/packages/rs-platform-version/src/version/fee/hashing/mod.rs @@ -3,6 +3,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeHashingVersion { pub blake3_base: u64, pub blake3_per_block: u64, diff --git a/packages/rs-platform-version/src/version/fee/mod.rs b/packages/rs-platform-version/src/version/fee/mod.rs index df0dc5a16d5..cc66f9d21f4 100644 --- a/packages/rs-platform-version/src/version/fee/mod.rs +++ b/packages/rs-platform-version/src/version/fee/mod.rs @@ -14,9 +14,9 @@ use crate::version::fee::vote_resolution_fund_fees::VoteResolutionFundFees; use bincode::{Decode, Encode}; pub mod data_contract_registration; -mod data_contract_validation; -mod hashing; -mod processing; +pub mod data_contract_validation; +pub mod hashing; +pub mod processing; pub mod signature; pub mod state_transition_min_fees; pub mod storage; @@ -29,6 +29,7 @@ pub type FeeVersionNumber = u32; pub const FEE_VERSIONS: &[FeeVersion] = &[FEE_VERSION1]; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeVersion { pub fee_version_number: FeeVersionNumber, // Permille means devise by 1000 diff --git a/packages/rs-platform-version/src/version/fee/processing/mod.rs b/packages/rs-platform-version/src/version/fee/processing/mod.rs index 715e060c4a5..6ad48c4fddd 100644 --- a/packages/rs-platform-version/src/version/fee/processing/mod.rs +++ b/packages/rs-platform-version/src/version/fee/processing/mod.rs @@ -4,6 +4,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeProcessingVersion { pub fetch_identity_balance_processing_cost: u64, pub fetch_identity_revision_processing_cost: u64, diff --git a/packages/rs-platform-version/src/version/fee/signature/mod.rs b/packages/rs-platform-version/src/version/fee/signature/mod.rs index 6a667bd574d..721aca1dc34 100644 --- a/packages/rs-platform-version/src/version/fee/signature/mod.rs +++ b/packages/rs-platform-version/src/version/fee/signature/mod.rs @@ -3,6 +3,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeSignatureVersion { pub verify_signature_ecdsa_secp256k1: u64, pub verify_signature_bls12_381: u64, diff --git a/packages/rs-platform-version/src/version/fee/state_transition_min_fees/mod.rs b/packages/rs-platform-version/src/version/fee/state_transition_min_fees/mod.rs index 2b099d7143b..a2b60760143 100644 --- a/packages/rs-platform-version/src/version/fee/state_transition_min_fees/mod.rs +++ b/packages/rs-platform-version/src/version/fee/state_transition_min_fees/mod.rs @@ -2,6 +2,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct StateTransitionMinFees { pub credit_transfer: u64, pub credit_withdrawal: u64, diff --git a/packages/rs-platform-version/src/version/fee/storage/mod.rs b/packages/rs-platform-version/src/version/fee/storage/mod.rs index f6121321ba5..1a5dc6bca94 100644 --- a/packages/rs-platform-version/src/version/fee/storage/mod.rs +++ b/packages/rs-platform-version/src/version/fee/storage/mod.rs @@ -3,6 +3,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct FeeStorageVersion { pub storage_disk_usage_credit_per_byte: u64, pub storage_processing_credit_per_byte: u64, diff --git a/packages/rs-platform-version/src/version/fee/vote_resolution_fund_fees/mod.rs b/packages/rs-platform-version/src/version/fee/vote_resolution_fund_fees/mod.rs index ba594961d40..46ef3902dd1 100644 --- a/packages/rs-platform-version/src/version/fee/vote_resolution_fund_fees/mod.rs +++ b/packages/rs-platform-version/src/version/fee/vote_resolution_fund_fees/mod.rs @@ -2,6 +2,7 @@ use bincode::{Decode, Encode}; pub mod v1; #[derive(Clone, Debug, Encode, Decode, Default, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct VoteResolutionFundFees { /// This is the amount that will be deducted from an identity and used to pay for voting pub contested_document_vote_resolution_fund_required_amount: u64, diff --git a/packages/rs-platform-version/src/version/mod.rs b/packages/rs-platform-version/src/version/mod.rs index f8fbe392d36..774343ad66d 100644 --- a/packages/rs-platform-version/src/version/mod.rs +++ b/packages/rs-platform-version/src/version/mod.rs @@ -1,5 +1,4 @@ -mod protocol_version; - +pub mod protocol_version; use crate::version::v9::PROTOCOL_VERSION_9; pub use protocol_version::*; use std::ops::RangeInclusive; @@ -13,7 +12,7 @@ pub mod fee; pub mod mocks; pub mod patches; pub mod system_data_contract_versions; -mod system_limits; +pub mod system_limits; pub mod v1; pub mod v2; pub mod v3; diff --git a/packages/rs-platform-version/src/version/protocol_version.rs b/packages/rs-platform-version/src/version/protocol_version.rs index d25532718f2..13dc2c53080 100644 --- a/packages/rs-platform-version/src/version/protocol_version.rs +++ b/packages/rs-platform-version/src/version/protocol_version.rs @@ -26,8 +26,7 @@ use crate::version::v8::PLATFORM_V8; use crate::version::v9::PLATFORM_V9; use crate::version::ProtocolVersion; -pub use versioned_feature_core::*; - +pub use versioned_feature_core::{FeatureVersion, FeatureVersionBounds, OptionalFeatureVersion}; #[derive(Clone, Debug)] pub struct PlatformVersion { pub protocol_version: ProtocolVersion, diff --git a/packages/rs-platform-version/src/version/system_data_contract_versions/mod.rs b/packages/rs-platform-version/src/version/system_data_contract_versions/mod.rs index 1630d740a4b..ec3462219d1 100644 --- a/packages/rs-platform-version/src/version/system_data_contract_versions/mod.rs +++ b/packages/rs-platform-version/src/version/system_data_contract_versions/mod.rs @@ -1,8 +1,9 @@ pub mod v1; -use crate::version::FeatureVersion; +use versioned_feature_core::FeatureVersion; #[derive(Clone, Debug, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SystemDataContractVersions { pub withdrawals: FeatureVersion, pub dpns: FeatureVersion, diff --git a/packages/rs-platform-version/src/version/system_limits/mod.rs b/packages/rs-platform-version/src/version/system_limits/mod.rs index 35929bac5de..d04b7137eb6 100644 --- a/packages/rs-platform-version/src/version/system_limits/mod.rs +++ b/packages/rs-platform-version/src/version/system_limits/mod.rs @@ -1,6 +1,7 @@ pub mod v1; #[derive(Clone, Debug, Default)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct SystemLimits { pub estimated_contract_max_serialized_size: u16, pub max_field_value_size: u32, diff --git a/packages/rs-platform-versioning/src/lib.rs b/packages/rs-platform-versioning/src/lib.rs index eb8cc0e0832..c1544efe471 100644 --- a/packages/rs-platform-versioning/src/lib.rs +++ b/packages/rs-platform-versioning/src/lib.rs @@ -24,7 +24,7 @@ pub fn derive_platform_versioned(input: TokenStream) -> TokenStream { } quote! { pub fn verify_protocol_version(&self, protocol_version: u32) -> Result { - let platform_version = crate::version::PlatformVersion::get(protocol_version)?; + let platform_version = platform_version::version::PlatformVersion::get(protocol_version)?; Ok(platform_version.#tokens.check_version(self.feature_version())) } } @@ -47,7 +47,7 @@ pub fn derive_platform_versioned(input: TokenStream) -> TokenStream { let output = quote! { impl #name { - pub fn feature_version(&self) -> crate::version::FeatureVersion { + pub fn feature_version(&self) -> versioned_feature_core::FeatureVersion { match self { #(#version_arms),* } diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index 055c9ff7a02..9f7307bc018 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -38,10 +38,13 @@ 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.39.6" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/ferment" } 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"] } +platform-value = { path = "../rs-platform-value" } +platform-version = { path = "../rs-platform-version" } +ferment-macro = { version = "0.2", package = "ferment-macro" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] tokio = { version = "1.40", features = ["macros", "time", "rt-multi-thread"] } @@ -84,6 +87,8 @@ mocks = [ "zeroize/serde", ] +apple = ["dpp/apple", "drive-proof-verifier/apple"] + # Run integration tests using test vectors from `tests/vectors/` instead of connecting to live Dash Platform. # # This feature is enabled by default to allow testing without connecting to the Dash Platform as diff --git a/packages/rs-sdk/src/core/dash_core_client.rs b/packages/rs-sdk/src/core/dash_core_client.rs index 67d1dea28ce..d59af4207c5 100644 --- a/packages/rs-sdk/src/core/dash_core_client.rs +++ b/packages/rs-sdk/src/core/dash_core_client.rs @@ -133,7 +133,7 @@ impl LowLevelDashCoreClient { let core = self.core.lock().expect("Core lock poisoned"); let quorum_info = core - .get_quorum_info_reversed(json::QuorumType::from(quorum_type), &quorum_hash, None) + .get_quorum_info(json::QuorumType::from(quorum_type), &quorum_hash, None) .map_err(|e: dashcore_rpc::Error| ContextProviderError::Generic(e.to_string()))?; let key = quorum_info.quorum_public_key; let pubkey = as TryInto<[u8; 48]>>::try_into(key).map_err(|_e| { diff --git a/packages/rs-sdk/src/core/transaction.rs b/packages/rs-sdk/src/core/transaction.rs index 39d196b57a8..999d429264b 100644 --- a/packages/rs-sdk/src/core/transaction.rs +++ b/packages/rs-sdk/src/core/transaction.rs @@ -9,8 +9,8 @@ use dapi_grpc::core::v0::{ use dpp::dashcore::consensus::Decodable; use dpp::dashcore::{Address, InstantLock, MerkleBlock, OutPoint, Transaction, Txid}; use dpp::identity::state_transition::asset_lock_proof::chain::ChainAssetLockProof; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; -use dpp::prelude::AssetLockProof; use rs_dapi_client::{DapiRequestExecutor, IntoInner, RequestSettings}; use std::time::Duration; diff --git a/packages/rs-sdk/src/error.rs b/packages/rs-sdk/src/error.rs index 4412a580e36..3d4d50e401f 100644 --- a/packages/rs-sdk/src/error.rs +++ b/packages/rs-sdk/src/error.rs @@ -2,7 +2,7 @@ use dapi_grpc::platform::v0::StateTransitionBroadcastError as StateTransitionBroadcastErrorProto; use dapi_grpc::tonic::Code; use dpp::block::block_info::BlockInfo; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::serialization::PlatformDeserializable; use dpp::version::PlatformVersionError; use dpp::ProtocolError; @@ -15,6 +15,7 @@ use std::time::Duration; /// Error type for the SDK // TODO: Propagate server address and retry information so that the user can retrieve it #[derive(Debug, thiserror::Error)] +#[ferment_macro::opaque] pub enum Error { /// SDK is not configured properly #[error("SDK misconfigured: {0}")] @@ -222,10 +223,10 @@ mod tests { use assert_matches::assert_matches; use base64::Engine; use dapi_grpc::tonic::metadata::{MetadataMap, MetadataValue}; - use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; - use dpp::consensus::basic::BasicError; use dpp::dashcore::hashes::Hash; use dpp::dashcore::Txid; + use dpp::errors::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; + use dpp::errors::consensus::basic::BasicError; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/rs-sdk/src/internal_cache/mod.rs b/packages/rs-sdk/src/internal_cache/mod.rs index 9a07ce72d91..94cd09f7756 100644 --- a/packages/rs-sdk/src/internal_cache/mod.rs +++ b/packages/rs-sdk/src/internal_cache/mod.rs @@ -1,5 +1,6 @@ -use crate::platform::Identifier; +// use crate::platform::Identifier; use crate::sdk::LastQueryTimestamp; +use dpp::identifier::Identifier; use dpp::prelude; use dpp::prelude::IdentityNonce; use std::collections::BTreeMap; diff --git a/packages/rs-sdk/src/lib.rs b/packages/rs-sdk/src/lib.rs index fe2c51ab065..53dcda1b5d6 100644 --- a/packages/rs-sdk/src/lib.rs +++ b/packages/rs-sdk/src/lib.rs @@ -63,7 +63,7 @@ pub mod core; pub mod error; -mod internal_cache; +pub mod internal_cache; pub mod mock; pub mod platform; pub mod sdk; diff --git a/packages/rs-sdk/src/mock/provider.rs b/packages/rs-sdk/src/mock/provider.rs index 16225dfc082..fe8be2f23e7 100644 --- a/packages/rs-sdk/src/mock/provider.rs +++ b/packages/rs-sdk/src/mock/provider.rs @@ -5,11 +5,12 @@ use crate::platform::Fetch; use crate::sync::block_on; use crate::{Error, Sdk}; use arc_swap::ArcSwapAny; -use dpp::data_contract::TokenConfiguration; -use dpp::prelude::{CoreBlockHeight, DataContract, Identifier}; -use dpp::version::PlatformVersion; +use dpp::data_contract::{DataContract, TokenConfiguration}; +use dpp::platform_value::Identifier; +use dpp::prelude::CoreBlockHeight; use drive_proof_verifier::error::ContextProviderError; use drive_proof_verifier::ContextProvider; +use platform_version::version::PlatformVersion; use std::hash::Hash; use std::num::NonZeroUsize; use std::sync::Arc; diff --git a/packages/rs-sdk/src/mock/requests.rs b/packages/rs-sdk/src/mock/requests.rs index 67249fdfddb..2c203388ef2 100644 --- a/packages/rs-sdk/src/mock/requests.rs +++ b/packages/rs-sdk/src/mock/requests.rs @@ -11,11 +11,11 @@ use dpp::{ bincode, block::extended_epoch_info::ExtendedEpochInfo, dashcore::{hashes::Hash as CoreHash, ProTxHash}, + data_contract::DataContract, document::{serialization_traits::DocumentCborMethodsV0, Document}, identifier::Identifier, - identity::IdentityPublicKey, + identity::{Identity, IdentityPublicKey}, platform_serialization::{platform_encode_to_vec, platform_versioned_decode_from_slice}, - prelude::{DataContract, Identity}, serialization::{ PlatformDeserializableWithPotentialValidationFromVersionedStructure, PlatformSerializableWithPlatformVersion, diff --git a/packages/rs-sdk/src/platform.rs b/packages/rs-sdk/src/platform.rs index a5141f22060..a5b18b5d5a5 100644 --- a/packages/rs-sdk/src/platform.rs +++ b/packages/rs-sdk/src/platform.rs @@ -21,10 +21,10 @@ pub mod group_actions; pub mod tokens; pub use dapi_grpc::platform::v0::{self as proto}; +pub use dpp::platform_value::Identifier; pub use dpp::{ - self as dpp, - document::Document, - prelude::{DataContract, Identifier, Identity, IdentityPublicKey, Revision}, + self as dpp, data_contract::DataContract, document::Document, + identity::identity_public_key::IdentityPublicKey, identity::Identity, prelude::Revision, }; pub use drive::query::DriveDocumentQuery; pub use drive_proof_verifier::ContextProvider; diff --git a/packages/rs-sdk/src/platform/document_query.rs b/packages/rs-sdk/src/platform/document_query.rs index 39ec37d736a..51211801389 100644 --- a/packages/rs-sdk/src/platform/document_query.rs +++ b/packages/rs-sdk/src/platform/document_query.rs @@ -15,10 +15,11 @@ use dpp::version::PlatformVersion; use dpp::{ data_contract::{ accessors::v0::DataContractV0Getters, document_type::accessors::DocumentTypeV0Getters, + DataContract, }, document::Document, + identifier::Identifier, platform_value::{platform_value, Value}, - prelude::{DataContract, Identifier}, InvalidVectorSizeError, ProtocolError, }; use drive::query::{DriveDocumentQuery, InternalClauses, OrderClause, WhereClause, WhereOperator}; diff --git a/packages/rs-sdk/src/platform/fetch.rs b/packages/rs-sdk/src/platform/fetch.rs index b1e6433a578..cd493d8a255 100644 --- a/packages/rs-sdk/src/platform/fetch.rs +++ b/packages/rs-sdk/src/platform/fetch.rs @@ -14,17 +14,14 @@ use crate::{error::Error, platform::query::Query, Sdk}; use dapi_grpc::platform::v0::{self as platform_proto, Proof, ResponseMetadata}; use dpp::data_contract::associated_token::token_perpetual_distribution::reward_distribution_moment::RewardDistributionMoment; use dpp::voting::votes::Vote; -use dpp::{ - block::extended_epoch_info::ExtendedEpochInfo, document::Document, platform_value::Identifier, - prelude::Identity, -}; +use dpp::{block::extended_epoch_info::ExtendedEpochInfo, document::Document, identity::Identity}; use drive_proof_verifier::FromProof; use rs_dapi_client::{transport::TransportRequest, DapiRequest, RequestSettings}; use rs_dapi_client::{ExecutionError, ExecutionResponse, InnerInto, IntoInner}; use std::fmt::Debug; use super::types::identity::IdentityRequest; -use super::DocumentQuery; +use super::{DocumentQuery, Identifier}; /// Trait implemented by objects that can be fetched from Platform. /// @@ -42,7 +39,8 @@ use super::DocumentQuery; /// * call [Identity::fetch()] with the query and an instance of [Sdk]. /// /// ```rust -/// use dash_sdk::{Sdk, platform::{Query, Identifier, Fetch, Identity}}; +/// use dash_sdk::{Sdk, platform::{Query, Fetch, Identity}}; +/// use dpp::identifier::Identifier; /// /// # const SOME_IDENTIFIER : [u8; 32] = [0; 32]; /// let sdk = Sdk::new_mock(); @@ -251,7 +249,7 @@ impl Fetch for Identity { type Request = IdentityRequest; } -impl Fetch for dpp::prelude::DataContract { +impl Fetch for dpp::data_contract::DataContract { type Request = platform_proto::GetDataContractRequest; } diff --git a/packages/rs-sdk/src/platform/fetch_many.rs b/packages/rs-sdk/src/platform/fetch_many.rs index 59767c6acbc..329a3b47390 100644 --- a/packages/rs-sdk/src/platform/fetch_many.rs +++ b/packages/rs-sdk/src/platform/fetch_many.rs @@ -23,8 +23,7 @@ use dapi_grpc::platform::v0::{ GetVotePollsByEndDateRequest, Proof, ResponseMetadata, }; use dashcore_rpc::dashcore::ProTxHash; -use dpp::identity::KeyID; -use dpp::prelude::{Identifier, IdentityPublicKey}; +use dpp::identity::identity_public_key::{IdentityPublicKey, KeyID}; use dpp::util::deserializer::ProtocolVersion; use dpp::version::ProtocolVersionVoteCount; use dpp::{block::epoch::EpochIndex, prelude::TimestampMillis, voting::vote_polls::VotePoll}; @@ -43,6 +42,7 @@ use drive_proof_verifier::types::{ VotePollsGroupedByTimestamp, Voter, Voters, }; use drive_proof_verifier::{types::Documents, FromProof}; +use platform_value::Identifier; use rs_dapi_client::{ transport::TransportRequest, DapiRequest, ExecutionError, ExecutionResponse, InnerInto, IntoInner, RequestSettings, diff --git a/packages/rs-sdk/src/platform/identities_contract_keys_query.rs b/packages/rs-sdk/src/platform/identities_contract_keys_query.rs index e761cecce9b..f75e0f4e54c 100644 --- a/packages/rs-sdk/src/platform/identities_contract_keys_query.rs +++ b/packages/rs-sdk/src/platform/identities_contract_keys_query.rs @@ -1,12 +1,13 @@ use dapi_grpc::platform::v0::get_identities_contract_keys_request::GetIdentitiesContractKeysRequestV0; use dapi_grpc::platform::v0::get_identities_contract_keys_request::Version::V0; use dapi_grpc::platform::v0::GetIdentitiesContractKeysRequest; -use dpp::identity::Purpose; +use dpp::identifier::Identifier; +use dpp::identity::identity_public_key::Purpose; use rs_dapi_client::transport::{ AppliedRequestSettings, BoxFuture, TransportError, TransportRequest, }; -use crate::platform::Identifier; +// use crate::platform::Identifier; use crate::Error; /// Request that is used to query identities' contract keys diff --git a/packages/rs-sdk/src/platform/query.rs b/packages/rs-sdk/src/platform/query.rs index 0cdfbc81e9c..702a95559ef 100644 --- a/packages/rs-sdk/src/platform/query.rs +++ b/packages/rs-sdk/src/platform/query.rs @@ -29,8 +29,9 @@ use dapi_grpc::platform::v0::{ GetTokenPerpetualDistributionLastClaimRequest, GetVotePollsByEndDateRequest, }; use dashcore_rpc::dashcore::{hashes::Hash, ProTxHash}; +use dpp::block::epoch::EpochIndex; +use dpp::identifier::Identifier; use dpp::version::PlatformVersionError; -use dpp::{block::epoch::EpochIndex, prelude::Identifier}; use drive::query::contested_resource_votes_given_by_identity_query::ContestedResourceVotesGivenByIdentityQuery; use drive::query::vote_poll_contestant_votes_query::ContestedDocumentVotePollVotesDriveQuery; use drive::query::vote_poll_vote_state_query::ContestedDocumentVotePollDriveQuery; @@ -66,7 +67,7 @@ pub const DEFAULT_NODES_VOTING_LIMIT: u32 = 100; /// or [FetchMany](crate::platform::FetchMany) trait: /// /// ```rust -/// use dash_sdk::{Sdk, platform::{Query, Identifier, Fetch, Identity}}; +/// use dash_sdk::{Sdk, platform::{Identifier, Query, Fetch, Identity}}; /// /// # const SOME_IDENTIFIER : [u8; 32] = [0; 32]; /// let sdk = Sdk::new_mock(); @@ -158,9 +159,9 @@ impl Query for LimitQuery<(Identifier, u64 } } -impl Query for Identifier { +impl Query for Identifier { /// Get all keys for an identity with provided identifier. - fn query(self, prove: bool) -> Result { + fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); } diff --git a/packages/rs-sdk/src/platform/transition/broadcast.rs b/packages/rs-sdk/src/platform/transition/broadcast.rs index 54610845000..b1a21259de0 100644 --- a/packages/rs-sdk/src/platform/transition/broadcast.rs +++ b/packages/rs-sdk/src/platform/transition/broadcast.rs @@ -49,10 +49,15 @@ impl BroadcastStateTransition for StateTransition { address: None, retries: 0, })?; - request + println!("Sending request to broadcast state transition => {:p} {:?}", sdk, request); + let result = request .execute(sdk, request_settings) - .await - .map_err(|e| e.inner_into()) + .await; + println!("Sending request to broadcast state transition <= {:p} {:?}", sdk, result); + let result = result + .map_err(|e| e.inner_into()); + println!("Sending request to broadcast state transition return ->> {:p}", &result); + result }; // response is empty for a broadcast, result comes from the stream wait for state transition result diff --git a/packages/rs-sdk/src/platform/transition/broadcast_identity.rs b/packages/rs-sdk/src/platform/transition/broadcast_identity.rs index 5bce4205cfe..1a74008141c 100644 --- a/packages/rs-sdk/src/platform/transition/broadcast_identity.rs +++ b/packages/rs-sdk/src/platform/transition/broadcast_identity.rs @@ -10,10 +10,11 @@ use std::fmt::Debug; use dapi_grpc::platform::v0::{self as proto, BroadcastStateTransitionRequest}; use dpp::dashcore::PrivateKey; use dpp::identity::signer::Signer; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::identity::Identity; use dpp::native_bls::NativeBlsModule; -use dpp::prelude::{AssetLockProof, Identity}; -use dpp::state_transition::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; use dpp::state_transition::StateTransition; use dpp::version::PlatformVersion; use rs_dapi_client::transport::TransportRequest; @@ -32,7 +33,7 @@ use crate::error::Error; /// ## Example /// /// To broadcast a new [Identity](dpp::prelude::Identity) state transition, you would typically -/// create an [IdentityCreateTransition](dpp::state_transition::identity_create_transition::IdentityCreateTransition), +/// create an [IdentityCreateTransition](dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition), /// sign it, and use the `broadcast_new_identity` method provided by this trait: /// /// ```rust, ignore @@ -104,6 +105,7 @@ impl BroadcastRequestForNewIdentity Result<(StateTransition, BroadcastStateTransitionRequest), Error> { + println!("broadcast_request_for_new_identity.1: {:p} / {:p}", &asset_lock_proof, &asset_lock_proof_private_key); let identity_create_transition = IdentityCreateTransition::try_from_identity_with_signer( self, asset_lock_proof, @@ -113,6 +115,7 @@ impl BroadcastRequestForNewIdentity PutDocument for Document { signer: &S, settings: Option, ) -> Result { + println!("put_to_platform_and_wait_for_response.1: {:?} / {:?} / {:?} / {:?}", sdk.version(), document_type, document_state_transition_entropy, identity_public_key); let state_transition = self .put_to_platform( sdk, @@ -106,6 +107,7 @@ impl PutDocument for Document { ) .await?; + println!("put_to_platform_and_wait_for_response.3: {:?}", state_transition); Self::wait_for_response(sdk, state_transition, settings).await } } diff --git a/packages/rs-sdk/src/platform/transition/put_identity.rs b/packages/rs-sdk/src/platform/transition/put_identity.rs index ce79b52d81c..d9ddc80d06a 100644 --- a/packages/rs-sdk/src/platform/transition/put_identity.rs +++ b/packages/rs-sdk/src/platform/transition/put_identity.rs @@ -6,7 +6,8 @@ use super::put_settings::PutSettings; use super::waitable::Waitable; use dpp::dashcore::PrivateKey; use dpp::identity::signer::Signer; -use dpp::prelude::{AssetLockProof, Identity}; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; +use dpp::identity::Identity; use dpp::state_transition::StateTransition; /// A trait for putting an identity to platform @@ -44,15 +45,17 @@ impl PutIdentity for Identity { signer: &S, settings: Option, ) -> Result { + println!("PutIdentity::put_to_platform.1: {:p} {:p}", &asset_lock_proof, &asset_lock_proof_private_key); let (state_transition, _) = self.broadcast_request_for_new_identity( asset_lock_proof, asset_lock_proof_private_key, signer, sdk.version(), )?; - + println!("PutIdentity::put_to_platform.2: {:p}", &state_transition); // response is empty for a broadcast, result comes from the stream wait for state transition result state_transition.broadcast(sdk, settings).await?; + println!("PutIdentity::put_to_platform.3: {:p}", &state_transition); Ok(state_transition) } @@ -64,6 +67,7 @@ impl PutIdentity for Identity { signer: &S, settings: Option, ) -> Result { + println!("put_to_platform_and_wait_for_response.1: {:p} / {:p} / {:p} / {:p} / {:p}", sdk, &asset_lock_proof, asset_lock_proof_private_key, signer, &settings); let state_transition = self .put_to_platform( sdk, @@ -73,7 +77,7 @@ impl PutIdentity for Identity { settings, ) .await?; - + println!("put_to_platform_and_wait_for_response.2: {:p}", &state_transition); Self::wait_for_response(sdk, state_transition, settings).await } } diff --git a/packages/rs-sdk/src/platform/transition/put_settings.rs b/packages/rs-sdk/src/platform/transition/put_settings.rs index 2d1d58c273a..105e8a0fb0a 100644 --- a/packages/rs-sdk/src/platform/transition/put_settings.rs +++ b/packages/rs-sdk/src/platform/transition/put_settings.rs @@ -1,7 +1,7 @@ use std::time::Duration; use dpp::prelude::UserFeeIncrease; -use dpp::state_transition::batch_transition::methods::StateTransitionCreationOptions; +use dpp::state_transition::state_transitions::document::batch_transition::methods::StateTransitionCreationOptions; use rs_dapi_client::RequestSettings; /// The options when putting something to platform diff --git a/packages/rs-sdk/src/platform/transition/top_up_identity.rs b/packages/rs-sdk/src/platform/transition/top_up_identity.rs index 10998b6ae77..8be612fc31d 100644 --- a/packages/rs-sdk/src/platform/transition/top_up_identity.rs +++ b/packages/rs-sdk/src/platform/transition/top_up_identity.rs @@ -3,10 +3,11 @@ use super::put_settings::PutSettings; use super::waitable::Waitable; use crate::{Error, Sdk}; use dpp::dashcore::PrivateKey; +use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; use dpp::identity::{Identity, PartialIdentity}; -use dpp::prelude::{AssetLockProof, UserFeeIncrease}; -use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::prelude::UserFeeIncrease; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; #[async_trait::async_trait] pub trait TopUpIdentity: Waitable { diff --git a/packages/rs-sdk/src/platform/transition/transfer.rs b/packages/rs-sdk/src/platform/transition/transfer.rs index b939d05ff02..847957a548a 100644 --- a/packages/rs-sdk/src/platform/transition/transfer.rs +++ b/packages/rs-sdk/src/platform/transition/transfer.rs @@ -6,8 +6,8 @@ use crate::platform::transition::put_settings::PutSettings; use crate::{Error, Sdk}; use dpp::identity::signer::Signer; use dpp::identity::{Identity, IdentityPublicKey, PartialIdentity}; -use dpp::state_transition::identity_credit_transfer_transition::methods::IdentityCreditTransferTransitionMethodsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::methods::IdentityCreditTransferTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use super::waitable::Waitable; diff --git a/packages/rs-sdk/src/platform/transition/transfer_document.rs b/packages/rs-sdk/src/platform/transition/transfer_document.rs index 08c2da69aa9..d9001f15585 100644 --- a/packages/rs-sdk/src/platform/transition/transfer_document.rs +++ b/packages/rs-sdk/src/platform/transition/transfer_document.rs @@ -8,8 +8,8 @@ use dpp::data_contract::document_type::DocumentType; use dpp::document::{Document, DocumentV0Getters}; use dpp::identity::signer::Signer; use dpp::identity::IdentityPublicKey; -use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use dpp::state_transition::StateTransition; use dpp::tokens::token_payment_info::TokenPaymentInfo; use rs_dapi_client::{DapiRequest, IntoInner}; diff --git a/packages/rs-sdk/src/platform/transition/update_price_of_document.rs b/packages/rs-sdk/src/platform/transition/update_price_of_document.rs index eae4a599b41..c42e30b8079 100644 --- a/packages/rs-sdk/src/platform/transition/update_price_of_document.rs +++ b/packages/rs-sdk/src/platform/transition/update_price_of_document.rs @@ -3,14 +3,14 @@ use crate::{Error, Sdk}; use super::broadcast::BroadcastStateTransition; use super::waitable::Waitable; use crate::platform::transition::put_settings::PutSettings; +use dpp::balances::credits::Credits; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::data_contract::document_type::DocumentType; use dpp::document::{Document, DocumentV0Getters}; -use dpp::fee::Credits; use dpp::identity::signer::Signer; use dpp::identity::IdentityPublicKey; -use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::state_transition::StateTransition; use dpp::tokens::token_payment_info::TokenPaymentInfo; diff --git a/packages/rs-sdk/src/platform/transition/vote.rs b/packages/rs-sdk/src/platform/transition/vote.rs index 3734e892f2e..8eead16480f 100644 --- a/packages/rs-sdk/src/platform/transition/vote.rs +++ b/packages/rs-sdk/src/platform/transition/vote.rs @@ -4,14 +4,15 @@ use crate::platform::transition::put_settings::PutSettings; use crate::platform::Fetch; use crate::{Error, Sdk}; use dpp::identifier::MasternodeIdentifiers; -use dpp::identity::hash::IdentityPublicKeyHashMethodsV0; +use dpp::identity::identity_public_key::hash::IdentityPublicKeyHashMethodsV0; use dpp::identity::signer::Signer; use dpp::identity::IdentityPublicKey; -use dpp::prelude::Identifier; -use dpp::state_transition::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::platform_value; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::methods::MasternodeVoteTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::voting::votes::resource_vote::accessors::v0::ResourceVoteGettersV0; use dpp::voting::votes::Vote; +use platform_value::Identifier; use rs_dapi_client::{DapiRequest, IntoInner}; use super::waitable::Waitable; diff --git a/packages/rs-sdk/src/platform/transition/waitable.rs b/packages/rs-sdk/src/platform/transition/waitable.rs index c17436776d7..4e81b2baa7d 100644 --- a/packages/rs-sdk/src/platform/transition/waitable.rs +++ b/packages/rs-sdk/src/platform/transition/waitable.rs @@ -5,13 +5,15 @@ use super::put_settings::PutSettings; use crate::platform::Fetch; use crate::Error; use crate::Sdk; +use dpp::data_contract::DataContract; use dpp::document::Document; -use dpp::prelude::{DataContract, Identifier, Identity}; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::identity::Identity; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; use dpp::state_transition::StateTransition; use dpp::state_transition::StateTransitionLike; use dpp::voting::votes::Vote; use dpp::ProtocolError; +use platform_value::Identifier; /// Waitable trait provides a wait to wait for a response of a state transition after it has been broadcast and /// receive altered objects. @@ -66,7 +68,7 @@ impl Waitable for Document { ), ))); }; - + println!("wait_for_response: {:?}", doc_id); let mut documents: BTreeMap> = state_transition.wait_for_response(sdk, settings).await?; diff --git a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs index d1c1bc0410f..37970cfccd5 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -8,10 +8,10 @@ use dpp::identity::{Identity, IdentityPublicKey}; use crate::platform::transition::broadcast::BroadcastStateTransition; use crate::platform::transition::put_settings::PutSettings; use crate::{Error, Sdk}; -use dpp::state_transition::identity_credit_withdrawal_transition::methods::{ +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::methods::{ IdentityCreditWithdrawalTransitionMethodsV0, PreferredKeyPurposeForSigningWithdrawal, }; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::state_transition::proof_result::StateTransitionProofResult; use dpp::withdrawal::Pooling; diff --git a/packages/rs-sdk/src/platform/types/identity.rs b/packages/rs-sdk/src/platform/types/identity.rs index 963dcaa45f9..29402627c1e 100644 --- a/packages/rs-sdk/src/platform/types/identity.rs +++ b/packages/rs-sdk/src/platform/types/identity.rs @@ -22,7 +22,7 @@ use dapi_grpc::platform::v0::{ GetIdentityByPublicKeyHashRequest, GetIdentityContractNonceRequest, GetIdentityNonceRequest, GetIdentityRequest, ResponseMetadata, }; -use dpp::prelude::Identity; +use dpp::identity::Identity; use rs_dapi_client::transport::TransportError; // Create enum [IdentityRequest] and [IdentityResponse] that will wrap all possible @@ -36,7 +36,7 @@ delegate_enum! { (GetIdentityByNonUniquePublicKeyHash, proto::GetIdentityByNonUniquePublicKeyHashRequest, proto::GetIdentityByNonUniquePublicKeyHashResponse) } -impl Query for dpp::prelude::Identifier { +impl Query for platform_value::Identifier { fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); @@ -56,6 +56,7 @@ impl Query for dpp::prelude::Identifier { /// You can use [`Fetch::fetch(PublicKeyHash)`](crate::platform::Fetch::fetch()) to fetch an identity /// by its public key hash. #[derive(Clone, Debug, PartialEq, Eq)] +#[cfg_attr(feature = "apple", ferment_macro::export)] pub struct PublicKeyHash(pub [u8; 20]); impl Query for PublicKeyHash { @@ -106,7 +107,7 @@ impl Query for NonUniquePublicKeyHashQuery { } } -impl Query for dpp::prelude::Identifier { +impl Query for platform_value::Identifier { fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); @@ -123,7 +124,7 @@ impl Query for dpp::prelude::Identifier { } } -impl Query for dpp::prelude::Identifier { +impl Query for platform_value::Identifier { fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); @@ -143,7 +144,7 @@ impl Query for dpp::prelude::Identifier { } impl Query - for (dpp::prelude::Identifier, dpp::prelude::Identifier) + for (platform_value::Identifier, platform_value::Identifier) { fn query(self, prove: bool) -> Result { if !prove { @@ -165,7 +166,7 @@ impl Query } } -impl Query for dpp::prelude::Identifier { +impl Query for platform_value::Identifier { fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); @@ -181,7 +182,7 @@ impl Query for dpp::prelude::Identifier { } } -impl Query for Vec { +impl Query for Vec { fn query(self, prove: bool) -> Result { if !prove { unimplemented!("queries without proofs are not supported yet"); diff --git a/packages/rs-sdk/src/sdk.rs b/packages/rs-sdk/src/sdk.rs index 849e62d8e04..532a7caffd4 100644 --- a/packages/rs-sdk/src/sdk.rs +++ b/packages/rs-sdk/src/sdk.rs @@ -95,6 +95,7 @@ pub type LastQueryTimestamp = u64; /// ## Examples /// /// See tests/ for examples of using the SDK. +#[ferment_macro::opaque] pub struct Sdk { /// The network that the sdk is configured for (Dash (mainnet), Testnet, Devnet, Regtest) pub network: Network, @@ -205,6 +206,13 @@ enum SdkInstance { } impl Sdk { + pub fn maybe_dapi_client(&self) -> Option<&DapiClient> { + match &self.inner { + SdkInstance::Dapi { dapi, .. } => Some(dapi), + #[cfg(feature = "mocks")] + SdkInstance::Mock { .. } => None, + } + } /// Initialize Dash Platform SDK in mock mode. /// /// This is a helper method that uses [`SdkBuilder`] to initialize the SDK in mock mode. diff --git a/packages/rs-sdk/tests/fetch/common.rs b/packages/rs-sdk/tests/fetch/common.rs index bba48e12f61..85b071e5b4b 100644 --- a/packages/rs-sdk/tests/fetch/common.rs +++ b/packages/rs-sdk/tests/fetch/common.rs @@ -1,6 +1,8 @@ use dash_sdk::{mock::Mockable, platform::Query, Sdk}; use dpp::data_contract::config::DataContractConfig; -use dpp::{data_contract::DataContractFactory, prelude::Identifier}; +use dpp::data_contract::DataContractFactory; +use platform_value::Identifier; +use platform_version::PlatformVersion; use hex::ToHex; use rs_dapi_client::transport::TransportRequest; use std::collections::BTreeMap; @@ -52,11 +54,10 @@ pub fn mock_document_type() -> dpp::data_contract::document_type::DocumentType { /// Create a mock data contract for testing of mock API pub fn mock_data_contract( document_type: Option<&dpp::data_contract::document_type::DocumentType>, -) -> dpp::prelude::DataContract { +) -> dpp::data_contract::DataContract { use dpp::{ data_contract::document_type::accessors::DocumentTypeV0Getters, platform_value::{platform_value, Value}, - version::PlatformVersion, }; use std::collections::BTreeMap; diff --git a/packages/rs-sdk/tests/fetch/config.rs b/packages/rs-sdk/tests/fetch/config.rs index 5d8d7f73f01..7986f30d3ea 100644 --- a/packages/rs-sdk/tests/fetch/config.rs +++ b/packages/rs-sdk/tests/fetch/config.rs @@ -4,10 +4,8 @@ //! It's mainly used for testing. use crate::fetch::generated_data::*; -use dpp::{ - dashcore::{hashes::Hash, ProTxHash}, - prelude::Identifier, -}; +use dpp::dashcore::{hashes::Hash, ProTxHash}; +use platform_value::Identifier; use rs_dapi_client::{Address, AddressList}; use serde::Deserialize; use std::path::PathBuf; diff --git a/packages/rs-sdk/tests/fetch/data_contract.rs b/packages/rs-sdk/tests/fetch/data_contract.rs index b6d47cdd5f0..54c97b210a9 100644 --- a/packages/rs-sdk/tests/fetch/data_contract.rs +++ b/packages/rs-sdk/tests/fetch/data_contract.rs @@ -1,8 +1,7 @@ use super::config::Config; -use dash_sdk::platform::{Fetch, FetchMany, LimitQuery}; -use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dash_sdk::platform::{Fetch, FetchMany, Identifier, LimitQuery}; +use dpp::data_contract::{accessors::v0::DataContractV0Getters, DataContract}; use dpp::platform_value::string_encoding::Encoding; -use dpp::prelude::{DataContract, Identifier}; use drive_proof_verifier::types::DataContractHistory; /// Given some dummy data contract ID, when I fetch data contract, I get None because it doesn't exist. diff --git a/packages/rs-sdk/tests/fetch/document.rs b/packages/rs-sdk/tests/fetch/document.rs index df3b3da576f..f76db11a036 100644 --- a/packages/rs-sdk/tests/fetch/document.rs +++ b/packages/rs-sdk/tests/fetch/document.rs @@ -3,11 +3,10 @@ use std::sync::Arc; use super::{common::setup_logs, config::Config}; -use dash_sdk::platform::{DocumentQuery, Fetch, FetchMany}; -use dpp::data_contract::accessors::v0::DataContractV0Getters; +use dash_sdk::platform::{DocumentQuery, Fetch, FetchMany, Identifier}; +use dpp::data_contract::{accessors::v0::DataContractV0Getters, DataContract}; use dpp::document::{Document, DocumentV0Getters}; use dpp::platform_value::string_encoding::Encoding; -use dpp::prelude::{DataContract, Identifier}; use drive::query::{DriveDocumentQuery, OrderClause, WhereClause}; /// Given some data contract ID, document type and document ID, when I fetch it, then I get it. diff --git a/packages/rs-sdk/tests/fetch/identity.rs b/packages/rs-sdk/tests/fetch/identity.rs index dd564623f4a..edcb1c05a23 100644 --- a/packages/rs-sdk/tests/fetch/identity.rs +++ b/packages/rs-sdk/tests/fetch/identity.rs @@ -1,13 +1,15 @@ use dash_sdk::platform::types::identity::{NonUniquePublicKeyHashQuery, PublicKeyHash}; use dash_sdk::platform::{Fetch, FetchMany}; use dpp::identity::accessors::IdentityGettersV0; -use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::prelude::IdentityPublicKey; -use dpp::{identity::hash::IdentityPublicKeyHashMethodsV0, prelude::Identity}; +use dpp::identity::{ + identity_public_key::{ + accessors::v0::IdentityPublicKeyGettersV0, methods::hash::IdentityPublicKeyHashMethodsV0, + IdentityPublicKey, + }, + Identity, +}; use drive_proof_verifier::types::{IdentityBalance, IdentityBalanceAndRevision}; -use super::{common::setup_logs, config::Config}; - /// Given some existing identity ID, when I fetch the identity, and I get it. #[tokio::test(flavor = "multi_thread", worker_threads = 1)] async fn test_identity_read() { @@ -15,7 +17,7 @@ async fn test_identity_read() { use dpp::identity::accessors::IdentityGettersV0; let cfg = Config::new(); - let id: dpp::prelude::Identifier = cfg.existing_identity_id; + let id = cfg.existing_identity_id; let sdk = cfg.setup_api("test_identity_read").await; @@ -61,7 +63,7 @@ async fn test_identity_balance_read() { setup_logs(); let cfg = Config::new(); - let id: dpp::prelude::Identifier = cfg.existing_identity_id; + let id = cfg.existing_identity_id; let sdk = cfg.setup_api("test_identity_balance_read").await; @@ -79,7 +81,7 @@ async fn test_identity_balance_revision_read() { setup_logs(); let cfg = Config::new(); - let id: dpp::prelude::Identifier = cfg.existing_identity_id; + let id = cfg.existing_identity_id; let sdk = cfg.setup_api("test_identity_balance_revision_read").await; @@ -97,7 +99,7 @@ async fn test_identity_public_keys_all_read() { setup_logs(); let cfg = Config::new(); - let id: dpp::prelude::Identifier = cfg.existing_identity_id; + let id = cfg.existing_identity_id; let sdk = cfg.setup_api("test_identity_public_keys_all_read").await; diff --git a/packages/rs-sdk/tests/fetch/identity_contract_nonce.rs b/packages/rs-sdk/tests/fetch/identity_contract_nonce.rs index 26978a733f8..08f24d717c0 100644 --- a/packages/rs-sdk/tests/fetch/identity_contract_nonce.rs +++ b/packages/rs-sdk/tests/fetch/identity_contract_nonce.rs @@ -1,5 +1,4 @@ -use dash_sdk::platform::Fetch; -use dpp::prelude::Identifier; +use dash_sdk::platform::{Fetch, Identifier}; use drive_proof_verifier::types::IdentityContractNonceFetcher; use super::{common::setup_logs, config::Config}; @@ -10,9 +9,9 @@ async fn test_identity_contract_no_nonce_read() { setup_logs(); let cfg = Config::new(); - let identity_id: dpp::prelude::Identifier = cfg.existing_identity_id; + let identity_id = cfg.existing_identity_id; // We are putting a contract id that does not exist, hence we will never get a nonce - let contract_id: dpp::prelude::Identifier = Identifier::from_bytes(&[5u8; 32]).unwrap(); + let contract_id = Identifier::from_bytes(&[5u8; 32]).unwrap(); let sdk = cfg.setup_api("test_identity_contract_no_nonce_read").await; diff --git a/packages/rs-sdk/tests/fetch/mock_fetch.rs b/packages/rs-sdk/tests/fetch/mock_fetch.rs index 1b96614ecd4..2b6061eb6b0 100644 --- a/packages/rs-sdk/tests/fetch/mock_fetch.rs +++ b/packages/rs-sdk/tests/fetch/mock_fetch.rs @@ -11,10 +11,11 @@ use dpp::{ document_type::{ accessors::DocumentTypeV0Getters, random_document::CreateRandomDocument, DocumentType, }, + DataContract, }, document::Document, - identity::{accessors::IdentityGettersV0, IdentityV0}, - prelude::{DataContract, Identifier, Identity}, + identity::{accessors::IdentityGettersV0, v0::IdentityV0, Identity}, + platform_value::Identifier, version::PlatformVersion, }; diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index d08229053a3..df542f513a0 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.39.6" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", branch = "feat/ferment" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } diff --git a/packages/simple-signer/src/signer.rs b/packages/simple-signer/src/signer.rs index 125e9bcdb80..abed3534bcb 100644 --- a/packages/simple-signer/src/signer.rs +++ b/packages/simple-signer/src/signer.rs @@ -9,7 +9,7 @@ use dpp::identity::signer::Signer; use dpp::identity::{IdentityPublicKey, KeyType}; use dpp::platform_value::BinaryData; use dpp::state_transition::errors::InvalidIdentityPublicKeyTypeError; -use dpp::{bls_signatures, ed25519_dalek, ProtocolError}; +use dpp::{bls_signatures, ed25519_dalek, errors::ProtocolError}; use std::collections::BTreeMap; use std::fmt::{Debug, Formatter}; diff --git a/packages/strategy-tests/src/lib.rs b/packages/strategy-tests/src/lib.rs index 32c2dc97543..e5402ee7f9d 100644 --- a/packages/strategy-tests/src/lib.rs +++ b/packages/strategy-tests/src/lib.rs @@ -25,14 +25,17 @@ use dpp::data_contract::{DataContract, DataContractFactory}; use dpp::document::{Document, DocumentV0Getters}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; -use dpp::identity::{Identity, KeyID, KeyType, PartialIdentity, Purpose, SecurityLevel}; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + Identity, KeyID, KeyType, PartialIdentity, +}; use dpp::platform_value::string_encoding::Encoding; use dpp::serialization::{ PlatformDeserializableWithPotentialValidationFromVersionedStructure, PlatformSerializableWithPlatformVersion, }; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::state_transition::StateTransition; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{IdentityKeysRequest, KeyRequestType}; @@ -45,19 +48,19 @@ use dpp::fee::Credits; use dpp::identifier::Identifier; use dpp::identity::accessors::IdentityGettersV0; use dpp::platform_value::{BinaryData, Bytes32, Value}; -use dpp::state_transition::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; -use dpp::state_transition::batch_transition::batched_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_delete_transition::DocumentDeleteTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_replace_transition::DocumentReplaceTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::DocumentTransferTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::{ DocumentDeleteTransition, DocumentReplaceTransition, DocumentTransferTransition, }; -use dpp::state_transition::batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; -use dpp::state_transition::batch_transition::document_create_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_base_transition::v0::DocumentBaseTransitionV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_create_transition::{ DocumentCreateTransition, DocumentCreateTransitionV0, }; -use dpp::state_transition::batch_transition::{BatchTransition, BatchTransitionV0}; -use dpp::state_transition::data_contract_create_transition::methods::v0::DataContractCreateTransitionMethodsV0; -use dpp::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; +use dpp::state_transition::state_transitions::document::batch_transition::{BatchTransition, BatchTransitionV0}; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::methods::v0::DataContractCreateTransitionMethodsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; use dpp::ProtocolError::{PlatformDeserializationError, PlatformSerializationError}; use dpp::{dash_to_duffs, ProtocolError}; use operations::{DataContractUpdateAction, DataContractUpdateOp}; @@ -1621,7 +1624,7 @@ impl Strategy { } // Add identities_inserts - // Don't do this on first two blocks (per design but also we need to skip utxo refresh) + // Don't do this on first two blocks (per design, but also we need to skip utxo refresh) if block_info.height > config.start_block_height + 1 { let frequency = &self.identity_inserts.frequency; if frequency.check_hit(rng) { diff --git a/packages/strategy-tests/src/transitions.rs b/packages/strategy-tests/src/transitions.rs index ef647e48305..10cc05e64cc 100644 --- a/packages/strategy-tests/src/transitions.rs +++ b/packages/strategy-tests/src/transitions.rs @@ -11,22 +11,24 @@ use dpp::identity::core_script::CoreScript; use dpp::identity::identity_public_key::accessors::v0::{ IdentityPublicKeyGettersV0, IdentityPublicKeySettersV0, }; -use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; +use dpp::identity::identity_public_key::Purpose::{AUTHENTICATION, TRANSFER}; +use dpp::identity::identity_public_key::SecurityLevel::{CRITICAL, MASTER}; +use dpp::identity::state_transition::asset_lock_proof::{AssetLockProof, InstantAssetLockProof}; use dpp::identity::KeyType::ECDSA_SECP256K1; -use dpp::identity::Purpose::{AUTHENTICATION, TRANSFER}; -use dpp::identity::SecurityLevel::{CRITICAL, MASTER}; -use dpp::identity::{Identity, IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; -use dpp::prelude::AssetLockProof; -use dpp::state_transition::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; -use dpp::state_transition::identity_create_transition::IdentityCreateTransition; -use dpp::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; +use dpp::identity::{ + identity_public_key::{Purpose, SecurityLevel}, + Identity, IdentityPublicKey, KeyID, KeyType, +}; +use dpp::state_transition::state_transitions::identity::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use dpp::ProtocolError; use dpp::native_bls::NativeBlsModule; -use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; -use dpp::state_transition::identity_update_transition::methods::IdentityUpdateTransitionMethodsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_update_transition::methods::IdentityUpdateTransitionMethodsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; use dpp::state_transition::{GetDataContractSecurityLevelRequirementFn, StateTransition}; use dpp::version::PlatformVersion; use dpp::withdrawal::Pooling; @@ -37,8 +39,8 @@ use crate::operations::AmountRange; use crate::KeyMaps; use dpp::dashcore::transaction::special_transaction::asset_lock::AssetLockPayload; use dpp::dashcore::transaction::special_transaction::TransactionPayload; -use dpp::state_transition::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; -use dpp::state_transition::identity_credit_withdrawal_transition::MIN_CORE_FEE_PER_BYTE; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::v1::IdentityCreditWithdrawalTransitionV1; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::MIN_CORE_FEE_PER_BYTE; use rand::Rng; use std::collections::{BTreeMap, HashSet}; use std::str::FromStr; diff --git a/packages/token-history-contract/Cargo.toml b/packages/token-history-contract/Cargo.toml index e054d49ff02..68262ff03cd 100644 --- a/packages/token-history-contract/Cargo.toml +++ b/packages/token-history-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/wallet-utils-contract/Cargo.toml b/packages/wallet-utils-contract/Cargo.toml index 2d80da15c96..897199ded00 100644 --- a/packages/wallet-utils-contract/Cargo.toml +++ b/packages/wallet-utils-contract/Cargo.toml @@ -10,4 +10,4 @@ license = "MIT" thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } -platform-value = { path = "../rs-platform-value" } +platform-value = { path = "../rs-platform-value" } \ No newline at end of file diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml index 64edd06ec49..0f4a353f8cc 100644 --- a/packages/wasm-dpp/Cargo.toml +++ b/packages/wasm-dpp/Cargo.toml @@ -45,6 +45,7 @@ dpp = { path = "../rs-dpp", default-features = false, features = [ "document-json-conversion", "system_contracts", ] } +platform-version = { path = "../rs-platform-version" } itertools = { version = "0.13" } log = { version = "0.4.6" } wasm-logger = { version = "0.2.0" } diff --git a/packages/wasm-dpp/src/dash_platform_protocol.rs b/packages/wasm-dpp/src/dash_platform_protocol.rs index ba7d920d579..336046a95aa 100644 --- a/packages/wasm-dpp/src/dash_platform_protocol.rs +++ b/packages/wasm-dpp/src/dash_platform_protocol.rs @@ -7,7 +7,7 @@ use crate::document_facade::DocumentFacadeWasm; use dpp::dash_platform_protocol::DashPlatformProtocol; use dpp::data_contract::DataContractFacade; -use dpp::version::LATEST_VERSION; +use platform_version::version::LATEST_VERSION; use crate::entropy_generator::ExternalEntropyGenerator; use crate::identity::identity_facade::IdentityFacadeWasm; diff --git a/packages/wasm-dpp/src/data_contract/errors/invalid_data_contract.rs b/packages/wasm-dpp/src/data_contract/errors/invalid_data_contract.rs index 2d5326188a3..eb36fe7b75c 100644 --- a/packages/wasm-dpp/src/data_contract/errors/invalid_data_contract.rs +++ b/packages/wasm-dpp/src/data_contract/errors/invalid_data_contract.rs @@ -1,5 +1,5 @@ use crate::errors::consensus::consensus_error::from_consensus_error_ref; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=InvalidDataContractError)] diff --git a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/mod.rs b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/mod.rs index 81a69a1da6b..83f2286f205 100644 --- a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/mod.rs +++ b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/mod.rs @@ -8,13 +8,13 @@ use dpp::errors::consensus::signature::SignatureError; use dpp::errors::consensus::ConsensusError; use dpp::serialization::{PlatformDeserializable, PlatformSerializable}; -use dpp::state_transition::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; -use dpp::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::accessors::DataContractCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::state_transition::{StateTransition, StateTransitionValueConvert}; use dpp::version::PlatformVersion; -use dpp::{state_transition::StateTransitionLike, ProtocolError}; +use dpp::{errors::ProtocolError, state_transition::StateTransitionLike}; use serde::Serialize; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/validation.rs b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/validation.rs index 80760fc4d76..7407ae998a4 100644 --- a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/validation.rs +++ b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_create_transition/validation.rs @@ -1,11 +1,11 @@ use std::sync::Arc; -use dpp::data_contract::state_transition::data_contract_create_transition::DataContractCreateTransition; +use dpp::data_contract::state_transition::state_transitions::contract::data_contract_create_transition::DataContractCreateTransition; -use dpp::consensus::basic::value_error::ValueError; +use dpp::errors::consensus::basic::value_error::ValueError; use dpp::validation::SimpleConsensusValidationResult; use dpp::{ - data_contract::state_transition::data_contract_create_transition::validation::state::{ + data_contract::state_transition::state_transitions::contract::data_contract_create_transition::validation::state::{ validate_data_contract_create_transition_basic::DataContractCreateTransitionBasicValidator, validate_data_contract_create_transition_state::validate_data_contract_create_transition_state as dpp_validate_data_contract_create_transition_state, }, diff --git a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs index 1645e2c7a3c..78f3a3dfff5 100644 --- a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs +++ b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs @@ -2,15 +2,15 @@ // pub use validation::*; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::serialization::{PlatformDeserializable, PlatformSerializable}; -use dpp::state_transition::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; -use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::accessors::DataContractUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::state_transition::{StateTransition, StateTransitionValueConvert}; use dpp::version::PlatformVersion; use dpp::{ - consensus::signature::SignatureError, state_transition::StateTransitionLike, ProtocolError, + errors::consensus::signature::SignatureError, state_transition::StateTransitionLike, ProtocolError, }; use serde::Serialize; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/validation.rs b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/validation.rs index dd5ffbfc1ee..9a1cf7b6189 100644 --- a/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/validation.rs +++ b/packages/wasm-dpp/src/data_contract/state_transition/data_contract_update_transition/validation.rs @@ -1,11 +1,11 @@ use std::{collections::BTreeMap, sync::Arc}; -use dpp::data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::data_contract::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; -use dpp::consensus::basic::value_error::ValueError; +use dpp::errors::consensus::basic::value_error::ValueError; use dpp::validation::{AsyncDataValidatorWithContext, SimpleConsensusValidationResult}; use dpp::{ - data_contract::state_transition::data_contract_update_transition::validation::{ + data_contract::state_transition::state_transitions::contract::data_contract_update_transition::validation::{ basic::{ validate_indices_are_backward_compatible as dpp_validate_indices_are_backward_compatible, DataContractUpdateTransitionBasicValidator, @@ -19,7 +19,7 @@ use wasm_bindgen::prelude::*; use crate::utils::WithJsError; use crate::{ - data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransitionParameters, + data_contract::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransitionParameters, errors::protocol_error::from_protocol_error, state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper}, validation::ValidationResultWasm, diff --git a/packages/wasm-dpp/src/data_contract_factory/factory.rs b/packages/wasm-dpp/src/data_contract_factory/factory.rs index d8b183ae9cb..73fa93787b4 100644 --- a/packages/wasm-dpp/src/data_contract_factory/factory.rs +++ b/packages/wasm-dpp/src/data_contract_factory/factory.rs @@ -1,11 +1,11 @@ use std::convert::TryFrom; +use crate::utils::{ToSerdeJSONExt, WithJsError}; use dpp::data_contract::created_data_contract::CreatedDataContract; -use dpp::{data_contract::DataContractFactory, platform_value, prelude::Identifier, ProtocolError}; +use dpp::identifier::Identifier; +use dpp::{data_contract::DataContractFactory, errors::ProtocolError, platform_value}; use wasm_bindgen::prelude::*; -use crate::utils::{ToSerdeJSONExt, WithJsError}; - use crate::data_contract::{DataContractCreateTransitionWasm, DataContractWasm}; use crate::{errors::protocol_error::from_protocol_error, with_js_error}; diff --git a/packages/wasm-dpp/src/data_trigger/execute_data_triggers_factory.rs b/packages/wasm-dpp/src/data_trigger/execute_data_triggers_factory.rs index fa6a6d9377b..b1b89420523 100644 --- a/packages/wasm-dpp/src/data_trigger/execute_data_triggers_factory.rs +++ b/packages/wasm-dpp/src/data_trigger/execute_data_triggers_factory.rs @@ -5,7 +5,7 @@ use js_sys::Array; use wasm_bindgen::prelude::*; use crate::{ - document_batch_transition::document_transition::DocumentTransitionWasm, + document_batch_transition::batched_transition::DocumentTransitionWasm, state_repository::ExternalStateRepositoryLikeWrapper, utils::{Inner, IntoWasm, WithJsError}, DataTriggerWasm, diff --git a/packages/wasm-dpp/src/document/errors/document_already_exists_error.rs b/packages/wasm-dpp/src/document/errors/document_already_exists_error.rs index a4b028f7263..7faf908a041 100644 --- a/packages/wasm-dpp/src/document/errors/document_already_exists_error.rs +++ b/packages/wasm-dpp/src/document/errors/document_already_exists_error.rs @@ -1,5 +1,5 @@ -// use crate::document::state_transition::document_batch_transition::document_transition::from_document_transition_to_js_value; -use dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition; +// use crate::document::state_transition::document_batch_transition::batched_transition::from_document_transition_to_js_value; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentTransition; use thiserror::Error; use super::*; diff --git a/packages/wasm-dpp/src/document/errors/document_not_provided_error.rs b/packages/wasm-dpp/src/document/errors/document_not_provided_error.rs index bc520332441..8edf5720608 100644 --- a/packages/wasm-dpp/src/document/errors/document_not_provided_error.rs +++ b/packages/wasm-dpp/src/document/errors/document_not_provided_error.rs @@ -1,5 +1,5 @@ -// use crate::document::state_transition::document_batch_transition::document_transition::from_document_transition_to_js_value; -use dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition; +// use crate::document::state_transition::document_batch_transition::batched_transition::from_document_transition_to_js_value; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::DocumentTransition; use thiserror::Error; use super::*; diff --git a/packages/wasm-dpp/src/document/errors/invalid_document_action_error.rs b/packages/wasm-dpp/src/document/errors/invalid_document_action_error.rs index 78eb5d5d05b..3d530de9021 100644 --- a/packages/wasm-dpp/src/document/errors/invalid_document_action_error.rs +++ b/packages/wasm-dpp/src/document/errors/invalid_document_action_error.rs @@ -1,9 +1,9 @@ -// use crate::document::state_transition::document_batch_transition::document_transition::from_document_transition_to_js_value; -use dpp::state_transition::batch_transition::batched_transition::document_transition::DocumentTransition; -use thiserror::Error; - +// use crate::document::state_transition::document_batch_transition::batched_transition::from_document_transition_to_js_value; use super::*; -use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionTypeGetter; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::{ + action_type::TransitionActionTypeGetter, DocumentTransition, +}; +use thiserror::Error; #[wasm_bindgen] #[derive(Error, Debug)] diff --git a/packages/wasm-dpp/src/document/extended_document.rs b/packages/wasm-dpp/src/document/extended_document.rs index 4ea38c9923a..45ef587e0a4 100644 --- a/packages/wasm-dpp/src/document/extended_document.rs +++ b/packages/wasm-dpp/src/document/extended_document.rs @@ -1,10 +1,11 @@ use dpp::document::{ DocumentV0Getters, DocumentV0Setters, ExtendedDocument, EXTENDED_DOCUMENT_IDENTIFIER_FIELDS, }; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; +use dpp::identifier::Identifier; use dpp::platform_value::{Bytes32, Value}; -use dpp::prelude::{Identifier, Revision, TimestampMillis}; +use dpp::prelude::{Revision, TimestampMillis}; use dpp::util::json_value::JsonValueExt; @@ -175,7 +176,7 @@ impl ExtendedDocumentWasm { #[wasm_bindgen(js_name=getData)] pub fn get_data(&mut self) -> Result { - let json_value: JsonValue = self + let json_value: serde_json::Value = self .0 .document() .properties() diff --git a/packages/wasm-dpp/src/document/factory.rs b/packages/wasm-dpp/src/document/factory.rs index 4d954c4287f..95ca763f379 100644 --- a/packages/wasm-dpp/src/document/factory.rs +++ b/packages/wasm-dpp/src/document/factory.rs @@ -21,7 +21,7 @@ use crate::{ DataContractWasm, ExtendedDocumentWasm, }; use dpp::identifier::Identifier; -use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionType; use dpp::tokens::token_payment_info::TokenPaymentInfo; use dpp::version::PlatformVersion; use std::convert::TryFrom; diff --git a/packages/wasm-dpp/src/document/mod.rs b/packages/wasm-dpp/src/document/mod.rs index 78da69239fc..3ccc5fbbb52 100644 --- a/packages/wasm-dpp/src/document/mod.rs +++ b/packages/wasm-dpp/src/document/mod.rs @@ -1,5 +1,3 @@ -use dpp::prelude::Identifier; - use anyhow::anyhow; use serde::{Deserialize, Serialize}; use std::convert::TryInto; @@ -35,13 +33,14 @@ use dpp::identity::TimestampMillis; use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter; use dpp::platform_value::ReplacementType; use dpp::platform_value::Value; -use dpp::{platform_value, ProtocolError}; +use dpp::{errors::ProtocolError, platform_value}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::document::serialization_traits::DocumentPlatformValueMethodsV0; +use dpp::identifier::Identifier; use dpp::version::PlatformVersion; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; #[derive(Serialize, Deserialize, Debug, Clone, Copy, Default)] #[serde(rename_all = "camelCase")] @@ -149,7 +148,7 @@ impl DocumentWasm { #[wasm_bindgen(js_name=getData)] pub fn get_data(&mut self) -> Result { - let json_value: JsonValue = self + let json_value: serde_json::Value = self .0 .properties() .to_json_value() @@ -188,7 +187,7 @@ impl DocumentWasm { return Ok(id.into()); } _ => { - let json_value_result: Result = + let json_value_result: Result = value.clone().try_into().map_err(ProtocolError::ValueError); let json_value = json_value_result.with_js_error()?; let serializer = serde_wasm_bindgen::Serializer::json_compatible(); diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/batched_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/batched_transition/mod.rs index d83ae4d4735..2a18f5a84db 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/batched_transition/mod.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/batched_transition/mod.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::batch_transition::batched_transition::BatchedTransition; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=BatchedTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_create_transition.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_create_transition.rs index 1afe02d94d9..788df9fbec1 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_create_transition.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_create_transition.rs @@ -1,13 +1,13 @@ use dpp::prelude::Revision; -use dpp::state_transition::batch_transition::document_create_transition::DocumentCreateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::DocumentCreateTransition; use dpp::document::INITIAL_REVISION; use wasm_bindgen::prelude::*; -use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; -use dpp::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors; +use dpp::state_transition::state_transitions::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; #[wasm_bindgen(js_name=DocumentCreateTransition)] #[derive(Debug, Clone)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_delete_transition.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_delete_transition.rs index 451de27743f..b8858480b7e 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_delete_transition.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_delete_transition.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::batch_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::{ document_delete_transition, DocumentDeleteTransition, }; @@ -7,12 +7,12 @@ use wasm_bindgen::prelude::*; use crate::{ data_contract::DataContractWasm, - document::document_batch_transition::document_transition::to_object, + document::document_batch_transition::batched_transition::to_object, identifier::IdentifierWrapper, utils::WithJsError, }; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::document_delete_transition::v0::v0_methods::DocumentDeleteTransitionV0Methods; -use dpp::state_transition::batch_transition::document_transition::action_type::DocumentTransitionActionType; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_delete_transition::v0::v0_methods::DocumentDeleteTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::action_type::DocumentTransitionActionType; #[wasm_bindgen(js_name=DocumentDeleteTransition)] #[derive(Debug, Clone)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_replace_transition.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_replace_transition.rs index 8b354ffeb32..ba0691dec0c 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_replace_transition.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/document_replace_transition.rs @@ -1,7 +1,7 @@ use std::convert; use std::convert::TryInto; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; @@ -10,11 +10,11 @@ use dpp::platform_value::btreemap_extensions::{ }; use dpp::platform_value::ReplacementType; use dpp::prelude::Revision; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; -use dpp::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; use dpp::{ prelude::{DataContract, Identifier}, - state_transition::documents_batch_transition::{ + state_transition::state_transitions::document::documents_batch_transition::{ document_replace_transition, DocumentReplaceTransition, }, util::json_schema::JsonSchemaExt, @@ -25,13 +25,13 @@ use wasm_bindgen::prelude::*; use crate::{ buffer::Buffer, - document::state_transition::document_batch_transition::document_transition::to_object, + document::state_transition::document_batch_transition::batched_transition::to_object, identifier::IdentifierWrapper, lodash::lodash_set, utils::{ToSerdeJSONExt, WithJsError}, BinaryType, DataContractWasm, }; -use dpp::state_transition::batch_transition::document_transition::action_type::DocumentTransitionActionType; +use dpp::state_transition::state_transitions::document::documents_batch_transition::batched_transition::action_type::DocumentTransitionActionType; #[wasm_bindgen(js_name=DocumentReplaceTransition)] #[derive(Debug, Clone)] @@ -253,7 +253,7 @@ impl DocumentReplaceTransitionWasm { } } - let json_value: JsonValue = value + let json_value: serde_json::Value = value .clone() .try_into() .map_err(ProtocolError::ValueError) diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/mod.rs index dee9cb76b95..4a5e684d7f8 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/mod.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/mod.rs @@ -7,23 +7,23 @@ mod document_create_transition; // pub use document_replace_transition::*; use dpp::platform_value::Value; -use dpp::state_transition::batch_transition::batched_transition::document_transition::{ - DocumentTransition, DocumentTransitionV0Methods, -}; -use dpp::state_transition::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionTypeGetter; -use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::document::documents_batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; +use dpp::state_transition::state_transitions::document::documents_batch_transition::batched_transition::action_type::TransitionActionTypeGetter; +use dpp::state_transition::state_transitions::document::documents_batch_transition::batched_transition::{DocumentTransition, DocumentTransitionV0Methods}; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transition_action_type::DocumentTransitionActionTypeGetter; +use dpp::state_transition::state_transitions::document::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods; use dpp::{util::json_value::JsonValueExt, ProtocolError}; use serde::Serialize; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use wasm_bindgen::prelude::*; use dpp::fee::Credits; use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter; use dpp::prelude::Revision; -use dpp::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; -use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::{ buffer::Buffer, identifier::{identifier_from_js_value, IdentifierWrapper}, @@ -218,7 +218,7 @@ pub(crate) fn to_object<'a>( identifiers_paths: impl IntoIterator, binary_paths: impl IntoIterator, ) -> Result { - let mut value: JsonValue = value + let mut value: serde_json::Value = value .try_into_validating_json() .map_err(ProtocolError::ValueError) .with_js_error()?; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/mod.rs index 9cf0ab4bcd2..904d78310e3 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/mod.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/mod.rs @@ -1,19 +1,18 @@ -use dpp::identity::{KeyID, Purpose}; +use dpp::identity::identity_public_key::{KeyID, Purpose}; use dpp::{ - prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, ProtocolError, }; use js_sys::Array; use serde::{Deserialize, Serialize}; -use dpp::consensus::signature::SignatureError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::signature::SignatureError; +use dpp::errors::consensus::ConsensusError; use dpp::platform_value::BinaryData; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; -use dpp::state_transition::batch_transition::BatchTransition; +use dpp::state_transition::state_transitions::document::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; +use dpp::state_transition::state_transitions::document::batch_transition::BatchTransition; use dpp::state_transition::StateTransition; use wasm_bindgen::prelude::*; @@ -25,8 +24,8 @@ use crate::{ IdentityPublicKeyWasm, }; -use dpp::state_transition::batch_transition::batched_transition::BatchedTransition; -use dpp::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::BatchedTransition; +use dpp::state_transition::state_transitions::document::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use crate::batch_transition::batched_transition::BatchedTransitionWasm; use crate::batch_transition::document_transition::DocumentTransitionWasm; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs index d3b31f9f889..6336b95f597 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/burn.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::batch_transition::TokenBurnTransition; +use dpp::state_transition::state_transitions::document::batch_transition::TokenBurnTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenBurnTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs index 10712d3cd8a..e08810bacac 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/config.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::batch_transition::TokenConfigUpdateTransition; +use dpp::state_transition::state_transitions::document::batch_transition::TokenConfigUpdateTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenConfigUpdateTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs index a62a4e99f83..60e30f668ee 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/destroy.rs @@ -1,7 +1,7 @@ use crate::identifier::IdentifierWrapper; use wasm_bindgen::prelude::wasm_bindgen; -use dpp::state_transition::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; -use dpp::state_transition::batch_transition::TokenDestroyFrozenFundsTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_destroy_frozen_funds_transition::v0::v0_methods::TokenDestroyFrozenFundsTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::TokenDestroyFrozenFundsTransition; #[wasm_bindgen(js_name=TokenDestroyFrozenFundsTransition)] #[derive(Debug, Clone)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs index ba704f005af..c02555b4c11 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/emergency_action.rs @@ -1,4 +1,4 @@ -use dpp::state_transition::batch_transition::TokenEmergencyActionTransition; +use dpp::state_transition::state_transitions::document::batch_transition::TokenEmergencyActionTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenEmergencyActionTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs index 1a9f921e52e..91f982f247a 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/freeze.rs @@ -1,6 +1,6 @@ use crate::identifier::IdentifierWrapper; -use dpp::state_transition::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; -use dpp::state_transition::batch_transition::TokenFreezeTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_freeze_transition::v0::v0_methods::TokenFreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::TokenFreezeTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenFreezeTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs index a9b9a1ad1c4..83d27da1787 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mint.rs @@ -1,8 +1,8 @@ use crate::identifier::IdentifierWrapper; use crate::tokens::TokenConfigurationWasm; use crate::utils::WithJsError; -use dpp::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; -use dpp::state_transition::batch_transition::TokenMintTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::TokenMintTransition; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::JsValue; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs index 16659a63dde..d3a5e050368 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/mod.rs @@ -23,10 +23,10 @@ use crate::batch_transition::token_transition::transfer::TokenTransferTransition use crate::batch_transition::token_transition::unfreeze::TokenUnfreezeTransitionWasm; use crate::identifier::IdentifierWrapper; use dpp::prelude::IdentityNonce; -use dpp::state_transition::batch_transition::batched_transition::token_transition::{ +use dpp::state_transition::state_transitions::document::batch_transition::batched_transition::token_transition::{ TokenTransition, TokenTransitionV0Methods, }; -use dpp::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods; use js_sys::Number; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::JsValue; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs index b80407bda6b..76801a0eb91 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/transfer.rs @@ -1,6 +1,6 @@ use crate::identifier::IdentifierWrapper; -use dpp::state_transition::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; -use dpp::state_transition::batch_transition::TokenTransferTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_transfer_transition::v0::v0_methods::TokenTransferTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::TokenTransferTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenTransferTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs index f0e073dd819..454305db27e 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/token_transition/unfreeze.rs @@ -1,6 +1,6 @@ use crate::identifier::IdentifierWrapper; -use dpp::state_transition::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; -use dpp::state_transition::batch_transition::TokenUnfreezeTransition; +use dpp::state_transition::state_transitions::document::batch_transition::token_unfreeze_transition::v0::v0_methods::TokenUnfreezeTransitionV0Methods; +use dpp::state_transition::state_transitions::document::batch_transition::TokenUnfreezeTransition; use wasm_bindgen::prelude::wasm_bindgen; #[wasm_bindgen(js_name=TokenUnfreezeTransition)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_id.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_id.rs index 1ea0d0b0a39..c90f5c4bc17 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_id.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_id.rs @@ -8,7 +8,7 @@ use js_sys::Array; use dpp::ProtocolError; use wasm_bindgen::prelude::*; -use crate::document_batch_transition::document_transition::to_object; +use crate::document_batch_transition::batched_transition::to_object; use crate::utils::{ToSerdeJSONExt, WithJsError}; #[wasm_bindgen(js_name=findDuplicatesById)] diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_indices.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_indices.rs index f96670ce427..458a39d5466 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_indices.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/find_duplicates_by_indices.rs @@ -11,7 +11,7 @@ use wasm_bindgen::prelude::*; use crate::identifier::IdentifierWrapper; use crate::{ - document_batch_transition::document_transition::to_object, + document_batch_transition::batched_transition::to_object, utils::{ToSerdeJSONExt, WithJsError}, DataContractWasm, }; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/validate_documents_batch_transition_basic.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/validate_documents_batch_transition_basic.rs index 4fb355e1cc5..a0bbae6d33a 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/validate_documents_batch_transition_basic.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/basic/validate_documents_batch_transition_basic.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::value_error::ValueError; +use dpp::errors::consensus::basic::value_error::ValueError; use dpp::document::validation::basic::validate_documents_batch_transition_basic; use dpp::document::DocumentsBatchTransition; use dpp::validation::SimpleConsensusValidationResult; diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/fetch_extended_documents.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/fetch_extended_documents.rs index 6c570f83741..e145d12d1ab 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/fetch_extended_documents.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/fetch_extended_documents.rs @@ -6,7 +6,7 @@ use js_sys::Array; use wasm_bindgen::prelude::*; use crate::{ - document_batch_transition::document_transition::DocumentTransitionWasm, + document_batch_transition::batched_transition::DocumentTransitionWasm, state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper}, utils::{IntoWasm, WithJsError}, ExtendedDocumentWasm, StateTransitionExecutionContextWasm, diff --git a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/validate_documents_uniqueness_by_indices.rs b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/validate_documents_uniqueness_by_indices.rs index ed4aff8cffc..2dc617714ab 100644 --- a/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/validate_documents_uniqueness_by_indices.rs +++ b/packages/wasm-dpp/src/document/state_transition/batch_transition/validation/state/validate_documents_uniqueness_by_indices.rs @@ -7,7 +7,7 @@ use js_sys::Array; use wasm_bindgen::prelude::*; use crate::{ - document_batch_transition::document_transition::DocumentTransitionWasm, + document_batch_transition::batched_transition::DocumentTransitionWasm, identifier::IdentifierWrapper, state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper}, utils::{IntoWasm, WithJsError}, diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_error.rs index fe2b0e356fa..f3feb2fa7a3 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_error.rs @@ -1,5 +1,5 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use dpp::data_contract::errors::DataContractError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs index 6b5a9bfb135..459e13ab665 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_have_new_unique_index_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DataContractHaveNewUniqueIndexError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DataContractHaveNewUniqueIndexError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs index dfeb62ea537..bac83917b43 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_immutable_properties_update_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DataContractImmutablePropertiesUpdateError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DataContractImmutablePropertiesUpdateError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs index a1e040ea2bc..ca8458b11f9 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_invalid_index_definition_update_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DataContractInvalidIndexDefinitionUpdateError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DataContractInvalidIndexDefinitionUpdateError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs index 97cb522ed15..afa2ddaa01f 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_max_depth_exceed_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::data_contract_max_depth_exceed_error::DataContractMaxDepthExceedError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs index 20e2c698844..28a9eb81c30 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/data_contract_unique_indices_changed_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DataContractUniqueIndicesChangedError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DataContractUniqueIndicesChangedError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs index 1d0c68edbe4..877a120a92d 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/document_types_are_missing_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::data_contract::DocumentTypesAreMissingError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DocumentTypesAreMissingError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs index ba918fac1e5..41e02b9fd79 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/duplicate_index_name_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DuplicateIndexNameError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DuplicateIndexNameError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs index e3668bef0bf..9dedfbfd214 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_data_contract_schema_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::data_contract::IncompatibleDataContractSchemaError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::IncompatibleDataContractSchemaError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs index 9eb61c9467c..25edd64a73b 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_document_type_schema_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::IncompatibleDocumentTypeSchemaError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::IncompatibleDocumentTypeSchemaError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs index 43965f817da..06367b28706 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/incompatible_re2_pattern_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::IncompatibleRe2PatternError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::IncompatibleRe2PatternError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/duplicate_index_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/duplicate_index_error.rs index 1f6bbffc4aa..e03e3a9fbee 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/duplicate_index_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/duplicate_index_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::DuplicateIndexError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::DuplicateIndexError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_compound_index_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_compound_index_error.rs index efaceff0218..76aeeab174c 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_compound_index_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_compound_index_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidCompoundIndexError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidCompoundIndexError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_index_property_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_index_property_type_error.rs index 2f646ca6116..b0701dbee83 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_index_property_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_index_property_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidIndexPropertyTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidIndexPropertyTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_indexed_property_constraint_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_indexed_property_constraint_error.rs index dca2fc0da85..e3f6e91427d 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_indexed_property_constraint_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/invalid_indexed_property_constraint_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidIndexedPropertyConstraintError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidIndexedPropertyConstraintError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/system_property_index_already_present_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/system_property_index_already_present_error.rs index 5c3a9b7e671..42ee664a6b0 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/system_property_index_already_present_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/system_property_index_already_present_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::SystemPropertyIndexAlreadyPresentError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::SystemPropertyIndexAlreadyPresentError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/undefined_index_property_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/undefined_index_property_error.rs index 57a3b18642d..afb049c8349 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/undefined_index_property_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/undefined_index_property_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::UndefinedIndexPropertyError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::UndefinedIndexPropertyError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs index 2f0b6095200..210d6d39dad 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::UniqueIndicesLimitReachedError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::UniqueIndicesLimitReachedError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs index fbb5b85e076..6122b9a2f37 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_id_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::data_contract::InvalidDataContractIdError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidDataContractIdError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs index a8302ebd5c8..6a1ce1b99b6 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_data_contract_version_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidDataContractVersionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidDataContractVersionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs index 10f366a4206..58885fccf2f 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_document_type_name_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidDocumentTypeNameError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidDocumentTypeNameError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs index ba9850c3ff3..251ecddd161 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/data_contract/invalid_json_schema_ref_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::data_contract::InvalidJsonSchemaRefError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::data_contract::InvalidJsonSchemaRefError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs index 2ead008957b..9b4272bfd4a 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/decode/protocol_version_parsing_error.rs @@ -1,6 +1,6 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::decode::ProtocolVersionParsingError; +use dpp::errors::consensus::basic::decode::ProtocolVersionParsingError; use dpp::errors::consensus::codes::ErrorWithCode; use dpp::errors::consensus::ConsensusError; use dpp::serialization::PlatformSerializableWithPlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs index e6b61079152..170fd6ee472 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/decode/serialized_object_parsing_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::decode::SerializedObjectParsingError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::decode::SerializedObjectParsingError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs index 84d71151c1d..1ec54c500f7 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/data_contract_not_present_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::DataContractNotPresentError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::DataContractNotPresentError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs index 7c0179fea82..c1528efa323 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs @@ -1,8 +1,8 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::wasm_bindgen; -use dpp::consensus::basic::document::DocumentTransitionsAreAbsentError; +use dpp::errors::consensus::basic::document::DocumentTransitionsAreAbsentError; #[wasm_bindgen(js_name=DocumentTransitionsAreAbsentError)] pub struct DocumentTransitionsAreAbsentErrorWasm { diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs index 5a181d38257..164c938dc34 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_ids_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::document::DuplicateDocumentTransitionsWithIdsError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::DuplicateDocumentTransitionsWithIdsError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use std::iter::FromIterator; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs index c3b3ad159b2..7f7e1c5cf53 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/duplicate_document_transitions_with_indices_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::document::DuplicateDocumentTransitionsWithIndicesError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::DuplicateDocumentTransitionsWithIndicesError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use std::iter::FromIterator; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs index 8254d685ecb..7e0061f0a84 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/identity_contract_nonce_out_of_bounds_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::NonceOutOfBoundsError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::NonceOutOfBoundsError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs index 6277f2713f0..055c27b32b2 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/inconsistent_compound_index_data_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::InconsistentCompoundIndexDataError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::InconsistentCompoundIndexDataError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use js_sys::JsString; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs index a144198bc08..319219c971b 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_action_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::InvalidDocumentTransitionActionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::InvalidDocumentTransitionActionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs index 86510ecc874..4f23434b7c7 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_transition_id_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::basic::document::InvalidDocumentTransitionIdError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::InvalidDocumentTransitionIdError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs index c78ef8f13f3..d1760a584f7 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/invalid_document_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::InvalidDocumentTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::InvalidDocumentTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_data_contract_id_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_data_contract_id_error.rs index 7a4ca857a63..0ef05395ae6 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_data_contract_id_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_data_contract_id_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::MissingDataContractIdBasicError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::MissingDataContractIdBasicError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs index 90c1cdfd5f0..c799cf77893 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_action_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::MissingDocumentTransitionActionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::MissingDocumentTransitionActionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs index 6c46f957239..986850aabda 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_transition_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::MissingDocumentTransitionTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::MissingDocumentTransitionTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs index f1ff0c35d7f..1778d2d45f3 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/document/missing_document_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::document::MissingDocumentTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::document::MissingDocumentTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs index 91518c8f6b3..3044654e288 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::DuplicatedIdentityPublicKeyBasicError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::DuplicatedIdentityPublicKeyBasicError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=DuplicatedIdentityPublicKeyError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs index 5dbead8bbfd..9001e497198 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/duplicated_identity_public_key_id_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::DuplicatedIdentityPublicKeyIdBasicError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs index 565392603e6..43e10ee6c22 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_proof_locked_transaction_mismatch_error.rs @@ -1,7 +1,7 @@ -use dpp::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; use dpp::dashcore::hashes::Hash; +use dpp::errors::consensus::basic::identity::IdentityAssetLockProofLockedTransactionMismatchError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs index 997414b434a..ee204ec4594 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_state_transition_replay_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::IdentityAssetLockStateTransitionReplayError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockStateTransitionReplayError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use dpp::dashcore::hashes::Hash; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs index 774828ff7cc..586bbfba250 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_is_not_found_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::IdentityAssetLockTransactionIsNotFoundError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionIsNotFoundError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs index 39a5262f92d..0c619892e2f 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_out_point_already_exists_error.rs @@ -1,7 +1,7 @@ -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointAlreadyConsumedError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; use dpp::dashcore::hashes::Hash; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutPointAlreadyConsumedError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs index c95d911371a..3333eb68992 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_asset_lock_transaction_output_not_found_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutputNotFoundError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs index 4f4531fa2c2..d2c665e66b3 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_credit_transfer_to_self_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::IdentityCreditTransferToSelfError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::IdentityCreditTransferToSelfError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=IdentityCreditTransferToSelfError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_insufficient_balance_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_insufficient_balance_error.rs index 5cede681120..f98adaccb1d 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_insufficient_balance_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/identity_insufficient_balance_error.rs @@ -1,7 +1,7 @@ use crate::identifier::IdentifierWrapper; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::IdentityInsufficientBalanceError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::IdentityInsufficientBalanceError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=IdentityInsufficientBalanceError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs index a9af7ffae2d..bd3cf85711c 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_core_chain_height_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidAssetLockProofCoreChainHeightError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidAssetLockProofCoreChainHeightError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs index a1dccbd7f0b..48cd6fb8cf7 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_proof_transaction_height_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidAssetLockProofTransactionHeightError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidAssetLockProofTransactionHeightError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size_error.rs index f206d0814f5..182734c30e4 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_lock_transaction_output_return_size_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidAssetLockTransactionOutputReturnSizeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidAssetLockTransactionOutputReturnSizeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs index 61728ed533e..acafca4b0fe 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_asset_transaction_out_point_not_enough_balance_error.rs @@ -1,9 +1,9 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use crate::buffer::Buffer; -use dpp::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; use dpp::dashcore::hashes::Hash; +use dpp::errors::consensus::basic::identity::IdentityAssetLockTransactionOutPointNotEnoughBalanceError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=IdentityAssetLockTransactionOutPointNotEnoughBalanceError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs index 34d182a93ae..6029f41e921 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_proof_chain_lock_validation_error.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::identity::InvalidIdentityAssetLockProofChainLockValidationError; +use dpp::errors::consensus::basic::identity::InvalidIdentityAssetLockProofChainLockValidationError; use crate::buffer::Buffer; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs index 195121ffd10..3bc07735db6 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityAssetLockTransactionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityAssetLockTransactionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs index b87c2491675..52e7af28fd3 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_asset_lock_transaction_output_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityAssetLockTransactionOutputError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityAssetLockTransactionOutputError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs index 8a27502bf86..14171f0a12c 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_transfer_amount_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityCreditTransferAmountError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityCreditTransferAmountError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs index fa0a40a52f2..5e157093ee0 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_core_fee_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityCreditWithdrawalTransitionCoreFeeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityCreditWithdrawalTransitionCoreFeeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs index 055c644d085..fdb367a5a78 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_output_script_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityCreditWithdrawalTransitionOutputScriptError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityCreditWithdrawalTransitionOutputScriptError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs index 2fed16a2b97..68fe47b56ba 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_pooling_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::NotImplementedIdentityCreditWithdrawalTransitionPoolingError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::NotImplementedIdentityCreditWithdrawalTransitionPoolingError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs index 74bafedc23c..5d85af5b28c 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_key_signature_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidIdentityKeySignatureError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidIdentityKeySignatureError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs index 2a5c502479b..24ff3c8870c 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_data_error.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::identity::InvalidIdentityPublicKeyDataError; +use dpp::errors::consensus::basic::identity::InvalidIdentityPublicKeyDataError; use dpp::errors::consensus::codes::ErrorWithCode; use dpp::errors::consensus::ConsensusError as DPPConsensusError; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs index ed739d25e38..02c5bdb4036 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_security_level_error.rs @@ -1,4 +1,4 @@ -use dpp::consensus::basic::identity::InvalidIdentityPublicKeySecurityLevelError; +use dpp::errors::consensus::basic::identity::InvalidIdentityPublicKeySecurityLevelError; use dpp::errors::consensus::codes::ErrorWithCode; use dpp::errors::consensus::ConsensusError as DPPConsensusError; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs index b3c306f649f..c4d63d443ef 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_identity_public_key_type_error.rs @@ -1,9 +1,9 @@ use std::convert::TryFrom; use crate::utils::WithJsError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::InvalidIdentityPublicKeyTypeError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::InvalidIdentityPublicKeyTypeError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyType; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs index 6aac1644064..48d196601fd 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidInstantAssetLockProofError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidInstantAssetLockProofError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs index 8637f55f00b..6569ac7637f 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/invalid_instant_asset_lock_proof_signature_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::InvalidInstantAssetLockProofSignatureError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::InvalidInstantAssetLockProofSignatureError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs index 1d3eb91f2bf..253bb56f46d 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_master_public_key_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::identity::MissingMasterPublicKeyError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::identity::MissingMasterPublicKeyError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_public_key_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_public_key_error.rs index b1ee253aa5b..5f5dcb34ee3 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_public_key_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/identity/missing_public_key_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::MissingPublicKeyError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::MissingPublicKeyError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs index 34beb02237c..821acdf4c21 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/incompatible_protocol_version_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::IncompatibleProtocolVersionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::IncompatibleProtocolVersionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/invalid_identifier_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/invalid_identifier_error.rs index b364d38462f..1aeab7bbde6 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/invalid_identifier_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/invalid_identifier_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::invalid_identifier_error::InvalidIdentifierError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::invalid_identifier_error::InvalidIdentifierError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_purpose_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_purpose_error.rs index f81b0a4e872..04b0c5798f9 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_purpose_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_purpose_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::InvalidSignaturePublicKeyPurposeError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::InvalidSignaturePublicKeyPurposeError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_security_level_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_security_level_error.rs index 64c9afdb307..920ab9b72ac 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_security_level_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/invalid_signature_public_key_security_level_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::InvalidSignaturePublicKeySecurityLevelError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::InvalidSignaturePublicKeySecurityLevelError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/invalid_state_transition_signature_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/invalid_state_transition_signature_error.rs index ae335afaf45..11f2b21a5ae 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/invalid_state_transition_signature_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/invalid_state_transition_signature_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::InvalidStateTransitionSignatureError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::InvalidStateTransitionSignatureError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs index ba7529fb6d8..4372932a002 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/json_schema_compilation_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::json_schema_compilation_error::JsonSchemaCompilationError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::json_schema_compilation_error::JsonSchemaCompilationError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/public_key_is_disabled_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/public_key_is_disabled_error.rs index 86959138e93..48bee2d5e76 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/public_key_is_disabled_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/public_key_is_disabled_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::PublicKeyIsDisabledError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::PublicKeyIsDisabledError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/public_key_security_level_not_met_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/public_key_security_level_not_met_error.rs index eb69de4fefa..6490ccf4f79 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/public_key_security_level_not_met_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/public_key_security_level_not_met_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::PublicKeySecurityLevelNotMetError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::PublicKeySecurityLevelNotMetError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs index 2da6a6ba061..cee6845b3ba 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/invalid_state_transition_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::state_transition::InvalidStateTransitionTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::state_transition::InvalidStateTransitionTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs index 91d20887c8d..faf5b60cf8e 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/missing_state_transition_type_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::state_transition::MissingStateTransitionTypeError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::state_transition::MissingStateTransitionTypeError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs index ac0f5a009df..9e48709082b 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/state_transition/state_transition_max_size_exceeded_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::state_transition::StateTransitionMaxSizeExceededError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::state_transition::StateTransitionMaxSizeExceededError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/test_consensus_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/test_consensus_error.rs index 3f6645a1bfa..1a3faf5631a 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/test_consensus_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/test_consensus_error.rs @@ -1,4 +1,4 @@ -// use dpp::consensus::ConsensusError; +// use dpp::errors::consensus::ConsensusError; // // use dpp::errors::consensus::test_consensus_error::TestConsensusError; // use wasm_bindgen::prelude::*; // diff --git a/packages/wasm-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs index e675a146ff2..5254028122a 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/unsupported_protocol_version_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::UnsupportedProtocolVersionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::UnsupportedProtocolVersionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/basic/unsupported_version_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/unsupported_version_error.rs index 9e48c407dff..2e0a9f081a8 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/unsupported_version_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/unsupported_version_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::UnsupportedVersionError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::UnsupportedVersionError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name = UnsupportedVersionError)] diff --git a/packages/wasm-dpp/src/errors/consensus/basic/wrong_public_key_purpose_error.rs b/packages/wasm-dpp/src/errors/consensus/basic/wrong_public_key_purpose_error.rs index 4f9e9205aff..1bcf12490b1 100644 --- a/packages/wasm-dpp/src/errors/consensus/basic/wrong_public_key_purpose_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/basic/wrong_public_key_purpose_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::WrongPublicKeyPurposeError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::WrongPublicKeyPurposeError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/consensus_error.rs b/packages/wasm-dpp/src/errors/consensus/consensus_error.rs index e33c010782d..ac059a2ba70 100644 --- a/packages/wasm-dpp/src/errors/consensus/consensus_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/consensus_error.rs @@ -3,7 +3,7 @@ use crate::errors::consensus::basic::{ InvalidSignaturePublicKeyPurposeErrorWasm, JsonSchemaErrorWasm, UnsupportedProtocolVersionErrorWasm, UnsupportedVersionErrorWasm, }; -use dpp::consensus::ConsensusError as DPPConsensusError; +use dpp::errors::consensus::ConsensusError as DPPConsensusError; use crate::errors::consensus::basic::identity::{ DuplicatedIdentityPublicKeyErrorWasm, DuplicatedIdentityPublicKeyIdErrorWasm, @@ -32,8 +32,8 @@ use crate::errors::consensus::state::identity::{ DuplicatedIdentityPublicKeyIdStateErrorWasm, DuplicatedIdentityPublicKeyStateErrorWasm, InvalidIdentityNonceErrorWasm, MissingIdentityPublicKeyIdsErrorWasm, }; -use dpp::consensus::basic::decode::VersionError; -use dpp::consensus::basic::BasicError::{ +use dpp::errors::consensus::basic::decode::VersionError; +use dpp::errors::consensus::basic::BasicError::{ DuplicatedIdentityPublicKeyBasicError, DuplicatedIdentityPublicKeyIdBasicError, IdentityAssetLockProofLockedTransactionMismatchError, IdentityAssetLockStateTransitionReplayError, IdentityAssetLockTransactionIsNotFoundError, @@ -52,49 +52,49 @@ use dpp::consensus::basic::BasicError::{ NotImplementedIdentityCreditWithdrawalTransitionPoolingError, ProtocolVersionParsingError, UnsupportedProtocolVersionError, UnsupportedVersionError, }; -use dpp::consensus::basic::{BasicError, UnsupportedFeatureError}; -use dpp::consensus::fee::fee_error::FeeError; -use dpp::consensus::signature::SignatureError; -use dpp::consensus::state::state_error::StateError; +use dpp::errors::consensus::basic::{BasicError, UnsupportedFeatureError}; +use dpp::errors::consensus::fee::fee_error::FeeError; +use dpp::errors::consensus::signature::SignatureError; +use dpp::errors::consensus::state::state_error::StateError; -use dpp::consensus::state::data_trigger::DataTriggerError::{ +use dpp::errors::consensus::state::data_trigger::DataTriggerError::{ DataTriggerConditionError, DataTriggerExecutionError, DataTriggerInvalidResultError, }; use wasm_bindgen::{JsError, JsValue}; -use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, DecimalsOverLimitError, DuplicateKeywordsError, GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupRequiredPowerIsInvalidError, GroupTotalPowerLessThanRequiredError, InvalidDescriptionLengthError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidKeywordCharacterError, InvalidKeywordLengthError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, InvalidTokenLanguageCodeError, InvalidTokenNameCharacterError, InvalidTokenNameLengthError, MainGroupIsNotDefinedError, NewTokensDestinationIdentityOptionRequiredError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, RedundantDocumentPaidForByTokenWithContractId, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, TooManyKeywordsError, UnknownDocumentActionTokenEffectError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError}; -use dpp::consensus::basic::document::{ContestedDocumentsTemporarilyNotAllowedError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError}; -use dpp::consensus::basic::group::GroupActionNotAllowedOnTransitionError; -use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError}; -use dpp::consensus::basic::overflow_error::OverflowError; -use dpp::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, ContractHasNoTokensError, DestinationIdentityForTokenMintingNotSetError, InvalidActionIdError, InvalidTokenAmountError, InvalidTokenConfigUpdateNoChangeError, InvalidTokenIdError, InvalidTokenNoteTooBigError, InvalidTokenPositionError, MissingDefaultLocalizationError, TokenNoteOnlyAllowedWhenProposerError, TokenTransferToOurselfError}; -use dpp::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; -use dpp::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; -use dpp::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; -use dpp::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; -use dpp::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; -use dpp::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; -use dpp::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; -use dpp::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; -use dpp::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; -use dpp::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; -use dpp::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionAlreadySignedByIdentityError, GroupActionDoesNotExistError, IdentityMemberOfGroupNotFoundError, IdentityNotMemberOfGroupError, ModificationOfGroupActionMainParametersNotPermittedError}; -use dpp::consensus::state::identity::identity_for_token_configuration_not_found_error::IdentityInTokenConfigurationNotFoundError; -use dpp::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; -use dpp::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; -use dpp::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; -use dpp::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; -use dpp::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; -use dpp::consensus::state::identity::RecipientIdentityDoesNotExistError; -use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; -use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; -use dpp::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountNotFrozenError, IdentityTokenAccountFrozenError, TokenIsPausedError, IdentityTokenAccountAlreadyFrozenError, UnauthorizedTokenActionError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, TokenMintPastMaxSupplyError, NewTokensDestinationIdentityDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, InvalidGroupPositionError, TokenAlreadyPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, TokenTransferRecipientIdentityNotExistError, PreProgrammedDistributionTimestampInPastError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError, IdentityTryingToPayWithWrongTokenError, TokenDirectPurchaseUserPriceTooLow, TokenAmountUnderMinimumSaleAmount, TokenNotForDirectSale, InvalidTokenPositionStateError}; -use dpp::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; -use dpp::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; -use dpp::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; -use dpp::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; -use dpp::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; -use dpp::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; -use dpp::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; +use dpp::errors::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, DuplicateKeywordsError, GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupTotalPowerLessThanRequiredError, InvalidDescriptionLengthError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, TooManyKeywordsError, UnknownDocumentActionTokenEffectError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError}; +use dpp::errors::consensus::basic::document::{ContestedDocumentsTemporarilyNotAllowedError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError}; +use dpp::errors::consensus::basic::group::GroupActionNotAllowedOnTransitionError; +use dpp::errors::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError}; +use dpp::errors::consensus::basic::overflow_error::OverflowError; +use dpp::errors::consensus::basic::token::{ChoosingTokenMintRecipientNotAllowedError, ContractHasNoTokensError, DestinationIdentityForTokenMintingNotSetError, InvalidActionIdError, InvalidTokenAmountError, InvalidTokenConfigUpdateNoChangeError, InvalidTokenIdError, InvalidTokenNoteTooBigError, InvalidTokenPositionError, MissingDefaultLocalizationError, TokenTransferToOurselfError}; +use dpp::errors::consensus::state::data_contract::data_contract_not_found_error::DataContractNotFoundError; +use dpp::errors::consensus::state::data_contract::data_contract_update_action_not_allowed_error::DataContractUpdateActionNotAllowedError; +use dpp::errors::consensus::state::data_contract::document_type_update_error::DocumentTypeUpdateError; +use dpp::errors::consensus::state::document::document_contest_currently_locked_error::DocumentContestCurrentlyLockedError; +use dpp::errors::consensus::state::document::document_contest_document_with_same_id_already_present_error::DocumentContestDocumentWithSameIdAlreadyPresentError; +use dpp::errors::consensus::state::document::document_contest_identity_already_contestant::DocumentContestIdentityAlreadyContestantError; +use dpp::errors::consensus::state::document::document_contest_not_joinable_error::DocumentContestNotJoinableError; +use dpp::errors::consensus::state::document::document_contest_not_paid_for_error::DocumentContestNotPaidForError; +use dpp::errors::consensus::state::document::document_incorrect_purchase_price_error::DocumentIncorrectPurchasePriceError; +use dpp::errors::consensus::state::document::document_not_for_sale_error::DocumentNotForSaleError; +use dpp::errors::consensus::state::group::{GroupActionAlreadyCompletedError, GroupActionAlreadySignedByIdentityError, GroupActionDoesNotExistError, IdentityNotMemberOfGroupError}; +use dpp::errors::consensus::state::identity::identity_for_token_configuration_not_found_error::IdentityInTokenConfigurationNotFoundError; +use dpp::errors::consensus::state::identity::identity_public_key_already_exists_for_unique_contract_bounds_error::IdentityPublicKeyAlreadyExistsForUniqueContractBoundsError; +use dpp::errors::consensus::state::identity::identity_to_freeze_does_not_exist_error::IdentityToFreezeDoesNotExistError; +use dpp::errors::consensus::state::identity::master_public_key_update_error::MasterPublicKeyUpdateError; +use dpp::errors::consensus::state::identity::missing_transfer_key_error::MissingTransferKeyError; +use dpp::errors::consensus::state::identity::no_transfer_key_for_core_withdrawal_available_error::NoTransferKeyForCoreWithdrawalAvailableError; +use dpp::errors::consensus::state::identity::RecipientIdentityDoesNotExistError; +use dpp::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError; +use dpp::errors::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError; +use dpp::errors::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountNotFrozenError, IdentityTokenAccountFrozenError, TokenIsPausedError, IdentityTokenAccountAlreadyFrozenError, UnauthorizedTokenActionError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, TokenMintPastMaxSupplyError, NewTokensDestinationIdentityDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, InvalidGroupPositionError, TokenAlreadyPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, TokenTransferRecipientIdentityNotExistError, PreProgrammedDistributionTimestampInPastError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError, IdentityTryingToPayWithWrongTokenError, TokenDirectPurchaseUserPriceTooLow, TokenAmountUnderMinimumSaleAmount, TokenNotForDirectSale}; +use dpp::errors::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError; +use dpp::errors::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError; +use dpp::errors::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError; +use dpp::errors::consensus::state::voting::masternode_vote_already_present_error::MasternodeVoteAlreadyPresentError; +use dpp::errors::consensus::state::voting::masternode_voted_too_many_times::MasternodeVotedTooManyTimesError; +use dpp::errors::consensus::state::voting::vote_poll_not_available_for_voting_error::VotePollNotAvailableForVotingError; +use dpp::errors::consensus::state::voting::vote_poll_not_found_error::VotePollNotFoundError; use crate::errors::consensus::basic::data_contract::{ DataContractErrorWasm, DataContractHaveNewUniqueIndexErrorWasm, diff --git a/packages/wasm-dpp/src/errors/consensus/deserialize.rs b/packages/wasm-dpp/src/errors/consensus/deserialize.rs index 94503dd884e..fe84cf43134 100644 --- a/packages/wasm-dpp/src/errors/consensus/deserialize.rs +++ b/packages/wasm-dpp/src/errors/consensus/deserialize.rs @@ -1,5 +1,5 @@ use crate::errors::consensus::consensus_error::from_consensus_error; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use dpp::serialization::PlatformDeserializable; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; diff --git a/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs b/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs index 38e209f3cde..ffebac69b4f 100644 --- a/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/fee/balance_is_not_enough_error.rs @@ -1,8 +1,8 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::fee::balance_is_not_enough_error::BalanceIsNotEnoughError; -use dpp::consensus::ConsensusError; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::fee::balance_is_not_enough_error::BalanceIsNotEnoughError; +use dpp::errors::consensus::ConsensusError; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/signature/basic_bls_error.rs b/packages/wasm-dpp/src/errors/consensus/signature/basic_bls_error.rs index c004c978c70..275f8b449bd 100644 --- a/packages/wasm-dpp/src/errors/consensus/signature/basic_bls_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/signature/basic_bls_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::BasicBLSError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::BasicBLSError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs b/packages/wasm-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs index 9d62bcfd317..522ef358a2d 100644 --- a/packages/wasm-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/signature/basic_ecdsa_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::BasicECDSAError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::BasicECDSAError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs b/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs index 91e6d2780e1..01a960b5092 100644 --- a/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/signature/identity_not_found_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::IdentityNotFoundError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::IdentityNotFoundError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs b/packages/wasm-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs index b48919fcefd..eeeea7dc1d6 100644 --- a/packages/wasm-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/signature/signature_should_not_be_present_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::signature::SignatureShouldNotBePresentError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::signature::SignatureShouldNotBePresentError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs index 72d9f5c2440..82a104d5b3b 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_already_present_error.rs @@ -1,8 +1,8 @@ use crate::buffer::Buffer; use crate::identifier::IdentifierWrapper; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_contract::data_contract_already_present_error::DataContractAlreadyPresentError; +use dpp::errors::consensus::ConsensusError; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs index 428763a8407..690902a401b 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_config_update_error.rs @@ -1,8 +1,8 @@ use crate::identifier::IdentifierWrapper; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_contract::data_contract_config_update_error::DataContractConfigUpdateError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=DataContractConfigUpdateError)] diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs index ddd18c3090e..ba39e7e85fe 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_is_readonly_error.rs @@ -1,7 +1,7 @@ use crate::identifier::IdentifierWrapper; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_contract::data_contract_is_readonly_error::DataContractIsReadonlyError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs index a979c9f176d..a6290815587 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_contract_update_permission_error.rs @@ -1,8 +1,8 @@ use crate::identifier::IdentifierWrapper; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; -use dpp::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; +use dpp::errors::consensus::state::data_contract::data_contract_update_permission_error::DataContractUpdatePermissionError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=DataContractUpdatePermissionError)] diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_condition_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_condition_error.rs index d38e84fdb3f..e9dedd2ce68 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_condition_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_condition_error.rs @@ -1,8 +1,8 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_trigger::data_trigger_condition_error::DataTriggerConditionError; +use dpp::errors::consensus::ConsensusError; use dpp::identifier::Identifier; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_execution_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_execution_error.rs index b4a928db3c7..a2cc0dcefed 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_execution_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_execution_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_trigger::data_trigger_execution_error::DataTriggerExecutionError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_trigger::data_trigger_execution_error::DataTriggerExecutionError; +use dpp::errors::consensus::ConsensusError; use dpp::identifier::Identifier; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_invalid_result_error.rs b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_invalid_result_error.rs index ea7dc0d5e71..0a12cc2a677 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_invalid_result_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/data_contract/data_trigger/data_trigger_invalid_result_error.rs @@ -1,8 +1,8 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::data_trigger::data_trigger_invalid_result_error::DataTriggerInvalidResultError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::data_trigger::data_trigger_invalid_result_error::DataTriggerInvalidResultError; +use dpp::errors::consensus::ConsensusError; use dpp::identifier::Identifier; use dpp::serialization::PlatformSerializableWithPlatformVersion; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_already_present_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_already_present_error.rs index c95e3805045..0da3c8dbb42 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_already_present_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_already_present_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_already_present_error::DocumentAlreadyPresentError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_not_found_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_not_found_error.rs index a46f7e7e8fe..bac3954ef40 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_not_found_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_not_found_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_not_found_error::DocumentNotFoundError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_not_found_error::DocumentNotFoundError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs index a02e7b45a50..4b16e7c25b9 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_owner_id_mismatch_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_owner_id_mismatch_error::DocumentOwnerIdMismatchError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs index 7da7e2f260f..96f4bf42a15 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamp_window_violation_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_timestamp_window_violation_error::DocumentTimestampWindowViolationError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_timestamp_window_violation_error::DocumentTimestampWindowViolationError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs index 543e5dfeafc..c87e3437971 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_are_equal_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_timestamps_are_equal_error::DocumentTimestampsAreEqualError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_timestamps_are_equal_error::DocumentTimestampsAreEqualError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs index fb4c26994b5..c26a18c8f59 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/document_timestamps_mismatch_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::document_timestamps_mismatch_error::DocumentTimestampsMismatchError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::document_timestamps_mismatch_error::DocumentTimestampsMismatchError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs index 5583ef0d254..93b39487f11 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/duplicate_unique_index_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::duplicate_unique_index_error::DuplicateUniqueIndexError; +use dpp::errors::consensus::ConsensusError; use js_sys::JsString; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs b/packages/wasm-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs index 6636ed0d142..6e7e45b1229 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/document/invalid_document_revision_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::document::invalid_document_revision_error::InvalidDocumentRevisionError; +use dpp::errors::consensus::ConsensusError; use dpp::prelude::Revision; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs index 74cdbe96de0..948f95996ac 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_id_state_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::duplicated_identity_public_key_id_state_error::DuplicatedIdentityPublicKeyIdStateError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::duplicated_identity_public_key_id_state_error::DuplicatedIdentityPublicKeyIdStateError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs index 69ae1ade999..d24ecb3074d 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/duplicated_identity_public_key_state_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::duplicated_identity_public_key_state_error::DuplicatedIdentityPublicKeyStateError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::duplicated_identity_public_key_state_error::DuplicatedIdentityPublicKeyStateError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs index 9396e42fa02..fb8a8cd9a12 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_already_exists_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::IdentityAlreadyExistsError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::IdentityAlreadyExistsError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs index e8a4588aed3..26c6556880f 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_disabled_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::identity_public_key_is_disabled_error::IdentityPublicKeyIsDisabledError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs index a842cc29e9b..09004709e4b 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/identity_public_key_is_read_only_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::identity_public_key_is_read_only_error::IdentityPublicKeyIsReadOnlyError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::identity_public_key_is_read_only_error::IdentityPublicKeyIsReadOnlyError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs index e5a403ef028..91074bdb0b8 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_contract_nonce_error.rs @@ -1,8 +1,8 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::invalid_identity_contract_nonce_error::InvalidIdentityNonceError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::identity_nonce::MergeIdentityNonceResult; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs index da7eb35ac8f..5a0e962ca3f 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_public_key_id_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::invalid_identity_public_key_id_error::InvalidIdentityPublicKeyIdError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::invalid_identity_public_key_id_error::InvalidIdentityPublicKeyIdError; +use dpp::errors::consensus::ConsensusError; use dpp::identity::KeyID; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs index 8db6b8973d0..085257940a4 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/invalid_identity_revision_error.rs @@ -1,7 +1,7 @@ use crate::buffer::Buffer; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError; +use dpp::errors::consensus::ConsensusError; use js_sys::Number; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs index 7c22271951e..315f10f0850 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/max_identity_public_key_limit_reached_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::state::identity::max_identity_public_key_limit_reached_error::MaxIdentityPublicKeyLimitReachedError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs b/packages/wasm-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs index 9882d6e4c7d..f0a2e6c18cb 100644 --- a/packages/wasm-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/state/identity/missing_identity_public_key_ids_error.rs @@ -1,4 +1,4 @@ -use dpp::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; +use dpp::errors::consensus::state::identity::missing_identity_public_key_ids_error::MissingIdentityPublicKeyIdsError; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name=MissingIdentityPublicKeyIdsError)] diff --git a/packages/wasm-dpp/src/errors/consensus/value_error.rs b/packages/wasm-dpp/src/errors/consensus/value_error.rs index 3b0dec5c0d4..bf5ebdaa0ae 100644 --- a/packages/wasm-dpp/src/errors/consensus/value_error.rs +++ b/packages/wasm-dpp/src/errors/consensus/value_error.rs @@ -1,6 +1,6 @@ -use dpp::consensus::basic::value_error::ValueError; -use dpp::consensus::codes::ErrorWithCode; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::value_error::ValueError; +use dpp::errors::consensus::codes::ErrorWithCode; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/data_contract_not_present_error.rs b/packages/wasm-dpp/src/errors/data_contract_not_present_error.rs index 41b8cfc91a3..b3803149a6e 100644 --- a/packages/wasm-dpp/src/errors/data_contract_not_present_error.rs +++ b/packages/wasm-dpp/src/errors/data_contract_not_present_error.rs @@ -1,4 +1,4 @@ -use dpp::prelude::Identifier; +use dpp::identifier::Identifier; use wasm_bindgen::prelude::*; use crate::buffer::Buffer; diff --git a/packages/wasm-dpp/src/errors/from.rs b/packages/wasm-dpp/src/errors/from.rs index 6806d6e2ddb..f036d55078a 100644 --- a/packages/wasm-dpp/src/errors/from.rs +++ b/packages/wasm-dpp/src/errors/from.rs @@ -8,7 +8,7 @@ use crate::document::errors::from_document_to_js_error; // use crate::document::errors::from_document_to_js_error; use crate::errors::value_error::PlatformValueErrorWasm; -use super::data_contract_not_present_error::DataContractNotPresentNotConsensusErrorWasm; +use crate::errors::data_contract_not_present_error::DataContractNotPresentNotConsensusErrorWasm; use crate::errors::consensus::consensus_error::from_consensus_error; pub fn from_dpp_err(pe: ProtocolError) -> JsValue { diff --git a/packages/wasm-dpp/src/errors/generic_consensus_error.rs b/packages/wasm-dpp/src/errors/generic_consensus_error.rs index 57e8f43bb2b..f43785c097e 100644 --- a/packages/wasm-dpp/src/errors/generic_consensus_error.rs +++ b/packages/wasm-dpp/src/errors/generic_consensus_error.rs @@ -3,7 +3,7 @@ macro_rules! generic_consensus_error { ($error_type:ident, $error_instance:expr) => {{ use { dpp::{ - consensus::{codes::ErrorWithCode, ConsensusError}, + errors::consensus::{codes::ErrorWithCode, ConsensusError}, serialization::PlatformSerializableWithPlatformVersion, version::PlatformVersion, }, diff --git a/packages/wasm-dpp/src/identifier/mod.rs b/packages/wasm-dpp/src/identifier/mod.rs index ea6c5b95a66..f2cf508a052 100644 --- a/packages/wasm-dpp/src/identifier/mod.rs +++ b/packages/wasm-dpp/src/identifier/mod.rs @@ -1,4 +1,4 @@ -use dpp::prelude::Identifier; +use dpp::identifier::Identifier; use itertools::Itertools; use serde_json::Value; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/identity/errors/invalid_identity_error.rs b/packages/wasm-dpp/src/identity/errors/invalid_identity_error.rs index 4fa496a16f3..d818810db33 100644 --- a/packages/wasm-dpp/src/identity/errors/invalid_identity_error.rs +++ b/packages/wasm-dpp/src/identity/errors/invalid_identity_error.rs @@ -1,5 +1,5 @@ use crate::errors::consensus::consensus_error::from_consensus_error_ref; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::JsValue; diff --git a/packages/wasm-dpp/src/identity/factory_utils.rs b/packages/wasm-dpp/src/identity/factory_utils.rs index f14431ac8ee..9194f60a5c2 100644 --- a/packages/wasm-dpp/src/identity/factory_utils.rs +++ b/packages/wasm-dpp/src/identity/factory_utils.rs @@ -7,7 +7,7 @@ use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV use dpp::identity::{IdentityPublicKey, KeyID}; use dpp::serialization::ValueConvertible; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use std::collections::BTreeMap; use wasm_bindgen::{JsCast, JsValue}; diff --git a/packages/wasm-dpp/src/identity/identity_facade.rs b/packages/wasm-dpp/src/identity/identity_facade.rs index bd4db7d491d..8f026f2ccc7 100644 --- a/packages/wasm-dpp/src/identity/identity_facade.rs +++ b/packages/wasm-dpp/src/identity/identity_facade.rs @@ -23,10 +23,10 @@ use crate::with_js_error; use dpp::dashcore::{consensus, InstantLock, Transaction}; use crate::identity::IdentityWasm; +use dpp::errors::NonConsensusError; use dpp::identity::core_script::CoreScript; use dpp::prelude::IdentityNonce; use dpp::withdrawal::Pooling; -use dpp::NonConsensusError; use serde::Deserialize; #[derive(Clone)] diff --git a/packages/wasm-dpp/src/identity/identity_factory.rs b/packages/wasm-dpp/src/identity/identity_factory.rs index 799598b4560..e0bdbb65eb1 100644 --- a/packages/wasm-dpp/src/identity/identity_factory.rs +++ b/packages/wasm-dpp/src/identity/identity_factory.rs @@ -17,8 +17,8 @@ use crate::{ identity::state_transition::IdentityUpdateTransitionWasm, with_js_error, }; use dpp::dashcore::{consensus, InstantLock, Transaction}; - -use dpp::prelude::{Identity, IdentityNonce}; +use dpp::identity::Identity; +use dpp::prelude::IdentityNonce; use serde::Deserialize; use std::convert::TryInto; diff --git a/packages/wasm-dpp/src/identity/identity_public_key/purpose.rs b/packages/wasm-dpp/src/identity/identity_public_key/purpose.rs index 33503d61790..0da1f19928f 100644 --- a/packages/wasm-dpp/src/identity/identity_public_key/purpose.rs +++ b/packages/wasm-dpp/src/identity/identity_public_key/purpose.rs @@ -1,4 +1,4 @@ -use dpp::identity::Purpose; +use dpp::identity::identity_public_key::Purpose; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name = KeyPurpose)] diff --git a/packages/wasm-dpp/src/identity/identity_public_key/security_level.rs b/packages/wasm-dpp/src/identity/identity_public_key/security_level.rs index eee17e1d765..7e5e7b7906f 100644 --- a/packages/wasm-dpp/src/identity/identity_public_key/security_level.rs +++ b/packages/wasm-dpp/src/identity/identity_public_key/security_level.rs @@ -1,4 +1,4 @@ -use dpp::identity::SecurityLevel; +use dpp::identity::identity_public_key::SecurityLevel; use wasm_bindgen::prelude::*; #[wasm_bindgen(js_name = "KeySecurityLevel")] diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs index a5f88bed590..b8891dd8805 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/apply_identity_create_transition.rs @@ -1,4 +1,4 @@ -use dpp::identity::state_transition::identity_create_transition::ApplyIdentityCreateTransition; +use dpp::identity::state_transition::state_transitions::identity::identity_create_transition::ApplyIdentityCreateTransition; use std::sync::Arc; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs index 68ccfaf91e0..d24ac9ae4ed 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_basic_validator.rs @@ -2,7 +2,7 @@ use dpp::identity::state_transition::asset_lock_proof::{ AssetLockProofValidator, AssetLockTransactionValidator, ChainAssetLockProofStructureValidator, InstantAssetLockProofStructureValidator, }; -use dpp::identity::state_transition::identity_create_transition::validation::basic::IdentityCreateTransitionBasicValidator; +use dpp::identity::state_transition::state_transitions::identity::identity_create_transition::validation::basic::IdentityCreateTransitionBasicValidator; use dpp::identity::state_transition::validate_public_key_signatures::PublicKeysSignaturesValidator; use dpp::identity::validation::{ PublicKeysValidator, RequiredPurposeAndSecurityLevelValidator, PUBLIC_KEY_SCHEMA_FOR_TRANSITION, diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_state_validator.rs b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_state_validator.rs index 959fc3a83d3..960979c0a0c 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_state_validator.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition_state_validator.rs @@ -2,7 +2,7 @@ use crate::errors::from_dpp_err; use crate::state_repository::{ExternalStateRepositoryLike, ExternalStateRepositoryLikeWrapper}; use crate::validation::ValidationResultWasm; use crate::{IdentityCreateTransitionWasm, StateTransitionExecutionContextWasm}; -use dpp::identity::state_transition::identity_create_transition::validation::state::validate_identity_create_transition_state; +use dpp::identity::state_transition::state_transitions::identity::identity_create_transition::validation::state::validate_identity_create_transition_state; use wasm_bindgen::prelude::*; use wasm_bindgen::JsValue; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/to_object.rs b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/to_object.rs index d2bf353fe53..2258e40f14b 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/to_object.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/to_object.rs @@ -1,9 +1,10 @@ use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; use dpp::identity::state_transition::AssetLockProved; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::{ - identifier::Identifier, state_transition::identity_create_transition::IdentityCreateTransition, + identifier::Identifier, + state_transition::state_transitions::identity::identity_create_transition::IdentityCreateTransition, state_transition::StateTransitionLike, }; use serde::Deserialize; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/transition.rs index 389e5480a50..a82468caeaf 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_create_transition/transition.rs @@ -28,7 +28,7 @@ use crate::utils::{generic_of_js_val, WithJsError}; use dpp::platform_value::string_encoding; use dpp::platform_value::string_encoding::Encoding; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; use dpp::state_transition::StateTransition; use dpp::{ identity::state_transition::asset_lock_proof::AssetLockProof, diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/to_object.rs b/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/to_object.rs index e4ed4f77e0d..a63aaa03233 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/to_object.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/to_object.rs @@ -1,7 +1,7 @@ use dpp::identity::KeyID; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::{identifier::Identifier, state_transition::StateTransitionLike}; use serde::Deserialize; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/transition.rs index 40501905f86..d49614c8e20 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_credit_transfer_transition/transition.rs @@ -16,9 +16,9 @@ use dpp::identity::KeyType; use dpp::platform_value::string_encoding::Encoding; use dpp::platform_value::{string_encoding, BinaryData}; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::accessors::IdentityCreditTransferTransitionAccessorsV0; -use dpp::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_transfer_transition::IdentityCreditTransferTransition; use dpp::state_transition::StateTransitionLike; use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned}; #[wasm_bindgen(js_name=IdentityCreditTransferTransition)] diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/to_object.rs b/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/to_object.rs index d805f7f0180..a729cead447 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/to_object.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/to_object.rs @@ -2,8 +2,8 @@ use dpp::identity::KeyID; use dpp::identity::core_script::CoreScript; use dpp::prelude::IdentityNonce; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::withdrawal::Pooling; use dpp::{identifier::Identifier, state_transition::StateTransitionLike}; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/transition.rs index 5e700fd0dc4..4ae607d7efa 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/transition.rs @@ -17,8 +17,8 @@ use dpp::platform_value; use dpp::platform_value::string_encoding::Encoding; use dpp::platform_value::{string_encoding, BinaryData}; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; -use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::accessors::IdentityCreditWithdrawalTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use dpp::state_transition::StateTransitionLike; use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned}; use dpp::withdrawal::Pooling; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs b/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs index 9769c8d6424..f5c169da0a1 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_public_key_transitions.rs @@ -1,24 +1,23 @@ //todo: move this file to transition use dpp::platform_value::{BinaryData, ReplacementType}; use dpp::serialization::ValueConvertible; -use dpp::state_transition::public_key_in_creation::accessors::{ +use dpp::state_transition::state_transitions::identity::public_key_in_creation::accessors::{ IdentityPublicKeyInCreationV0Getters, IdentityPublicKeyInCreationV0Setters, }; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use js_sys::Reflect::delete_property; pub use serde::{Deserialize, Serialize}; -use dpp::identity::contract_bounds::ContractBounds; -use dpp::ProtocolError; -use std::convert::TryInto; -use wasm_bindgen::prelude::*; - use crate::errors::from_dpp_err; use crate::identifier::IdentifierWrapper; use crate::utils::WithJsError; use crate::{buffer::Buffer, with_js_error}; +use dpp::identity::identity_public_key::contract_bounds::ContractBounds; use dpp::version::PlatformVersion; +use dpp::ProtocolError; +use std::convert::TryInto; +use wasm_bindgen::prelude::*; #[derive(Deserialize, Default)] #[serde(rename_all = "camelCase")] diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/to_object.rs b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/to_object.rs index 8433175cd2a..dcba6b8b44f 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/to_object.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/to_object.rs @@ -1,7 +1,7 @@ use dpp::identity::state_transition::asset_lock_proof::AssetLockProof; use dpp::identity::state_transition::AssetLockProved; -use dpp::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::{identifier::Identifier, state_transition::StateTransitionLike}; use serde::Deserialize; use std::default::Default; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/transition.rs index 908d4c91e37..fc4bc24ff1e 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/transition.rs @@ -26,8 +26,8 @@ use crate::identity::state_transition::create_asset_lock_proof_from_wasm_instanc use dpp::platform_value::string_encoding; use dpp::platform_value::string_encoding::Encoding; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; -use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::StateTransition; use dpp::{ identifier::Identifier, identity::state_transition::asset_lock_proof::AssetLockProof, diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/to_object.rs b/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/to_object.rs index d00f03e0aa8..f054e47bd06 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/to_object.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/to_object.rs @@ -1,7 +1,7 @@ use dpp::identity::KeyID; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::{identifier::Identifier, state_transition::StateTransitionLike}; use serde::Deserialize; diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/transition.rs index 4c48002bb52..ee0fe31f2c8 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_update_transition/transition.rs @@ -15,9 +15,9 @@ use dpp::platform_value::string_encoding::Encoding; use dpp::platform_value::{string_encoding, BinaryData}; use dpp::prelude::Revision; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; -use dpp::state_transition::identity_update_transition::IdentityUpdateTransition; -use dpp::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; +use dpp::state_transition::state_transitions::identity::identity_update_transition::accessors::IdentityUpdateTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::identity_update_transition::IdentityUpdateTransition; +use dpp::state_transition::state_transitions::identity::public_key_in_creation::IdentityPublicKeyInCreation; use dpp::state_transition::StateTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::version::PlatformVersion; diff --git a/packages/wasm-dpp/src/state_transition/conversion.rs b/packages/wasm-dpp/src/state_transition/conversion.rs index f1bb1f6094b..7b6b3226861 100644 --- a/packages/wasm-dpp/src/state_transition/conversion.rs +++ b/packages/wasm-dpp/src/state_transition/conversion.rs @@ -7,9 +7,9 @@ use crate::{ IdentityUpdateTransitionWasm, PreCalculatedOperationWasm, ReadOperationWasm, SignatureVerificationOperationWasm, }; -use dpp::consensus::basic::state_transition::InvalidStateTransitionTypeError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::state_transition::InvalidStateTransitionTypeError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::state_transition::fee::operations::Operation; use dpp::state_transition::{StateTransition, StateTransitionType}; use std::convert::TryInto; diff --git a/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs b/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs index 2c09e469abd..35747acf97a 100644 --- a/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs +++ b/packages/wasm-dpp/src/state_transition/errors/invalid_state_transition_error.rs @@ -1,4 +1,4 @@ -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::ConsensusError; use wasm_bindgen::{prelude::wasm_bindgen, JsValue}; diff --git a/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs b/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs index dc382bae5ef..a9b7e77324b 100644 --- a/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs +++ b/packages/wasm-dpp/src/state_transition/fee/operations/pre_calculated_operation.rs @@ -1,5 +1,5 @@ use crate::{fee::dummy_fee_result::DummyFeesResultWasm, utils::Inner}; -use dpp::fee::Credits; +use dpp::balances::credits::Credits; use dpp::platform_value::Error as PlatformValueError; use dpp::{ state_transition::fee::{ diff --git a/packages/wasm-dpp/src/state_transition/state_transition_facade.rs b/packages/wasm-dpp/src/state_transition/state_transition_facade.rs index 4fcce43ff91..1fd56412118 100644 --- a/packages/wasm-dpp/src/state_transition/state_transition_facade.rs +++ b/packages/wasm-dpp/src/state_transition/state_transition_facade.rs @@ -16,7 +16,7 @@ use crate::errors::consensus::basic::state_transition::InvalidStateTransitionTyp use crate::errors::protocol_error::from_protocol_error; use crate::errors::value_error::PlatformValueErrorWasm; -use dpp::data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransition; +use dpp::data_contract::state_transition::state_transitions::contract::data_contract_update_transition::DataContractUpdateTransition; use num_enum::TryFromPrimitiveError; use std::sync::Arc; diff --git a/packages/wasm-dpp/src/state_transition/validation/validate_state_transition_identity_signature.rs b/packages/wasm-dpp/src/state_transition/validation/validate_state_transition_identity_signature.rs index b4607fb0fe3..c36b880adde 100644 --- a/packages/wasm-dpp/src/state_transition/validation/validate_state_transition_identity_signature.rs +++ b/packages/wasm-dpp/src/state_transition/validation/validate_state_transition_identity_signature.rs @@ -4,9 +4,9 @@ use crate::utils::WithJsError; use crate::validation::ValidationResultWasm; use crate::errors::consensus::consensus_error::from_consensus_error; -use dpp::consensus::basic::state_transition::InvalidStateTransitionTypeError; -use dpp::consensus::basic::BasicError; -use dpp::consensus::ConsensusError; +use dpp::errors::consensus::basic::state_transition::InvalidStateTransitionTypeError; +use dpp::errors::consensus::basic::BasicError; +use dpp::errors::consensus::ConsensusError; use dpp::state_transition::state_transition_validation::validate_state_transition_identity_signature::validate_state_transition_identity_signature; use dpp::state_transition::{StateTransition, StateTransitionIdentitySignedV0}; diff --git a/packages/wasm-dpp/src/utils.rs b/packages/wasm-dpp/src/utils.rs index 20794d3a6d4..becc18412ea 100644 --- a/packages/wasm-dpp/src/utils.rs +++ b/packages/wasm-dpp/src/utils.rs @@ -2,13 +2,13 @@ use std::collections::BTreeMap; use std::convert::TryInto; use anyhow::{anyhow, bail, Context}; -use dpp::{consensus::ConsensusError, ProtocolError}; +use dpp::errors::{consensus::ConsensusError, ProtocolError}; use dpp::platform_value::Value; use dpp::serialization::PlatformDeserializable; use js_sys::{Function, Uint8Array}; use serde::de::DeserializeOwned; -use serde_json::Value as JsonValue; +// use serde_json::Value as JsonValue; use wasm_bindgen::{convert::RefFromWasmAbi, prelude::*}; use crate::{ @@ -17,7 +17,7 @@ use crate::{ }; pub trait ToSerdeJSONExt { - fn with_serde_to_json_value(&self) -> Result; + fn with_serde_to_json_value(&self) -> Result; fn with_serde_to_platform_value(&self) -> Result; /// Converts the `JsValue` into `platform::Value`. It's an expensive conversion, /// as `JsValue` must be stringified first @@ -30,7 +30,7 @@ pub trait ToSerdeJSONExt { impl ToSerdeJSONExt for JsValue { /// Converts the `JsValue` into `serde_json::Value`. It's an expensive conversion, /// as `JsValue` must be stringified first - fn with_serde_to_json_value(&self) -> Result { + fn with_serde_to_json_value(&self) -> Result { with_serde_to_json_value(self) } @@ -71,7 +71,7 @@ where #[allow(deprecated)] pub fn to_vec_of_serde_values( values: impl IntoIterator>, -) -> Result, JsValue> { +) -> Result, JsValue> { values .into_iter() .map(|v| v.as_ref().with_serde_to_json_value()) @@ -96,9 +96,9 @@ where .collect() } -pub fn with_serde_to_json_value(data: &JsValue) -> Result { +pub fn with_serde_to_json_value(data: &JsValue) -> Result { let data = stringify(data)?; - let value: JsonValue = serde_json::from_str(&data) + let value: serde_json::Value = serde_json::from_str(&data) .with_context(|| format!("cant convert {data:#?} to serde json value")) .map_err(|e| format!("{e:#}"))?; Ok(value) diff --git a/packages/wasm-dpp/src/validation/validation_result.rs b/packages/wasm-dpp/src/validation/validation_result.rs index bc2f7b13d92..f0bb6d223f0 100644 --- a/packages/wasm-dpp/src/validation/validation_result.rs +++ b/packages/wasm-dpp/src/validation/validation_result.rs @@ -3,7 +3,7 @@ use crate::{ utils::consensus_errors_from_buffers, }; -use dpp::{consensus::ConsensusError, validation::ConsensusValidationResult}; +use dpp::{errors::consensus::ConsensusError, validation::ConsensusValidationResult}; use js_sys::JsString; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/mod.rs b/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/mod.rs index 19c2a85046a..b29f98e7172 100644 --- a/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/mod.rs +++ b/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/mod.rs @@ -11,8 +11,8 @@ use dpp::identity::KeyType; use dpp::platform_value::string_encoding::Encoding; use dpp::platform_value::{string_encoding, BinaryData}; use dpp::serialization::PlatformSerializable; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::state_transition::{StateTransition, StateTransitionIdentitySigned, StateTransitionLike}; use dpp::version::PlatformVersion; use dpp::voting::vote_polls::VotePoll; diff --git a/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/to_object.rs b/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/to_object.rs index 06edb7e513c..0d73043f74e 100644 --- a/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/to_object.rs +++ b/packages/wasm-dpp/src/voting/state_transition/masternode_vote_transition/to_object.rs @@ -1,7 +1,7 @@ use dpp::identity::KeyID; -use dpp::state_transition::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; -use dpp::state_transition::masternode_vote_transition::MasternodeVoteTransition; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::accessors::MasternodeVoteTransitionAccessorsV0; +use dpp::state_transition::state_transitions::identity::masternode_vote_transition::MasternodeVoteTransition; use dpp::state_transition::StateTransitionIdentitySigned; use dpp::voting::votes::Vote; use dpp::{identifier::Identifier, state_transition::StateTransitionLike}; diff --git a/packages/wasm-sdk/src/state_transitions/documents.rs b/packages/wasm-sdk/src/state_transitions/documents.rs index 83991f26440..4d734cd2b1f 100644 --- a/packages/wasm-sdk/src/state_transitions/documents.rs +++ b/packages/wasm-sdk/src/state_transitions/documents.rs @@ -4,7 +4,7 @@ use dash_sdk::dpp::serialization::PlatformSerializable; use dash_sdk::dpp::state_transition::documents_batch_transition::document_base_transition::v0::DocumentBaseTransitionV0; use dash_sdk::dpp::state_transition::documents_batch_transition::document_base_transition::DocumentBaseTransition; use dash_sdk::dpp::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransitionV0; -use dash_sdk::dpp::state_transition::documents_batch_transition::document_transition::DocumentTransition; +use dash_sdk::dpp::state_transition::documents_batch_transition::batched_transition::DocumentTransition; use dash_sdk::dpp::state_transition::documents_batch_transition::{ DocumentCreateTransition, DocumentsBatchTransition, DocumentsBatchTransitionV0, };