From 3016cf8dec0850a1ce2367c4081542b369eceac8 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 05:16:20 +0700 Subject: [PATCH 01/22] feat: fee multiplier and priorities --- .../src/document/document_factory/v0/mod.rs | 1 + .../specialized_document_factory/v0/mod.rs | 1 + .../rs-dpp/src/fee/default_costs/constants.rs | 2 +- packages/rs-dpp/src/fee/fee_result/mod.rs | 12 ++ packages/rs-dpp/src/lib.rs | 1 + packages/rs-dpp/src/state_transition/mod.rs | 12 +- .../src/state_transition/serialization.rs | 5 + .../state_transitions/common_fields.rs | 2 + .../state_transition_like.rs | 14 ++ .../data_contract_create_transition/v0/mod.rs | 5 +- .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 1 + .../v0/value_conversion.rs | 10 ++ .../methods/mod.rs | 4 +- .../methods/v0/mod.rs | 3 +- .../state_transition_like.rs | 14 ++ .../data_contract_update_transition/v0/mod.rs | 4 +- .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 4 +- .../v0/value_conversion.rs | 10 +- .../documents_batch_transition/methods/mod.rs | 6 +- .../methods/v0/mod.rs | 4 +- .../state_transition_like.rs | 14 ++ .../documents_batch_transition/v0/mod.rs | 2 + .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 6 +- .../state_transition_like.rs | 14 ++ .../identity_create_transition/v0/mod.rs | 7 +- .../v0/state_transition_like.rs | 9 ++ .../state_transition_like.rs | 14 ++ .../v0/mod.rs | 4 +- .../v0/state_transition_like.rs | 9 ++ .../methods/mod.rs | 4 +- .../methods/v0/mod.rs | 3 +- .../state_transition_like.rs | 14 ++ .../v0/mod.rs | 3 +- .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 4 +- .../identity_topup_transition/methods/mod.rs | 4 +- .../methods/v0/mod.rs | 3 +- .../state_transition_like.rs | 15 ++ .../identity_topup_transition/v0/mod.rs | 3 +- .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 4 +- .../v0/value_conversion.rs | 4 + .../identity_update_transition/methods/mod.rs | 4 +- .../methods/v0/mod.rs | 3 +- .../state_transition_like.rs | 14 ++ .../v0/json_conversion.rs | 1 + .../identity_update_transition/v0/mod.rs | 5 +- .../v0/state_transition_like.rs | 9 ++ .../v0/v0_methods.rs | 4 +- .../v0/value_conversion.rs | 6 +- .../traits/state_transition_like.rs | 6 +- .../src/abci/handler/check_tx.rs | 2 +- .../src/execution/check_tx/mod.rs | 3 + .../src/execution/check_tx/v0/mod.rs | 134 ++++++++++++++++++ .../execute_event/v0/mod.rs | 4 + .../validate_fees_of_event/v0/mod.rs | 6 + .../execution/types/execution_event/mod.rs | 15 ++ .../data_contract_update/mod.rs | 2 + .../documents_batch/state/v0/mod.rs | 2 + .../documents_batch/transformer/v0/mod.rs | 2 + .../tests/strategy_tests/strategy.rs | 6 + .../contract/data_contract_create/mod.rs | 9 +- .../contract/data_contract_create/v0/mod.rs | 4 +- .../data_contract_create/v0/transformer.rs | 2 + .../contract/data_contract_update/mod.rs | 9 +- .../contract/data_contract_update/v0/mod.rs | 4 +- .../data_contract_update/v0/transformer.rs | 2 + .../document/documents_batch/mod.rs | 8 ++ .../document/documents_batch/v0/mod.rs | 3 + .../identity/identity_create/mod.rs | 8 ++ .../identity/identity_create/v0/mod.rs | 3 + .../identity_create/v0/transformer.rs | 2 + .../identity/identity_credit_transfer/mod.rs | 9 +- .../identity_credit_transfer/v0/mod.rs | 4 +- .../v0/transformer.rs | 4 + .../identity_credit_withdrawal/mod.rs | 9 +- .../identity_credit_withdrawal/v0/mod.rs | 4 +- .../v0/transformer.rs | 1 + .../identity/identity_topup/mod.rs | 8 ++ .../identity/identity_topup/v0/mod.rs | 3 + .../identity/identity_topup/v0/transformer.rs | 4 + .../identity/identity_update/mod.rs | 10 +- .../identity/identity_update/v0/mod.rs | 4 +- .../identity_update/v0/transformer.rs | 4 + .../src/state_transition_action/mod.rs | 23 ++- .../mod.rs | 8 +- .../transformer.rs | 10 +- .../v0/mod.rs | 6 +- .../v0/transformer.rs | 17 +++ .../system/bump_identity_nonce_action/mod.rs | 8 +- .../bump_identity_nonce_action/v0/mod.rs | 7 +- .../v0/transformer.rs | 36 +++-- .../src/platform/transition/put_document.rs | 6 +- .../src/platform/transition/put_settings.rs | 2 + .../platform/transition/top_up_identity.rs | 5 +- .../transition/withdraw_from_identity.rs | 4 + packages/strategy-tests/src/lib.rs | 5 + packages/strategy-tests/src/transitions.rs | 5 + 101 files changed, 728 insertions(+), 60 deletions(-) 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 2fe4f9d922c..81ae9d05c68 100644 --- a/packages/rs-dpp/src/document/document_factory/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/v0/mod.rs @@ -237,6 +237,7 @@ impl DocumentFactoryV0 { Ok(DocumentsBatchTransitionV0 { owner_id, transitions, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } 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 c3fc31defb2..51871a998df 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 @@ -246,6 +246,7 @@ impl SpecializedDocumentFactoryV0 { Ok(DocumentsBatchTransitionV0 { owner_id, transitions, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } diff --git a/packages/rs-dpp/src/fee/default_costs/constants.rs b/packages/rs-dpp/src/fee/default_costs/constants.rs index f93be480f1c..4da1bce36dd 100644 --- a/packages/rs-dpp/src/fee/default_costs/constants.rs +++ b/packages/rs-dpp/src/fee/default_costs/constants.rs @@ -1,7 +1,7 @@ use crate::fee::Credits; pub const BASE_ST_PROCESSING_FEE: Credits = 10000; // 84000 -pub const FEE_MULTIPLIER: Credits = 2; +pub const DEFAULT_FEE_MULTIPLIER: Credits = 2; pub const DEFAULT_USER_TIP: Credits = 0; pub const STORAGE_CREDIT_PER_BYTE: Credits = 5000; pub const PROCESSING_CREDIT_PER_BYTE: Credits = 12; diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index 1956719049c..f58f9736f2c 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -46,6 +46,7 @@ use platform_value::Identifier; use std::cmp::Ordering; use std::collections::BTreeMap; use std::convert::TryFrom; +use crate::prelude::FeeMultiplier; pub mod refunds; @@ -192,6 +193,17 @@ impl FeeResult { removed_bytes_from_system: 0, } } + + /// Apply a fee multiplier to a fee result + pub fn apply_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + let additional_processing_fee = (self.processing_fee as u128).saturating_mul(fee_multiplier as u128).saturating_div(100); + if additional_processing_fee > u64::MAX as u128 { + self.processing_fee = u64::MAX; + } else { + self.processing_fee += additional_processing_fee as u64; + } + } + /// Convenience method to get total fee pub fn total_base_fee(&self) -> Credits { self.storage_fee + self.processing_fee diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index e06eb659e91..8a76f5ffa15 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -65,6 +65,7 @@ pub mod prelude { pub type TimestampMillis = u64; pub type Revision = u64; pub type IdentityNonce = u64; + pub type FeeMultiplier = u64; } pub use bincode; diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index 012deee68a5..5a5a8ad88fc 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -45,7 +45,7 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGetter use crate::identity::signer::Signer; use crate::identity::state_transition::OptionallyAssetLockProved; use crate::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; -use crate::prelude::AssetLockProof; +use crate::prelude::{AssetLockProof, FeeMultiplier}; pub use state_transitions::*; use crate::serialization::Signable; @@ -295,6 +295,11 @@ impl StateTransition { call_method!(self, signature) } + /// returns the fee_multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + call_method!(self, fee_multiplier) + } + /// The transaction id is a single hash of the data with the signature pub fn transaction_id(&self) -> Result<[u8; 32], ProtocolError> { Ok(hash_single( @@ -327,6 +332,11 @@ impl StateTransition { call_method!(self, set_signature, signature) } + /// set fee multiplier + pub fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + call_method!(self, set_fee_multiplier, fee_multiplier) + } + /// set a new signature pub fn set_signature_public_key_id(&mut self, public_key_id: KeyID) { call_method_identity_signed!(self, set_signature_public_key_id, public_key_id) diff --git a/packages/rs-dpp/src/state_transition/serialization.rs b/packages/rs-dpp/src/state_transition/serialization.rs index f966b90ebba..dc4163413df 100644 --- a/packages/rs-dpp/src/state_transition/serialization.rs +++ b/packages/rs-dpp/src/state_transition/serialization.rs @@ -88,6 +88,7 @@ mod tests { let identity_topup_transition = IdentityTopUpTransitionV0 { asset_lock_proof: AssetLockProof::Instant(asset_lock_proof), identity_id: identity.id(), + fee_multiplier: 0, signature: [1u8; 65].to_vec().into(), }; let state_transition: StateTransition = identity_topup_transition.into(); @@ -125,6 +126,7 @@ mod tests { add_public_keys: add_public_keys_in_creation, disable_public_keys: vec![], public_keys_disabled_at: None, + fee_multiplier: 0, }; let key_signable_bytes = identity_update_transition @@ -192,6 +194,7 @@ mod tests { add_public_keys: add_public_keys_in_creation, disable_public_keys: vec![3, 4, 5], public_keys_disabled_at: Some(15), + fee_multiplier: 0, }; let key_signable_bytes = identity_update_transition @@ -246,6 +249,7 @@ mod tests { pooling: Pooling::Standard, output_script: CoreScript::from_bytes((0..23).collect::>()), nonce: 1, + fee_multiplier: 0, signature_public_key_id: 0, signature: [1u8; 65].to_vec().into(), }; @@ -296,6 +300,7 @@ mod tests { .data_contract_owned() .try_into_platform_versioned(platform_version) .expect("expected a data contract"), + fee_multiplier: 0, signature_public_key_id: 0, signature: [1u8; 65].to_vec().into(), }); diff --git a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs index 9080f26523e..b737c18781e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs @@ -2,6 +2,8 @@ pub mod property_names { pub const STATE_TRANSITION_PROTOCOL_VERSION: &str = "$version"; pub const IDENTITY_CONTRACT_NONCE: &str = "identityContractNonce"; pub const IDENTITY_NONCE: &str = "identityNonce"; + + pub const FEE_MULTIPLIER: &str = "feeMultiplier"; pub const SIGNATURE_PUBLIC_KEY_ID: &str = "signaturePublicKeyId"; pub const SIGNATURE: &str = "signature"; pub const TRANSITION_TYPE: &str = "type"; 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 4c629619aba..5ae02d073d1 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 @@ -2,6 +2,7 @@ use crate::state_transition::data_contract_create_transition::DataContractCreate use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for DataContractCreateTransition { /// Returns ID of the created contract @@ -35,6 +36,19 @@ impl StateTransitionLike for DataContractCreateTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DataContractCreateTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + DataContractCreateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn set_signature_bytes(&mut self, signature: Vec) { match self { DataContractCreateTransition::V0(transition) => { 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 973d127f172..c3e1a5e0d19 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 @@ -18,7 +18,7 @@ use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use bincode::{Decode, Encode}; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; @@ -37,6 +37,7 @@ use crate::version::PlatformVersion; pub struct DataContractCreateTransitionV0 { pub data_contract: DataContractInSerializationFormat, pub identity_nonce: IdentityNonce, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -67,6 +68,7 @@ impl TryFromPlatformVersioned for DataContractCreateTransitionV0 { Ok(DataContractCreateTransitionV0 { data_contract: value.try_into_platform_versioned(platform_version)?, identity_nonce: Default::default(), + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), }) @@ -84,6 +86,7 @@ impl TryFromPlatformVersioned for DataContractCreateTransit Ok(DataContractCreateTransitionV0 { data_contract: data_contract.try_into_platform_versioned(platform_version)?, identity_nonce, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), }) 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 d92fb6ec4e6..f9662b52d4a 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 @@ -4,6 +4,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; @@ -48,4 +49,12 @@ impl StateTransitionLike for DataContractCreateTransitionV0 { self.data_contract.id() )] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 20eb5f00e90..df4de10fe1e 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 @@ -38,6 +38,7 @@ impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransitionV0 { let transition = DataContractCreateTransition::V0(DataContractCreateTransitionV0 { data_contract: data_contract.try_into_platform_versioned(platform_version)?, identity_nonce, + fee_multiplier: 0, signature_public_key_id: key_id, signature: Default::default(), }); 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 64af95bf2c4..daa843c46f2 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 @@ -8,9 +8,11 @@ use crate::{data_contract::DataContract, ProtocolError}; use platform_version::TryIntoPlatformVersioned; use platform_version::version::PlatformVersion; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; +use crate::fee::default_costs::constants::DEFAULT_FEE_MULTIPLIER; 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::common_fields::property_names::FEE_MULTIPLIER; use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::{BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS}; impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { @@ -41,6 +43,10 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, + fee_multiplier: raw_object + .get_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(), }) } @@ -71,6 +77,10 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, + fee_multiplier: raw_value_map + .remove_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(), }) } 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 6f7196258e4..bf7db6eb685 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 @@ -12,7 +12,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use platform_version::version::PlatformVersion; impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { @@ -21,6 +21,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, feature_version: Option, @@ -37,6 +38,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity, key_id, identity_contract_nonce, + fee_multiplier, signer, platform_version, feature_version, 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 eacbc8925da..a7cb0c9543c 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 @@ -2,7 +2,7 @@ use crate::data_contract::DataContract; use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; @@ -27,6 +27,7 @@ pub trait DataContractUpdateTransitionMethodsV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 64cd37651d8..9cba257e571 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 @@ -2,6 +2,7 @@ use crate::state_transition::data_contract_update_transition::DataContractUpdate use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for DataContractUpdateTransition { /// Returns ID of the created contract @@ -54,4 +55,17 @@ impl StateTransitionLike for DataContractUpdateTransition { DataContractUpdateTransition::V0(transition) => transition.unique_identifiers(), } } + + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DataContractUpdateTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + DataContractUpdateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } } 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 51b74438c6a..aaa5cc88361 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,7 +18,7 @@ use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransition; use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; @@ -37,6 +37,7 @@ pub struct DataContractUpdateTransitionV0 { )] pub identity_contract_nonce: IdentityNonce, pub data_contract: DataContractInSerializationFormat, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -53,6 +54,7 @@ impl TryFromPlatformVersioned<(DataContract, IdentityNonce)> for DataContractUpd Ok(DataContractUpdateTransitionV0 { identity_contract_nonce: value.1, data_contract: value.0.try_into_platform_versioned(platform_version)?, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), }) 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 54e7e1e452e..c41367efd23 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 @@ -4,6 +4,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; @@ -49,4 +50,12 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 { self.identity_contract_nonce )] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 00793419858..03d844299d5 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 @@ -3,7 +3,7 @@ use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; use crate::serialization::Signable; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, @@ -20,6 +20,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, _feature_version: Option, @@ -27,6 +28,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { let transition = DataContractUpdateTransition::V0(DataContractUpdateTransitionV0 { identity_contract_nonce, data_contract: data_contract.try_into_platform_versioned(platform_version)?, + fee_multiplier, signature_public_key_id: key_id, signature: Default::default(), }); 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 25d7cf90988..a640674f7fc 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 @@ -4,7 +4,7 @@ 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::state_transition::state_transitions::common_fields::property_names::IDENTITY_CONTRACT_NONCE; +use crate::state_transition::state_transitions::common_fields::property_names::{FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE}; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; use crate::ProtocolError; @@ -76,6 +76,10 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, + fee_multiplier: raw_object + .get_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(), }) } @@ -110,6 +114,10 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, + fee_multiplier: raw_value_map + .remove_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(), }) } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs index bacbc32cd34..1ed5064c885 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::IdentityPublicKey; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransition; use crate::state_transition::documents_batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use crate::state_transition::documents_batch_transition::{ @@ -36,6 +36,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -56,6 +57,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy, identity_public_key, identity_contract_nonce, + fee_multiplier, signer, platform_version, batch_feature_version, @@ -77,6 +79,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -96,6 +99,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type, identity_public_key, identity_contract_nonce, + fee_multiplier, signer, platform_version, batch_feature_version, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs index 8670f2f5d34..7e60861f478 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::{IdentityPublicKey, SecurityLevel}; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -22,6 +22,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -35,6 +36,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index 463df4ab97d..6ac7f6a5934 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -2,6 +2,7 @@ use crate::state_transition::documents_batch_transition::DocumentsBatchTransitio use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for DocumentsBatchTransition { /// Returns ID of the created contract @@ -41,6 +42,19 @@ impl StateTransitionLike for DocumentsBatchTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DocumentsBatchTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + DocumentsBatchTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn owner_id(&self) -> Identifier { match self { DocumentsBatchTransition::V0(transition) => transition.owner_id(), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs index 11556521d3c..2ccc2fce539 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs @@ -17,6 +17,7 @@ use platform_serialization_derive::PlatformSignable; use platform_value::{BinaryData, Identifier}; use serde::{Deserialize, Serialize}; +use crate::prelude::FeeMultiplier; #[derive(Debug, Clone, PartialEq, Encode, Decode, PlatformSignable)] #[cfg_attr( @@ -27,6 +28,7 @@ use serde::{Deserialize, Serialize}; pub struct DocumentsBatchTransitionV0 { pub owner_id: Identifier, pub transitions: Vec, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index a3b21412746..16bcb5cc82b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -7,6 +7,7 @@ use crate::state_transition::StateTransitionType::DocumentsBatch; use crate::state_transition::{StateTransition, StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl From for StateTransition { fn from(value: DocumentsBatchTransitionV0) -> Self { @@ -60,4 +61,12 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 { }) .collect() } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index 5f23df7eee3..a7a889bcbd7 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::identity::signer::Signer; use crate::identity::SecurityLevel; -use crate::prelude::{IdentityNonce, IdentityPublicKey}; +use crate::prelude::{FeeMultiplier, IdentityNonce, IdentityPublicKey}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransition; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -34,6 +34,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -53,6 +54,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![create_transition.into()], + fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } @@ -72,6 +74,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -90,6 +93,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![replace_transition.into()], + fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } 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 6ef7dc800be..5092290e0ed 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 @@ -2,6 +2,7 @@ use crate::state_transition::identity_create_transition::IdentityCreateTransitio use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreateTransition { /// Returns ID of the created contract @@ -41,6 +42,19 @@ impl StateTransitionLike for IdentityCreateTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreateTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + IdentityCreateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn owner_id(&self) -> Identifier { match self { IdentityCreateTransition::V0(transition) => transition.owner_id(), 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 91b155844c5..b7436ee735a 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 @@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::Identity; -use crate::prelude::Identifier; +use crate::prelude::{FeeMultiplier, Identifier}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::state_transition::AssetLockProved; @@ -45,6 +45,7 @@ pub struct IdentityCreateTransitionV0 { #[platform_signable(into = "Vec")] pub public_keys: Vec, pub asset_lock_proof: AssetLockProof, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, #[cfg_attr(feature = "state-transition-serde-conversion", serde(skip))] @@ -62,6 +63,7 @@ struct IdentityCreateTransitionV0Inner { public_keys: Vec, asset_lock_proof: AssetLockProof, // Generic identity ST fields + fee_multiplier: FeeMultiplier, // protocol_version: u32, signature: BinaryData, } @@ -73,12 +75,13 @@ impl TryFrom for IdentityCreateTransitionV0 { let IdentityCreateTransitionV0Inner { public_keys, asset_lock_proof, - signature, + fee_multiplier, signature, } = value; let identity_id = asset_lock_proof.create_identifier()?; Ok(Self { public_keys, asset_lock_proof, + fee_multiplier, signature, identity_id, }) 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 98564128516..ab0c2456e20 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 @@ -5,6 +5,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::StateTransition; @@ -54,4 +55,12 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { fn unique_identifiers(&self) -> Vec { vec![base64::encode(self.identity_id)] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 4ed8e142ad8..a0ab6f69753 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 @@ -2,6 +2,7 @@ use crate::state_transition::identity_credit_transfer_transition::IdentityCredit use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreditTransferTransition { /// Returns ID of the credit_transferred contract @@ -43,6 +44,19 @@ impl StateTransitionLike for IdentityCreditTransferTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreditTransferTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + IdentityCreditTransferTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn owner_id(&self) -> Identifier { match self { IdentityCreditTransferTransition::V0(transition) => transition.owner_id(), 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 18bfa5dbbd9..4fb1ab608f6 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 @@ -10,7 +10,7 @@ mod version; use crate::identity::KeyID; -use crate::prelude::{Identifier, IdentityNonce, Revision}; +use crate::prelude::{FeeMultiplier, Identifier, IdentityNonce, Revision}; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -41,6 +41,7 @@ pub struct IdentityCreditTransferTransitionV0 { pub recipient_id: Identifier, pub amount: u64, pub nonce: IdentityNonce, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -78,6 +79,7 @@ mod test { recipient_id: Identifier::random(), amount: rng.gen(), nonce: 1, + fee_multiplier: 0, signature_public_key_id: rng.gen(), signature: [0; 65].to_vec().into(), }; 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 dcff4645868..1e22d51556b 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 @@ -4,6 +4,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; @@ -58,4 +59,12 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 { self.nonce )] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 e2ce78a39ff..921372694e4 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 @@ -8,7 +8,7 @@ use crate::identity::signer::Signer; use crate::identity::Identity; use crate::identity::core_script::CoreScript; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransition; use crate::version::PlatformVersion; @@ -23,6 +23,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, + fee_multiplier: FeeMultiplier, signer: S, nonce: IdentityNonce, platform_version: &PlatformVersion, @@ -40,6 +41,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount, pooling, core_fee_per_byte, + fee_multiplier, signer, nonce, platform_version, 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 af1205f67fe..0472f76811e 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 @@ -1,7 +1,7 @@ use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::Identity; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::withdrawal::Pooling; use crate::ProtocolError; @@ -15,6 +15,7 @@ pub trait IdentityCreditWithdrawalTransitionMethodsV0 { amount: u64, pooling: Pooling, core_fee_per_byte: u32, + fee_multiplier: FeeMultiplier, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, 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 2710ba1ab1d..7d8ec93da43 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 @@ -2,6 +2,7 @@ use crate::state_transition::identity_credit_withdrawal_transition::IdentityCred use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreditWithdrawalTransition { /// Returns ID of the credit_withdrawalred contract @@ -39,6 +40,19 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreditWithdrawalTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + IdentityCreditWithdrawalTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn set_signature_bytes(&mut self, signature: Vec) { match self { IdentityCreditWithdrawalTransition::V0(transition) => { 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 245651fcd45..8f8920b1ba4 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 @@ -15,7 +15,7 @@ use platform_value::BinaryData; use serde::{Deserialize, Serialize}; use crate::balances::credits::CREDITS_PER_DUFF; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::{ identity::{core_script::CoreScript, KeyID}, prelude::{Identifier, Revision}, @@ -45,6 +45,7 @@ pub struct IdentityCreditWithdrawalTransitionV0 { pub pooling: Pooling, pub output_script: CoreScript, pub nonce: IdentityNonce, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 d9fce1286e3..57839a75b85 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 @@ -4,6 +4,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; @@ -59,4 +60,12 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 { self.nonce )] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index c898036bafb..0c0b8419ef6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::identity::accessors::IdentityGettersV0; use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::{Identity, KeyType, Purpose, SecurityLevel}; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -19,6 +19,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, + fee_multiplier: FeeMultiplier, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, @@ -31,6 +32,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra pooling, output_script, nonce, + fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } 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 2983c6e0672..d7a13286f35 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 @@ -3,7 +3,7 @@ mod v0; pub use v0::*; use crate::identity::Identity; -use crate::prelude::AssetLockProof; +use crate::prelude::{AssetLockProof, FeeMultiplier}; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::StateTransition; @@ -18,6 +18,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], + fee_multiplier: FeeMultiplier, platform_version: &PlatformVersion, version: Option, ) -> Result { @@ -31,6 +32,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity, asset_lock_proof, asset_lock_proof_private_key, + fee_multiplier, platform_version, version, )?), 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 64918489d8a..5061deef80a 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,5 +1,5 @@ use crate::identity::Identity; -use crate::prelude::AssetLockProof; +use crate::prelude::{AssetLockProof, FeeMultiplier}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -10,6 +10,7 @@ pub trait IdentityTopUpTransitionMethodsV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], + fee_multiplier: FeeMultiplier, platform_version: &PlatformVersion, version: Option, ) -> Result; 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 6f8ef71baa0..41ce66cdf02 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 @@ -2,6 +2,7 @@ use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityTopUpTransition { /// Returns ID of the topupd contract @@ -41,6 +42,20 @@ impl StateTransitionLike for IdentityTopUpTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityTopUpTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + IdentityTopUpTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + + fn owner_id(&self) -> Identifier { match self { IdentityTopUpTransition::V0(transition) => transition.owner_id(), 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 f2bd2b06162..cbbc809a4a2 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 @@ -17,7 +17,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; -use crate::prelude::Identifier; +use crate::prelude::{FeeMultiplier, Identifier}; use crate::ProtocolError; @@ -40,6 +40,7 @@ pub struct IdentityTopUpTransitionV0 { // Own ST fields pub asset_lock_proof: AssetLockProof, pub identity_id: Identifier, + pub fee_multiplier: FeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, } 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 ad8a66aa850..cae2d49c342 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 @@ -6,6 +6,7 @@ use crate::{ state_transition::{StateTransitionLike, StateTransitionType}, ProtocolError, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; @@ -66,4 +67,12 @@ impl StateTransitionLike for IdentityTopUpTransitionV0 { } } } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 425c50f012f..c780fdddca4 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 @@ -3,7 +3,7 @@ use dashcore::signer; use crate::identity::accessors::IdentityGettersV0; use crate::identity::Identity; -use crate::prelude::AssetLockProof; +use crate::prelude::{AssetLockProof, FeeMultiplier}; use crate::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; use crate::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; @@ -21,12 +21,14 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], + fee_multiplier: FeeMultiplier, _platform_version: &PlatformVersion, _version: Option, ) -> Result { let identity_top_up_transition = IdentityTopUpTransitionV0 { asset_lock_proof, identity_id: identity.id(), + fee_multiplier, signature: Default::default(), }; 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 d1dd35f4c4e..9f9ac089bc9 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 @@ -12,6 +12,7 @@ use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransit use crate::state_transition::StateTransitionValueConvert; use platform_version::version::PlatformVersion; +use crate::state_transition::state_transitions::common_fields::property_names::FEE_MULTIPLIER; impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { fn from_object( @@ -33,10 +34,13 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { .map_err(ProtocolError::ValueError)?; let asset_lock_proof = AssetLockProof::try_from(raw_asset_lock_proof)?; + let fee_multiplier = raw_object.get_optional_integer(FEE_MULTIPLIER).map_err(ProtocolError::ValueError)?.unwrap_or_default(); + Ok(IdentityTopUpTransitionV0 { signature, identity_id, asset_lock_proof, + fee_multiplier, }) } 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 b6c0e802dc3..5a450fa95f8 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 @@ -11,7 +11,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use platform_version::version::PlatformVersion; impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { @@ -23,6 +23,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, version: Option, @@ -41,6 +42,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys, public_keys_disabled_at, nonce, + fee_multiplier, signer, platform_version, version, 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 ea675e04e64..ca436d72b7e 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 @@ -2,7 +2,7 @@ use platform_version::version::PlatformVersion; use crate::identity::signer::Signer; use crate::identity::{Identity, IdentityPublicKey}; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::{identity::KeyID, state_transition::StateTransitionType, ProtocolError}; @@ -16,6 +16,7 @@ pub trait IdentityUpdateTransitionMethodsV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, platform_version: &PlatformVersion, version: Option, 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 7b8aaef35b1..5a473e4abd6 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 @@ -2,6 +2,7 @@ use crate::state_transition::identity_update_transition::IdentityUpdateTransitio use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; +use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityUpdateTransition { /// Returns ID of the updated contract @@ -41,6 +42,19 @@ impl StateTransitionLike for IdentityUpdateTransition { } } + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityUpdateTransition::V0(transition) => transition.fee_multiplier(), + } + } + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + match self { + IdentityUpdateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + } + } + fn owner_id(&self) -> Identifier { match self { IdentityUpdateTransition::V0(transition) => transition.owner_id(), 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 2cdaa09100a..925d4c01a67 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 @@ -29,6 +29,7 @@ mod test { add_public_keys: vec![public_key.into()], disable_public_keys: vec![], public_keys_disabled_at: None, + fee_multiplier: 0, signature_public_key_id: 0, signature: BinaryData::new(buffer.to_vec()), } 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 df59c947b09..32f215a8068 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 @@ -18,7 +18,7 @@ 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::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; use crate::{ identity::KeyID, prelude::{Identifier, Revision, TimestampMillis}, @@ -59,6 +59,9 @@ pub struct IdentityUpdateTransitionV0 { /// Timestamp when keys were disabled pub public_keys_disabled_at: Option, + /// The fee multiplier + pub fee_multiplier: FeeMultiplier, + /// The ID of the public key used to sing the State Transition #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, 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 12e38921b12..9b8b80b6900 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 @@ -4,6 +4,7 @@ use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::identity_update_transition::IdentityUpdateTransition; @@ -58,4 +59,12 @@ impl StateTransitionLike for IdentityUpdateTransitionV0 { self.nonce )] } + + fn fee_multiplier(&self) -> FeeMultiplier { + self.fee_multiplier + } + + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + self.fee_multiplier = fee_multiplier + } } 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 7a32bde43f0..be86537b5c6 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 @@ -11,7 +11,7 @@ use crate::identity::{Identity, IdentityPublicKey}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::prelude::IdentityNonce; +use crate::prelude::{FeeMultiplier, IdentityNonce}; 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; @@ -34,6 +34,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, + fee_multiplier: FeeMultiplier, signer: &S, _platform_version: &PlatformVersion, _version: Option, @@ -52,6 +53,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { add_public_keys: add_public_keys_in_creation, disable_public_keys, public_keys_disabled_at, + fee_multiplier, }; let state_transition: StateTransition = identity_update_transition.clone().into(); 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 abe58de381f..0c72a22ce04 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 @@ -9,7 +9,7 @@ use crate::state_transition::identity_update_transition::v0::{ use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::state_transitions::common_fields::property_names::NONCE; +use crate::state_transition::state_transitions::common_fields::property_names::{FEE_MULTIPLIER, NONCE}; use platform_version::version::PlatformVersion; impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { @@ -33,6 +33,9 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { let nonce = raw_object .get_integer(NONCE) .map_err(ProtocolError::ValueError)?; + let fee_multiplier = raw_object + .get_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)?.unwrap_or_default(); let add_public_keys = raw_object .remove_optional_array(property_names::ADD_PUBLIC_KEYS) .map_err(ProtocolError::ValueError)? @@ -55,6 +58,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { add_public_keys, disable_public_keys, public_keys_disabled_at, + fee_multiplier, }) } 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 efed047cd47..68e18754eba 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 @@ -2,7 +2,7 @@ use std::fmt::Debug; use platform_value::BinaryData; -use crate::prelude::Identifier; +use crate::prelude::{FeeMultiplier, Identifier}; use crate::version::FeatureVersion; use crate::state_transition::StateTransitionType; @@ -37,6 +37,10 @@ pub trait StateTransitionLike: fn signature(&self) -> &BinaryData; /// set a new signature fn set_signature(&mut self, signature: BinaryData); + /// returns the fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier; + /// set a fee multiplier + fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier); /// get modified ids list fn modified_data_ids(&self) -> Vec; 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 63eed5b87f2..6bf45c97098 100644 --- a/packages/rs-drive-abci/src/abci/handler/check_tx.rs +++ b/packages/rs-drive-abci/src/abci/handler/check_tx.rs @@ -56,7 +56,7 @@ where gas_wanted: gas_wanted as SignedCredits, codespace: "".to_string(), sender: first_unique_identifier, - priority: 0, + priority: check_tx_result.priority as i64, }) } Err(error) => { 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 c856e4d1798..42bec3fffc1 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/mod.rs @@ -65,6 +65,9 @@ pub struct CheckTxResult { /// reject the transition. All transitions return only 1 unique identifier except the documents /// batch transition that returns 1 for each document transition pub unique_identifiers: Vec, + /// Priority to return to tenderdash. State Transitions with higher priority take precedence + /// over state transitions with lower priority + pub priority: u64, } impl Platform 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 ea5d271d2d9..804ad0ff866 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 @@ -113,6 +113,8 @@ where let unique_identifiers = state_transition.unique_identifiers(); + let priority = state_transition.fee_multiplier(); + let validation_result = state_transition_to_execution_event_for_check_tx( &platform_ref, state_transition, @@ -133,6 +135,7 @@ where level: check_tx_level, fee_result: Some(fee_result), unique_identifiers, + priority, }) }) } else { @@ -140,6 +143,7 @@ where level: check_tx_level, fee_result: None, unique_identifiers, + priority, })) } }) @@ -372,7 +376,120 @@ mod tests { let transaction = platform.drive.grove.start_transaction(); + let processing_result = platform + .platform + .process_raw_state_transitions( + &vec![serialized.clone()], + &state, + &BlockInfo::default(), + &transaction, + platform_version, + ) + .expect("expected to process state transition"); + + assert_eq!(processing_result.aggregated_fees().processing_fee, 2604790); + + let check_result = platform + .check_tx(serialized.as_slice(), Recheck, platform_version) + .expect("expected to check tx"); + + assert!(check_result.is_valid()); // it should still be valid, because we didn't commit the transaction + + platform + .drive + .grove + .commit_transaction(transaction) + .unwrap() + .expect("expected to commit"); + + let check_result = platform + .check_tx(serialized.as_slice(), Recheck, platform_version) + .expect("expected to check tx"); + + assert!(check_result.is_valid()); // it should still be valid, because we don't validate state + } + + #[test] + fn data_contract_create_check_tx_priority() { + let mut platform = TestPlatformBuilder::new() + .with_config(PlatformConfig::default()) + .build_with_mock_rpc(); + + platform + .core_rpc + .expect_verify_instant_lock() + .returning(|_, _| Ok(true)); + + let state = platform.state.read(); + let protocol_version = state.current_protocol_version_in_consensus(); + let platform_version = PlatformVersion::get(protocol_version).unwrap(); + + let (key, private_key) = IdentityPublicKey::random_ecdsa_critical_level_authentication_key( + 1, + Some(1), + platform_version, + ) + .expect("expected to get key pair"); + + platform + .drive + .create_initial_state_structure(None, platform_version) + .expect("expected to create state structure"); + let identity: Identity = IdentityV0 { + id: Identifier::new([ + 158, 113, 180, 126, 91, 83, 62, 44, 83, 54, 97, 88, 240, 215, 84, 139, 167, 156, + 166, 203, 222, 4, 64, 31, 215, 199, 149, 151, 190, 246, 251, 44, + ]), + public_keys: BTreeMap::from([(1, key.clone())]), + balance: 1000000000, + revision: 0, + } + .into(); + + let dashpay = get_dashpay_contract_fixture(Some(identity.id()), 1, protocol_version); + let mut create_contract_state_transition: StateTransition = dashpay + .try_into_platform_versioned(platform_version) + .expect("expected a state transition"); + + create_contract_state_transition.set_fee_multiplier(100); // This means that things will be twice as expensive + + create_contract_state_transition + .sign(&key, private_key.as_slice(), &NativeBlsModule) + .expect("expected to sign transition"); + let serialized = create_contract_state_transition + .serialize_to_bytes() + .expect("serialized state transition"); platform + .drive + .add_new_identity( + identity, + false, + &BlockInfo::default(), + true, + None, + platform_version, + ) + .expect("expected to insert identity"); + + let validation_result = platform + .check_tx(serialized.as_slice(), FirstTimeCheck, platform_version) + .expect("expected to check tx"); + + assert!(validation_result.errors.is_empty()); + + assert_eq!(validation_result.data.unwrap().priority, 100); + + let check_result = platform + .check_tx(serialized.as_slice(), Recheck, platform_version) + .expect("expected to check tx"); + + assert!(check_result.is_valid()); + + assert_eq!(check_result.data.unwrap().priority, 100); + + let transaction = platform.drive.grove.start_transaction(); + + let processing_result = platform .platform .process_raw_state_transitions( &vec![serialized.clone()], @@ -383,12 +500,18 @@ mod tests { ) .expect("expected to process state transition"); + // The processing fees should be twice as much as a fee multiplier of 0, + // since a fee multiplier of 100 means 100% more of 1 (gives 2) + assert_eq!(processing_result.aggregated_fees().processing_fee, 2604790 * 2); + let check_result = platform .check_tx(serialized.as_slice(), Recheck, platform_version) .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we didn't commit the transaction + assert_eq!(check_result.data.unwrap().priority, 100); + platform .drive .grove @@ -401,6 +524,8 @@ mod tests { .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we don't validate state + + assert_eq!(check_result.data.unwrap().priority, 100); } #[test] @@ -615,6 +740,7 @@ mod tests { entropy.0, &key, 1, + 0, &signer, platform_version, None, @@ -633,6 +759,7 @@ mod tests { profile, &key, 2, + 0, &signer, platform_version, None, @@ -778,6 +905,7 @@ mod tests { &identity, asset_lock_proof_top_up, pk.as_slice(), + 0, platform_version, None, ) @@ -906,6 +1034,7 @@ mod tests { &identity, asset_lock_proof_top_up, pk.as_slice(), + 0, platform_version, None, ) @@ -1035,6 +1164,7 @@ mod tests { &identity, asset_lock_proof_top_up, pk.as_slice(), + 0, platform_version, None, ) @@ -1154,6 +1284,7 @@ mod tests { &identity, asset_lock_proof_top_up.clone(), pk.as_slice(), + 0, platform_version, None, ) @@ -1337,6 +1468,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key)], disable_public_keys: vec![], public_keys_disabled_at: None, + fee_multiplier: 0, signature_public_key_id: 1, signature: Default::default(), } @@ -1448,6 +1580,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key.clone())], disable_public_keys: vec![], public_keys_disabled_at: None, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } @@ -1472,6 +1605,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key)], disable_public_keys: vec![], public_keys_disabled_at: None, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } 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 c5cc4e1a01b..f4c3c92a604 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 @@ -56,12 +56,14 @@ where identity, operations, execution_operations, + fee_multiplier, .. } | ExecutionEvent::PaidDriveEvent { identity, operations, execution_operations, + fee_multiplier, .. } => { if fee_validation_result.is_valid_with_data() { @@ -84,6 +86,8 @@ where platform_version, )?; + individual_fee_result.apply_fee_multiplier(fee_multiplier); + let balance_change = individual_fee_result.into_balance_change(identity.id); let outcome = self.drive.apply_balance_change_from_fee_to_identity( 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 be0d150f59f..29d793b4474 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 @@ -48,6 +48,7 @@ where added_balance, operations, execution_operations, + fee_multiplier, } => { let previous_balance = identity.balance.ok_or(Error::Execution( ExecutionError::CorruptedCodeExecution("partial identity info with no balance"), @@ -71,6 +72,8 @@ where platform_version, )?; + estimated_fee_result.apply_fee_multiplier(*fee_multiplier); + // TODO: Should take into account refunds as well let total_fee = estimated_fee_result.total_base_fee(); if previous_balance_with_top_up >= total_fee { @@ -96,6 +99,7 @@ where removed_balance, operations, execution_operations, + fee_multiplier, } => { let balance = identity.balance.ok_or(Error::Execution( ExecutionError::CorruptedCodeExecution("partial identity info with no balance"), @@ -120,6 +124,8 @@ where platform_version, )?; + estimated_fee_result.apply_fee_multiplier(*fee_multiplier); + // TODO: Should take into account refunds as well let required_balance = estimated_fee_result.total_base_fee(); if balance_after_principal_operation >= required_balance { 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 6ff45363d5f..4600daa1609 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 @@ -9,6 +9,7 @@ use dpp::block::epoch::Epoch; use dpp::fee::Credits; use dpp::identity::PartialIdentity; +use dpp::prelude::FeeMultiplier; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; @@ -33,6 +34,8 @@ pub(in crate::execution) enum ExecutionEvent<'a> { operations: Vec>, /// the execution operations that we must also pay for execution_operations: Vec, + /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% + fee_multiplier: FeeMultiplier, }, /// A drive event that is paid from an asset lock PaidFromAssetLockDriveEvent { @@ -44,6 +47,8 @@ pub(in crate::execution) enum ExecutionEvent<'a> { operations: Vec>, /// the execution operations that we must also pay for execution_operations: Vec, + /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% + fee_multiplier: FeeMultiplier, }, /// A drive event that is free FreeDriveEvent { @@ -62,6 +67,7 @@ impl<'a> ExecutionEvent<'a> { ) -> Result { match &action { StateTransitionAction::IdentityCreateAction(identity_create_action) => { + let fee_multiplier = identity_create_action.fee_multiplier(); let identity = identity_create_action.into(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -70,9 +76,11 @@ impl<'a> ExecutionEvent<'a> { added_balance: 0, operations, execution_operations: execution_context.operations_consume(), + fee_multiplier, }) } StateTransitionAction::IdentityTopUpAction(identity_top_up_action) => { + let fee_multiplier = identity_top_up_action.fee_multiplier(); let added_balance = identity_top_up_action.top_up_balance_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -82,6 +90,7 @@ impl<'a> ExecutionEvent<'a> { added_balance, operations, execution_operations: execution_context.operations_consume(), + fee_multiplier, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -90,6 +99,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditWithdrawalAction(identity_credit_withdrawal) => { + let fee_multiplier = identity_credit_withdrawal.fee_multiplier(); let removed_balance = identity_credit_withdrawal.amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -99,6 +109,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: Some(removed_balance), operations, execution_operations: execution_context.operations_consume(), + fee_multiplier, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -107,6 +118,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditTransferAction(identity_credit_transfer) => { + let fee_multiplier = identity_credit_transfer.fee_multiplier(); let removed_balance = identity_credit_transfer.transfer_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -116,6 +128,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: Some(removed_balance), operations, execution_operations: execution_context.operations_consume(), + fee_multiplier, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -124,6 +137,7 @@ impl<'a> ExecutionEvent<'a> { } } _ => { + let fee_multiplier = action.fee_multiplier(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; if let Some(identity) = identity { @@ -132,6 +146,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: None, operations, execution_operations: execution_context.operations_consume(), + fee_multiplier }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( 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 3d69dd24691..b9a12a26153 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 @@ -185,6 +185,7 @@ mod tests { platform_version, ) .expect("to be able to convert data contract to serialization format"), + fee_multiplier: 0, signature: BinaryData::new(vec![0; 65]), signature_public_key_id: 0, }; @@ -265,6 +266,7 @@ mod tests { platform_version, ) .expect("to be able to convert data contract to serialization format"), + fee_multiplier: 0, signature: BinaryData::new(vec![0; 65]), signature_public_key_id: 0, }; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs index 58241cb6135..3dec4101ebd 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs @@ -94,6 +94,7 @@ impl DocumentsBatchStateTransitionStateValidationV0 for DocumentsBatchTransition ), ))?, owner_id, + state_transition_action.fee_multiplier(), )?, ), ); @@ -135,6 +136,7 @@ impl DocumentsBatchStateTransitionStateValidationV0 for DocumentsBatchTransition ), ))?, owner_id, + state_transition_action.fee_multiplier(), )?, ), ); diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs index 06dab8e8938..1f0c4cb5270 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs @@ -103,6 +103,7 @@ impl DocumentsBatchTransitionTransformerV0 for DocumentsBatchTransition { execution_context: &mut StateTransitionExecutionContext, ) -> Result, Error> { let owner_id = self.owner_id(); + let fee_multiplier = self.fee_multiplier(); let platform_version = platform.state.current_platform_version()?; let mut transitions_by_contracts_and_types: BTreeMap< &Identifier, @@ -155,6 +156,7 @@ impl DocumentsBatchTransitionTransformerV0 for DocumentsBatchTransition { let batch_transition_action = DocumentsBatchTransitionActionV0 { owner_id, transitions: validation_result.into_data()?, + fee_multiplier, } .into(); Ok(ConsensusValidationResult::new_with_data( diff --git a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs index 28a7b53e23c..07e0240e3a4 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs @@ -466,6 +466,7 @@ impl NetworkStrategy { &identity, 1, //key id 1 should always be a high or critical auth key in these tests *identity_contract_nonce, + 0, signer, platform_version, None, @@ -554,6 +555,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], + fee_multiplier: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -668,6 +670,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], + fee_multiplier: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -766,6 +769,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_delete_transition.into()], + fee_multiplier: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -866,6 +870,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_replace_transition.into()], + fee_multiplier: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -1108,6 +1113,7 @@ impl NetworkStrategy { identity, asset_lock_proof, secret_key.as_ref(), + 0, platform_version, None, ) diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index 8cd87549918..aba8007e336 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// data contract create transition action #[derive(Debug, Clone, From)] @@ -35,4 +35,11 @@ impl DataContractCreateTransitionAction { DataContractCreateTransitionAction::V0(transition) => transition.identity_nonce, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DataContractCreateTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs index 955583b9134..8520aafe292 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// data contract create transition action v0 #[derive(Debug, Clone)] @@ -11,4 +11,6 @@ pub struct DataContractCreateTransitionActionV0 { pub data_contract: DataContract, /// identity nonce pub identity_nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } 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 01851b398be..c55623be8b2 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 @@ -21,6 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_nonce: value.identity_nonce, + fee_multiplier: value.fee_multiplier, }) } } @@ -41,6 +42,7 @@ impl TryFromPlatformVersioned<&DataContractCreateTransitionV0> platform_version, )?, identity_nonce: value.identity_nonce, + fee_multiplier: value.fee_multiplier, }) } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index 525bb128331..d7820ea0bf7 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// data contract update transition action #[derive(Debug, Clone, From)] @@ -37,4 +37,11 @@ impl DataContractUpdateTransitionAction { } } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DataContractUpdateTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs index 84e8bce987b..ebb9bacd532 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// data contract update transition action v0 #[derive(Debug, Clone)] @@ -11,4 +11,6 @@ pub struct DataContractUpdateTransitionActionV0 { pub data_contract: DataContract, /// identity contract nonce pub identity_contract_nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } 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 ecbad8494fb..7a69368d51a 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 @@ -21,6 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, + fee_multiplier: value.fee_multiplier, }) } } @@ -41,6 +42,7 @@ impl TryFromPlatformVersioned<&DataContractUpdateTransitionV0> platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, + fee_multiplier: value.fee_multiplier, }) } } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs index db1ff2017ba..a7131424277 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs @@ -5,6 +5,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identity::SecurityLevel; use dpp::platform_value::Identifier; +use dpp::prelude::FeeMultiplier; use dpp::ProtocolError; use crate::state_transition_action::document::documents_batch::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; @@ -62,6 +63,13 @@ impl DocumentsBatchTransitionAction { DocumentsBatchTransitionAction::V0(v0) => v0.transitions = transitions, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + DocumentsBatchTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } impl DocumentsBatchTransitionAction { diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs index 62689f8607d..f4d29d51a84 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs @@ -1,5 +1,6 @@ use crate::state_transition_action::document::documents_batch::document_transition::DocumentTransitionAction; use dpp::identifier::Identifier; +use dpp::prelude::FeeMultiplier; /// action v0 #[derive(Default, Debug, Clone)] @@ -8,4 +9,6 @@ pub struct DocumentsBatchTransitionActionV0 { pub owner_id: Identifier, /// The inner transitions pub transitions: Vec, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs index bafaaeca538..4b3766797f2 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs @@ -9,6 +9,7 @@ use crate::state_transition_action::identity::identity_create::v0::{ use derive_more::From; use dpp::identity::{Identity, IdentityPublicKey, PartialIdentity}; use dpp::platform_value::{Bytes36, Identifier}; +use dpp::prelude::FeeMultiplier; use dpp::version::PlatformVersion; use dpp::ProtocolError; @@ -48,6 +49,13 @@ impl IdentityCreateTransitionAction { IdentityCreateTransitionAction::V0(action) => action.asset_lock_outpoint, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreateTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } impl From for PartialIdentity { 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 e3b71152936..142b6c423c3 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 @@ -10,6 +10,7 @@ use dpp::platform_value::Bytes36; use dpp::version::PlatformVersion; use dpp::ProtocolError; use serde::{Deserialize, Serialize}; +use dpp::prelude::FeeMultiplier; /// action v0 #[derive(Default, Debug, Clone, Serialize, Deserialize)] @@ -23,6 +24,8 @@ pub struct IdentityCreateTransitionActionV0 { pub identity_id: Identifier, /// asset lock outpoint pub asset_lock_outpoint: Bytes36, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } impl From for PartialIdentity { 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 c41f188bbc4..f17a20409d6 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 @@ -36,6 +36,7 @@ impl IdentityCreateTransitionActionV0 { initial_balance_amount, identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), + fee_multiplier: value.fee_multiplier, }) } @@ -66,6 +67,7 @@ impl IdentityCreateTransitionActionV0 { initial_balance_amount, identity_id: *identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), + fee_multiplier: value.fee_multiplier, }) } } 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 44bb92d031a..a3cf567e9dc 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 @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_credit_transfer::v0::Iden use derive_more::From; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -44,4 +44,11 @@ impl IdentityCreditTransferTransitionAction { IdentityCreditTransferTransitionAction::V0(transition) => transition.recipient_id, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreditTransferTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } 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 b850805b35f..2d2a1ec1d44 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 @@ -2,7 +2,7 @@ mod transformer; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; use serde::{Deserialize, Serialize}; /// action v0 @@ -17,4 +17,6 @@ pub struct IdentityCreditTransferTransitionActionV0 { pub identity_id: Identifier, /// nonce pub nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs index 356147f1f55..e9b27796c4c 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs @@ -8,6 +8,7 @@ impl From for IdentityCreditTransferTransiti recipient_id, amount, nonce, + fee_multiplier, .. } = value; IdentityCreditTransferTransitionActionV0 { @@ -15,6 +16,7 @@ impl From for IdentityCreditTransferTransiti recipient_id, transfer_amount: amount, nonce, + fee_multiplier, } } } @@ -26,6 +28,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id, amount, nonce, + fee_multiplier, .. } = value; IdentityCreditTransferTransitionActionV0 { @@ -33,6 +36,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id: *recipient_id, transfer_amount: *amount, nonce: *nonce, + fee_multiplier: *fee_multiplier, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index 08f4a46eff1..e72bbe4f72b 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -8,7 +8,7 @@ use derive_more::From; use dpp::document::Document; use dpp::platform_value::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -56,4 +56,11 @@ impl IdentityCreditWithdrawalTransitionAction { } } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs index 858a08122dc..ea9adb42bed 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::document::Document; use dpp::identifier::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; use serde::{Deserialize, Serialize}; @@ -18,4 +18,6 @@ pub struct IdentityCreditWithdrawalTransitionActionV0 { pub prepared_withdrawal_document: Document, /// amount pub amount: u64, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } 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 90ec624839c..6984796563d 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 @@ -47,6 +47,7 @@ impl IdentityCreditWithdrawalTransitionActionV0 { nonce: identity_credit_withdrawal.nonce, prepared_withdrawal_document: withdrawal_document, amount: identity_credit_withdrawal.amount, + fee_multiplier: identity_credit_withdrawal.fee_multiplier, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs index 0743a68fb08..706535cb763 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs @@ -7,6 +7,7 @@ use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpT use derive_more::From; use dpp::platform_value::{Bytes36, Identifier}; +use dpp::prelude::FeeMultiplier; /// action #[derive(Debug, Clone, From)] @@ -36,4 +37,11 @@ impl IdentityTopUpTransitionAction { IdentityTopUpTransitionAction::V0(action) => action.asset_lock_outpoint, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityTopUpTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } 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 2c718c420b0..6811b5c3a53 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 @@ -4,6 +4,7 @@ use dpp::identifier::Identifier; use dpp::platform_value::Bytes36; use serde::{Deserialize, Serialize}; +use dpp::prelude::FeeMultiplier; /// action v0 #[derive(Default, Debug, Clone, Serialize, Deserialize)] @@ -15,4 +16,6 @@ pub struct IdentityTopUpTransitionActionV0 { pub identity_id: Identifier, /// asset lock outpoint pub asset_lock_outpoint: Bytes36, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } 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 d14579d294a..502d94b0637 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 @@ -17,6 +17,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, + fee_multiplier, .. } = value; @@ -34,6 +35,7 @@ impl IdentityTopUpTransitionActionV0 { top_up_balance_amount, identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), + fee_multiplier, }) } @@ -45,6 +47,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, + fee_multiplier, .. } = value; @@ -62,6 +65,7 @@ impl IdentityTopUpTransitionActionV0 { top_up_balance_amount, identity_id: *identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), + fee_multiplier: *fee_multiplier, }) } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index 564fa1a141d..c766fafdb38 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -7,7 +7,8 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdat use derive_more::From; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; use dpp::platform_value::Identifier; -use dpp::prelude::Revision; +use dpp::prelude::{FeeMultiplier, Revision}; +use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; /// action #[derive(Debug, Clone, From)] @@ -59,4 +60,11 @@ impl IdentityUpdateTransitionAction { IdentityUpdateTransitionAction::V0(transition) => transition.revision, } } + + /// fee multiplier + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + IdentityUpdateTransitionAction::V0(transition) => transition.fee_multiplier, + } + } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs index c85f4d09f37..6174bc9a2d7 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; -use dpp::prelude::{IdentityNonce, Revision}; +use dpp::prelude::{FeeMultiplier, IdentityNonce, Revision}; use serde::{Deserialize, Serialize}; /// action v0 @@ -21,4 +21,6 @@ pub struct IdentityUpdateTransitionActionV0 { pub revision: Revision, /// nonce used to prevent replay attacks pub nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } 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 4400b10ed6e..a949d1e198c 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 @@ -10,6 +10,7 @@ impl From for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, + fee_multiplier, .. } = value; IdentityUpdateTransitionActionV0 { @@ -19,6 +20,7 @@ impl From for IdentityUpdateTransitionActionV0 { identity_id, revision, nonce, + fee_multiplier, } } } @@ -32,6 +34,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, + fee_multiplier, .. } = value; IdentityUpdateTransitionActionV0 { @@ -44,6 +47,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { identity_id: *identity_id, revision: *revision, nonce: *nonce, + fee_multiplier: *fee_multiplier, } } } diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index c0385bbef1f..6e61288c34f 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -16,9 +16,10 @@ use crate::state_transition_action::identity::identity_credit_transfer::Identity use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; use crate::state_transition_action::identity::identity_topup::IdentityTopUpTransitionAction; use crate::state_transition_action::identity::identity_update::IdentityUpdateTransitionAction; -use crate::state_transition_action::system::bump_identity_data_contract_nonce_action::BumpIdentityDataContractNonceAction; -use crate::state_transition_action::system::bump_identity_nonce_action::BumpIdentityNonceAction; +use crate::state_transition_action::system::bump_identity_data_contract_nonce_action::{BumpIdentityDataContractNonceAction, BumpIdentityDataContractNonceActionAccessorsV0}; +use crate::state_transition_action::system::bump_identity_nonce_action::{BumpIdentityNonceAction, BumpIdentityNonceActionAccessorsV0}; use derive_more::From; +use dpp::prelude::FeeMultiplier; /// ST action #[derive(Debug, Clone, From)] @@ -48,3 +49,21 @@ pub enum StateTransitionAction { /// it will also only happen if the state validation fails BumpIdentityDataContractNonceAction(BumpIdentityDataContractNonceAction), } + +impl StateTransitionAction { + /// The fee multiplier for the action + pub fn fee_multiplier(&self) -> FeeMultiplier { + match self { + StateTransitionAction::DataContractCreateAction(action) => action.fee_multiplier(), + StateTransitionAction::DataContractUpdateAction(action) => action.fee_multiplier(), + StateTransitionAction::DocumentsBatchAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityCreateAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityTopUpAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityCreditWithdrawalAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityUpdateAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityCreditTransferAction(action) => action.fee_multiplier(), + StateTransitionAction::BumpIdentityNonceAction(action) => action.fee_multiplier(), + StateTransitionAction::BumpIdentityDataContractNonceAction(action) => action.fee_multiplier(), + } + } +} diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index 68be72fc6be..3cadfb145d0 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// transformer module pub mod transformer; @@ -34,4 +34,10 @@ impl BumpIdentityDataContractNonceActionAccessorsV0 for BumpIdentityDataContract BumpIdentityDataContractNonceAction::V0(v0) => v0.identity_contract_nonce, } } + + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + BumpIdentityDataContractNonceAction::V0(transition) => transition.fee_multiplier, + } + } } 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 10f46f6f141..99b4e076bd9 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,4 +1,5 @@ use dpp::platform_value::Identifier; +use dpp::prelude::FeeMultiplier; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; @@ -12,10 +13,11 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition( value: DocumentBaseTransition, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( - BumpIdentityDataContractNonceActionV0::try_from_base_transition(v0, identity_id)? + BumpIdentityDataContractNonceActionV0::try_from_base_transition(v0, identity_id, fee_multiplier)? .into(), ), } @@ -25,12 +27,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_borrowed_document_base_transition( value: &DocumentBaseTransition, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_borrowed_base_transition( v0, identity_id, + fee_multiplier, )? .into(), ), @@ -41,12 +45,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition_action( value: DocumentBaseTransitionAction, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_base_transition_action( v0, identity_id, + fee_multiplier, )? .into(), ), @@ -57,12 +63,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_borrowed_base_transition_action( value: &DocumentBaseTransitionAction, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_borrowed_base_transition_action( v0, identity_id, + fee_multiplier, )? .into(), ), diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index 4d812bb703b..8c0ba77a24a 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity data contract nonce action @@ -14,6 +14,8 @@ pub struct BumpIdentityDataContractNonceActionV0 { pub data_contract_id: Identifier, /// The identity contract nonce, this is used to stop replay attacks pub identity_contract_nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } /// document base transition action accessors v0 @@ -24,4 +26,6 @@ pub trait BumpIdentityDataContractNonceActionAccessorsV0 { fn data_contract_id(&self) -> Identifier; /// Identity contract nonce fn identity_contract_nonce(&self) -> IdentityNonce; + /// Fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier; } 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 f7219d1f594..fa8e044f53e 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,5 +1,6 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::platform_value::Identifier; +use dpp::prelude::FeeMultiplier; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; @@ -13,6 +14,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition( value: DocumentBaseTransitionV0, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -23,6 +25,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id, identity_contract_nonce, + fee_multiplier, }) } @@ -30,6 +33,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition( value: &DocumentBaseTransitionV0, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -40,6 +44,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: *data_contract_id, identity_contract_nonce: *identity_contract_nonce, + fee_multiplier, }) } @@ -47,6 +52,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition_action( value: DocumentBaseTransitionActionV0, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -57,6 +63,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: data_contract.contract.id(), identity_contract_nonce, + fee_multiplier, }) } @@ -64,6 +71,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition_action( value: &DocumentBaseTransitionActionV0, identity_id: Identifier, + fee_multiplier: FeeMultiplier, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -74,6 +82,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: data_contract.contract.id(), identity_contract_nonce: *identity_contract_nonce, + fee_multiplier, }) } @@ -84,12 +93,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, + fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce, + fee_multiplier, }) } @@ -100,12 +111,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, + fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce: *identity_contract_nonce, + fee_multiplier: *fee_multiplier, }) } @@ -116,12 +129,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionActionV0 { data_contract, identity_contract_nonce, + fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce, + fee_multiplier, }) } @@ -132,12 +147,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionActionV0 { data_contract, identity_contract_nonce, + fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce: *identity_contract_nonce, + fee_multiplier: *fee_multiplier, }) } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index c586a02020e..580aae7ac74 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; /// transformer module pub mod transformer; @@ -28,4 +28,10 @@ impl BumpIdentityNonceActionAccessorsV0 for BumpIdentityNonceAction { BumpIdentityNonceAction::V0(v0) => v0.identity_nonce, } } + + fn fee_multiplier(&self) -> FeeMultiplier { + match self { + BumpIdentityNonceAction::V0(transition) => transition.fee_multiplier, + } + } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index 17e36375712..3c082635686 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::IdentityNonce; +use dpp::prelude::{FeeMultiplier, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity nonce action @@ -13,6 +13,8 @@ pub struct BumpIdentityNonceActionV0 { pub identity_id: Identifier, /// The identity contract nonce, this is used to stop replay attacks pub identity_nonce: IdentityNonce, + /// fee multiplier + pub fee_multiplier: FeeMultiplier, } /// document base transition action accessors v0 @@ -21,4 +23,7 @@ pub trait BumpIdentityNonceActionAccessorsV0 { fn identity_id(&self) -> Identifier; /// Identity contract nonce fn identity_nonce(&self) -> IdentityNonce; + + /// fee multiplier + fn fee_multiplier(&self) -> FeeMultiplier; } 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 ee46bc58659..5f903144c90 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 @@ -13,11 +13,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityUpdateTransitionV0, ) -> Result { let IdentityUpdateTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -26,11 +27,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityUpdateTransitionV0, ) -> Result { let IdentityUpdateTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } @@ -39,11 +41,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityUpdateTransitionActionV0, ) -> Result { let IdentityUpdateTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -52,11 +55,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityUpdateTransitionActionV0, ) -> Result { let IdentityUpdateTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } @@ -65,11 +69,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditTransferTransitionV0, ) -> Result { let IdentityCreditTransferTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -78,11 +83,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditTransferTransitionV0, ) -> Result { let IdentityCreditTransferTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } @@ -91,11 +97,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditTransferTransitionActionV0, ) -> Result { let IdentityCreditTransferTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -104,11 +111,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditTransferTransitionActionV0, ) -> Result { let IdentityCreditTransferTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } @@ -117,11 +125,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditWithdrawalTransitionV0, ) -> Result { let IdentityCreditWithdrawalTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -130,11 +139,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditWithdrawalTransitionV0, ) -> Result { let IdentityCreditWithdrawalTransitionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } @@ -143,11 +153,12 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditWithdrawalTransitionActionV0, ) -> Result { let IdentityCreditWithdrawalTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, + fee_multiplier, }) } @@ -156,11 +167,12 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditWithdrawalTransitionActionV0, ) -> Result { let IdentityCreditWithdrawalTransitionActionV0 { - identity_id, nonce, .. + identity_id, nonce, fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, + fee_multiplier: *fee_multiplier, }) } } diff --git a/packages/rs-sdk/src/platform/transition/put_document.rs b/packages/rs-sdk/src/platform/transition/put_document.rs index e4a88ec9943..3b7ca6607b2 100644 --- a/packages/rs-sdk/src/platform/transition/put_document.rs +++ b/packages/rs-sdk/src/platform/transition/put_document.rs @@ -72,12 +72,16 @@ impl PutDocument for Document { settings, ) .await?; + + let settings = settings.unwrap_or_default(); + let transition = DocumentsBatchTransition::new_document_creation_transition_from_document( self.clone(), document_type.as_ref(), document_state_transition_entropy, &identity_public_key, new_identity_contract_nonce, + settings.fee_multiplier.unwrap_or_default(), signer, sdk.version(), None, @@ -89,7 +93,7 @@ impl PutDocument for Document { request .clone() - .execute(sdk, settings.unwrap_or_default().request_settings) + .execute(sdk, settings.request_settings) .await?; // 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/put_settings.rs b/packages/rs-sdk/src/platform/transition/put_settings.rs index d6544132d92..c514e191bc0 100644 --- a/packages/rs-sdk/src/platform/transition/put_settings.rs +++ b/packages/rs-sdk/src/platform/transition/put_settings.rs @@ -1,3 +1,4 @@ +use dpp::prelude::FeeMultiplier; use rs_dapi_client::RequestSettings; /// The options when putting something to platform @@ -5,4 +6,5 @@ use rs_dapi_client::RequestSettings; pub struct PutSettings { pub request_settings: RequestSettings, pub identity_nonce_stale_time_s: Option, + pub fee_multiplier: Option, } 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 eadf5396398..20819e858a4 100644 --- a/packages/rs-sdk/src/platform/transition/top_up_identity.rs +++ b/packages/rs-sdk/src/platform/transition/top_up_identity.rs @@ -3,7 +3,7 @@ use crate::{Error, Sdk}; use dapi_grpc::platform::VersionedGrpcResponse; use dpp::dashcore::PrivateKey; use dpp::identity::Identity; -use dpp::prelude::AssetLockProof; +use dpp::prelude::{AssetLockProof, FeeMultiplier}; use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::proof_result::StateTransitionProofResult; @@ -17,6 +17,7 @@ pub trait TopUpIdentity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, + fee_multiplier: Option, ) -> Result; } @@ -27,11 +28,13 @@ impl TopUpIdentity for Identity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, + fee_multiplier: Option, ) -> Result { let state_transition = IdentityTopUpTransition::try_from_identity( self, asset_lock_proof, asset_lock_proof_private_key.inner.as_ref(), + fee_multiplier.unwrap_or_default(), sdk.version(), None, )?; 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 72c1a579b96..0a7d73fc424 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -5,6 +5,7 @@ use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::core_script::CoreScript; use dpp::identity::signer::Signer; use dpp::identity::Identity; +use dpp::prelude::FeeMultiplier; use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; @@ -26,6 +27,7 @@ pub trait WithdrawFromIdentity { address: Address, amount: u64, core_fee_per_byte: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result; @@ -39,6 +41,7 @@ impl WithdrawFromIdentity for Identity { address: Address, amount: u64, core_fee_per_byte: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result { @@ -49,6 +52,7 @@ impl WithdrawFromIdentity for Identity { amount, Pooling::Never, core_fee_per_byte.unwrap_or(1), + fee_multiplier.unwrap_or_default(), signer, new_identity_nonce, sdk.version(), diff --git a/packages/strategy-tests/src/lib.rs b/packages/strategy-tests/src/lib.rs index f0eea09ce93..b146a2e4ddb 100644 --- a/packages/strategy-tests/src/lib.rs +++ b/packages/strategy-tests/src/lib.rs @@ -524,6 +524,7 @@ impl Strategy { &identity_info, 2, // Assuming key id 2 is a high or critical auth key *nonce, + 0, signer, platform_version, None, @@ -667,6 +668,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], + fee_multiplier: 0, signature_public_key_id: 2, signature: BinaryData::default(), } @@ -780,6 +782,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], + fee_multiplier: 0, signature_public_key_id: 1, signature: BinaryData::default(), } @@ -882,6 +885,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_delete_transition.into()], + fee_multiplier: 0, signature_public_key_id: 1, signature: BinaryData::default(), } @@ -987,6 +991,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_replace_transition.into()], + fee_multiplier: 0, signature_public_key_id: 1, signature: BinaryData::default(), } diff --git a/packages/strategy-tests/src/transitions.rs b/packages/strategy-tests/src/transitions.rs index 9f9b62aeb4a..08fc854cd7f 100644 --- a/packages/strategy-tests/src/transitions.rs +++ b/packages/strategy-tests/src/transitions.rs @@ -238,6 +238,7 @@ pub fn create_identity_top_up_transition( identity, asset_lock_proof, pk_bytes.as_ref(), + 0, platform_version, None, ) @@ -317,6 +318,7 @@ pub fn create_identity_update_transition_add_keys( vec![], None, *identity_nonce, + 0, signer, platform_version, None, @@ -425,6 +427,7 @@ pub fn create_identity_update_transition_disable_keys( key_ids_to_disable, Some(block_time), *identity_nonce, + 0, signer, platform_version, None, @@ -478,6 +481,7 @@ pub fn create_identity_withdrawal_transition( pooling: Pooling::Never, output_script: CoreScript::random_p2sh(rng), nonce: *nonce, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } @@ -548,6 +552,7 @@ pub fn create_identity_credit_transfer_transition( recipient_id: recipient.id(), amount, nonce: *nonce, + fee_multiplier: 0, signature_public_key_id: 0, signature: Default::default(), } From 310fff67634e44a19f29347327a7a5ae328a65f3 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 05:16:33 +0700 Subject: [PATCH 02/22] fmt --- .../class_methods/try_from_schema/v0/mod.rs | 20 +++---- .../src/document/extended_document/mod.rs | 5 +- .../src/document/extended_document/v0/mod.rs | 9 ++- packages/rs-dpp/src/fee/fee_result/mod.rs | 6 +- .../rs-dpp/src/identity/identity_factory.rs | 2 +- .../rs-dpp/src/identity/identity_nonce.rs | 41 +++++++------ packages/rs-dpp/src/state_transition/mod.rs | 10 +++- .../state_transition_like.rs | 6 +- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 6 +- .../v0/state_transition_like.rs | 2 +- .../v0/value_conversion.rs | 4 +- .../document_base_transition/mod.rs | 15 ++++- .../document_base_transition/v0/mod.rs | 7 ++- .../document_create_transition/convertible.rs | 27 +++++++-- .../state_transition_like.rs | 6 +- .../documents_batch_transition/v0/mod.rs | 2 +- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 6 +- .../identity_create_transition/v0/mod.rs | 3 +- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 6 +- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 6 +- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 7 ++- .../v0/state_transition_like.rs | 2 +- .../v0/value_conversion.rs | 7 ++- .../state_transition_like.rs | 6 +- .../v0/state_transition_like.rs | 2 +- .../v0/value_conversion.rs | 7 ++- .../methods/hash/v0/mod.rs | 3 +- .../src/execution/check_tx/v0/mod.rs | 9 ++- .../execution/types/execution_event/mod.rs | 2 +- .../fetch_identity_contract_nonce/v0/mod.rs | 2 +- .../merge_identity_contract_nonce/v0/mod.rs | 5 +- .../src/drive/identity/fetch/queries/mod.rs | 4 +- .../identity/identity_create/v0/mod.rs | 2 +- .../identity/identity_topup/v0/mod.rs | 2 +- .../identity/identity_update/mod.rs | 2 +- .../src/state_transition_action/mod.rs | 16 +++-- .../transformer.rs | 8 ++- .../v0/transformer.rs | 60 +++++++++++++++---- .../src/inner_value_at_path.rs | 4 +- .../src/value_serialization/ser.rs | 27 ++++----- packages/strategy-tests/src/lib.rs | 50 ++++++++++------ 46 files changed, 277 insertions(+), 149 deletions(-) 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 12cd06737f1..829be3233e8 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,19 +1,11 @@ -use crate::data_contract::document_type::v0::DocumentTypeV0; -#[cfg(feature = "validation")] -use crate::data_contract::document_type::v0::StatelessJsonSchemaLazyValidator; -#[cfg(feature = "validation")] -use crate::consensus::ConsensusError; -use indexmap::IndexMap; -use std::collections::{BTreeMap, BTreeSet}; -#[cfg(feature = "validation")] -use std::collections::HashSet; -use std::convert::TryInto; #[cfg(feature = "validation")] use crate::consensus::basic::data_contract::{ DuplicateIndexNameError, InvalidIndexPropertyTypeError, InvalidIndexedPropertyConstraintError, SystemPropertyIndexAlreadyPresentError, UndefinedIndexPropertyError, UniqueIndicesLimitReachedError, }; +#[cfg(feature = "validation")] +use crate::consensus::ConsensusError; use crate::data_contract::document_type::array::ArrayItemType; use crate::data_contract::document_type::index::Index; use crate::data_contract::document_type::index_level::IndexLevel; @@ -23,6 +15,14 @@ use crate::data_contract::document_type::schema::{ byte_array_has_no_items_as_parent_validator, pattern_is_valid_regex_validator, traversal_validator, validate_max_depth, }; +use crate::data_contract::document_type::v0::DocumentTypeV0; +#[cfg(feature = "validation")] +use crate::data_contract::document_type::v0::StatelessJsonSchemaLazyValidator; +use indexmap::IndexMap; +#[cfg(feature = "validation")] +use std::collections::HashSet; +use std::collections::{BTreeMap, BTreeSet}; +use std::convert::TryInto; #[cfg(feature = "validation")] use crate::consensus::basic::document::MissingPositionsInDocumentTypePropertiesError; diff --git a/packages/rs-dpp/src/document/extended_document/mod.rs b/packages/rs-dpp/src/document/extended_document/mod.rs index c7bdcb43dd1..582ff3d32ad 100644 --- a/packages/rs-dpp/src/document/extended_document/mod.rs +++ b/packages/rs-dpp/src/document/extended_document/mod.rs @@ -7,7 +7,10 @@ pub(crate) mod v0; pub use fields::{property_names, IDENTIFIER_FIELDS}; -#[cfg(any(feature = "document-json-conversion", feature = "document-value-conversion"))] +#[cfg(any( + feature = "document-json-conversion", + feature = "document-value-conversion" +))] use crate::data_contract::DataContract; use crate::ProtocolError; 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 663f647441a..76a0490cdf6 100644 --- a/packages/rs-dpp/src/document/extended_document/v0/mod.rs +++ b/packages/rs-dpp/src/document/extended_document/v0/mod.rs @@ -6,7 +6,10 @@ mod serialize; use crate::data_contract::document_type::DocumentTypeRef; use crate::data_contract::DataContract; -#[cfg(any(feature = "document-value-conversion", feature = "document-json-conversion"))] +#[cfg(any( + feature = "document-value-conversion", + feature = "document-json-conversion" +))] use crate::document::extended_document::fields::property_names; use crate::document::{Document, DocumentV0Getters, ExtendedDocument}; use crate::identity::TimestampMillis; @@ -38,11 +41,11 @@ use crate::document::serialization_traits::DocumentPlatformValueMethodsV0; use crate::document::serialization_traits::ExtendedDocumentPlatformConversionMethodsV0; #[cfg(feature = "validation")] 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 platform_value::converter::serde_json::BTreeValueJsonConverter; /// The `ExtendedDocumentV0` struct represents the data provided by the platform in response to a query. #[derive(Debug, Clone)] diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index f58f9736f2c..5646c113bff 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -41,12 +41,12 @@ use crate::consensus::fee::fee_error::FeeError; use crate::fee::fee_result::refunds::FeeRefunds; use crate::fee::fee_result::BalanceChange::{AddToBalance, NoBalanceChange, RemoveFromBalance}; use crate::fee::Credits; +use crate::prelude::FeeMultiplier; use crate::ProtocolError; use platform_value::Identifier; use std::cmp::Ordering; use std::collections::BTreeMap; use std::convert::TryFrom; -use crate::prelude::FeeMultiplier; pub mod refunds; @@ -196,7 +196,9 @@ impl FeeResult { /// Apply a fee multiplier to a fee result pub fn apply_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { - let additional_processing_fee = (self.processing_fee as u128).saturating_mul(fee_multiplier as u128).saturating_div(100); + let additional_processing_fee = (self.processing_fee as u128) + .saturating_mul(fee_multiplier as u128) + .saturating_div(100); if additional_processing_fee > u64::MAX as u128 { self.processing_fee = u64::MAX; } else { diff --git a/packages/rs-dpp/src/identity/identity_factory.rs b/packages/rs-dpp/src/identity/identity_factory.rs index 7078f76b1b9..11e29ce6fd9 100644 --- a/packages/rs-dpp/src/identity/identity_factory.rs +++ b/packages/rs-dpp/src/identity/identity_factory.rs @@ -29,7 +29,7 @@ use crate::identity::conversion::platform_value::IdentityPlatformValueConversion #[cfg(all(feature = "state-transitions", feature = "client"))] use crate::identity::core_script::CoreScript; #[cfg(all(feature = "state-transitions", feature = "client"))] -use crate::prelude::{IdentityNonce}; +use crate::prelude::IdentityNonce; #[cfg(all(feature = "identity-serialization", feature = "client"))] use crate::serialization::PlatformDeserializable; #[cfg(all(feature = "state-transitions", feature = "client"))] diff --git a/packages/rs-dpp/src/identity/identity_nonce.rs b/packages/rs-dpp/src/identity/identity_nonce.rs index 6072728aa69..fd98642a972 100644 --- a/packages/rs-dpp/src/identity/identity_nonce.rs +++ b/packages/rs-dpp/src/identity/identity_nonce.rs @@ -103,30 +103,35 @@ pub fn validate_identity_nonce_update( )); } std::cmp::Ordering::Less => { - if new_revision_nonce - actual_existing_revision > MISSING_IDENTITY_REVISIONS_MAX_BYTES { + if new_revision_nonce - actual_existing_revision > MISSING_IDENTITY_REVISIONS_MAX_BYTES + { // we are too far away from the actual revision - return SimpleConsensusValidationResult::new_with_error(ConsensusError::StateError( - StateError::InvalidIdentityNonceError(InvalidIdentityNonceError { - identity_id, - current_identity_nonce: Some(existing_nonce), - setting_identity_nonce: new_revision_nonce, - error: MergeIdentityNonceResult::NonceTooFarInFuture, - }), - )); + return SimpleConsensusValidationResult::new_with_error( + ConsensusError::StateError(StateError::InvalidIdentityNonceError( + InvalidIdentityNonceError { + identity_id, + current_identity_nonce: Some(existing_nonce), + setting_identity_nonce: new_revision_nonce, + error: MergeIdentityNonceResult::NonceTooFarInFuture, + }, + )), + ); } } std::cmp::Ordering::Greater => { let previous_revision_position_from_top = actual_existing_revision - new_revision_nonce; if previous_revision_position_from_top > MISSING_IDENTITY_REVISIONS_MAX_BYTES { // we are too far away from the actual revision - return SimpleConsensusValidationResult::new_with_error(ConsensusError::StateError( - StateError::InvalidIdentityNonceError(InvalidIdentityNonceError { - identity_id, - current_identity_nonce: Some(existing_nonce), - setting_identity_nonce: new_revision_nonce, - error: MergeIdentityNonceResult::NonceTooFarInPast, - }), - )); + return SimpleConsensusValidationResult::new_with_error( + ConsensusError::StateError(StateError::InvalidIdentityNonceError( + InvalidIdentityNonceError { + identity_id, + current_identity_nonce: Some(existing_nonce), + setting_identity_nonce: new_revision_nonce, + error: MergeIdentityNonceResult::NonceTooFarInPast, + }, + )), + ); } else { let old_missing_revisions = existing_nonce & MISSING_IDENTITY_REVISIONS_FILTER; let old_revision_already_set = if old_missing_revisions == 0 { @@ -134,7 +139,7 @@ pub fn validate_identity_nonce_update( } else { let byte_to_unset = 1 << (previous_revision_position_from_top - 1 - + IDENTITY_NONCE_VALUE_FILTER_MAX_BYTES); + + IDENTITY_NONCE_VALUE_FILTER_MAX_BYTES); old_missing_revisions | byte_to_unset != old_missing_revisions }; diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index 5a5a8ad88fc..a00a63f02a0 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -8,12 +8,18 @@ use platform_value::{BinaryData, Identifier}; pub use state_transition_types::*; use bincode::{Decode, Encode}; -#[cfg(any(feature = "state-transition-signing", feature="state-transition-validation"))] +#[cfg(any( + feature = "state-transition-signing", + feature = "state-transition-validation" +))] use dashcore::signer; use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize, PlatformSignable}; mod abstract_state_transition; -#[cfg(any(feature = "state-transition-signing", feature="state-transition-validation"))] +#[cfg(any( + feature = "state-transition-signing", + feature = "state-transition-validation" +))] use crate::BlsModule; use crate::ProtocolError; 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 5ae02d073d1..2f44abc991a 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::FeeMultiplier; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for DataContractCreateTransition { /// Returns ID of the created contract @@ -45,7 +45,9 @@ impl StateTransitionLike for DataContractCreateTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - DataContractCreateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + DataContractCreateTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } 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 f9662b52d4a..b4600edab94 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,10 +1,10 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::data_contract_create_transition::DataContractCreateTransitionV0; 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 9cba257e571..3ba93bdbc00 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::FeeMultiplier; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for DataContractUpdateTransition { /// Returns ID of the created contract @@ -65,7 +65,9 @@ impl StateTransitionLike for DataContractUpdateTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - DataContractUpdateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + DataContractUpdateTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } } 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 c41367efd23..6479f81794e 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,10 +1,10 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; 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 a640674f7fc..cfd8f70fc3c 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 @@ -4,7 +4,9 @@ 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::state_transition::state_transitions::common_fields::property_names::{FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE}; +use crate::state_transition::state_transitions::common_fields::property_names::{ + FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE, +}; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; use crate::ProtocolError; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/mod.rs index 1896b971cf3..25dd569fb3e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/mod.rs @@ -3,17 +3,26 @@ mod from_document; pub mod v0; mod v0_methods; -#[cfg(any(feature = "state-transition-value-conversion", feature = "state-transition-json-conversion"))] +#[cfg(any( + feature = "state-transition-value-conversion", + feature = "state-transition-json-conversion" +))] use crate::data_contract::DataContract; use crate::state_transition::documents_batch_transition::document_base_transition::v0::{ DocumentBaseTransitionV0, DocumentTransitionObjectLike, }; -#[cfg(any(feature = "state-transition-value-conversion", feature = "state-transition-json-conversion"))] +#[cfg(any( + feature = "state-transition-value-conversion", + feature = "state-transition-json-conversion" +))] use crate::ProtocolError; use bincode::{Decode, Encode}; use derive_more::{Display, From}; pub use fields::*; -#[cfg(any(feature = "state-transition-value-conversion", feature = "state-transition-json-conversion"))] +#[cfg(any( + feature = "state-transition-value-conversion", + feature = "state-transition-json-conversion" +))] use platform_value::Value; #[cfg(feature = "state-transition-serde-conversion")] use serde::{Deserialize, Serialize}; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/v0/mod.rs index 44af2f3ab08..b72265f8f2b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_base_transition/v0/mod.rs @@ -17,12 +17,15 @@ use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; use crate::data_contract::accessors::v0::DataContractV0Getters; +use crate::identifier::Identifier; use crate::prelude::IdentityNonce; #[cfg(feature = "state-transition-value-conversion")] use crate::state_transition::documents_batch_transition::document_base_transition::property_names; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] +#[cfg(any( + feature = "state-transition-json-conversion", + feature = "state-transition-value-conversion" +))] use crate::{data_contract::DataContract, errors::ProtocolError}; -use crate::identifier::Identifier; #[derive(Debug, Clone, Encode, Decode, Default, PartialEq, Display)] #[cfg_attr( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_create_transition/convertible.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_create_transition/convertible.rs index f5cecbb8d56..727c65822f0 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_create_transition/convertible.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/document_create_transition/convertible.rs @@ -2,7 +2,10 @@ use crate::data_contract::accessors::v0::DataContractV0Getters; #[cfg(feature = "state-transition-json-conversion")] use crate::data_contract::document_type::accessors::DocumentTypeV0Getters; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] +#[cfg(any( + feature = "state-transition-json-conversion", + feature = "state-transition-value-conversion" +))] use crate::prelude::DataContract; #[cfg(feature = "state-transition-json-conversion")] use crate::state_transition::data_contract_update_transition::IDENTIFIER_FIELDS; @@ -14,22 +17,34 @@ use crate::state_transition::documents_batch_transition::document_create_transit use crate::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransitionV0; #[cfg(feature = "state-transition-value-conversion")] use crate::state_transition::documents_batch_transition::fields::property_names::STATE_TRANSITION_PROTOCOL_VERSION; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] +#[cfg(any( + feature = "state-transition-json-conversion", + feature = "state-transition-value-conversion" +))] use crate::ProtocolError; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] +#[cfg(any( + feature = "state-transition-json-conversion", + feature = "state-transition-value-conversion" +))] use platform_value::btreemap_extensions::{ BTreeValueMapHelper, BTreeValueMapReplacementPathHelper, BTreeValueRemoveFromMapHelper, }; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] -use platform_value::Value; #[cfg(feature = "state-transition-json-conversion")] use platform_value::ReplacementType; +#[cfg(any( + feature = "state-transition-json-conversion", + 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-value-conversion")] use std::collections::BTreeMap; -#[cfg(any(feature = "state-transition-json-conversion", feature = "state-transition-value-conversion"))] +#[cfg(any( + feature = "state-transition-json-conversion", + feature = "state-transition-value-conversion" +))] impl DocumentTransitionObjectLike for DocumentCreateTransition { #[cfg(feature = "state-transition-json-conversion")] fn from_json_object( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index 6ac7f6a5934..c87b2c0f965 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -1,8 +1,8 @@ +use crate::prelude::FeeMultiplier; use crate::state_transition::documents_batch_transition::DocumentsBatchTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for DocumentsBatchTransition { /// Returns ID of the created contract @@ -51,7 +51,9 @@ impl StateTransitionLike for DocumentsBatchTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - DocumentsBatchTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + DocumentsBatchTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs index 2ccc2fce539..c8445351c6c 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs @@ -15,9 +15,9 @@ use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; +use crate::prelude::FeeMultiplier; use platform_value::{BinaryData, Identifier}; use serde::{Deserialize, Serialize}; -use crate::prelude::FeeMultiplier; #[derive(Debug, Clone, PartialEq, Encode, Decode, PlatformSignable)] #[cfg_attr( diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index 16bcb5cc82b..cf2400cdf35 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -1,3 +1,4 @@ +use crate::prelude::FeeMultiplier; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransitionV0Methods; use crate::state_transition::documents_batch_transition::{ @@ -7,7 +8,6 @@ use crate::state_transition::StateTransitionType::DocumentsBatch; use crate::state_transition::{StateTransition, StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl From for StateTransition { fn from(value: DocumentsBatchTransitionV0) -> Self { 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 5092290e0ed..364db6acff7 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,8 +1,8 @@ +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreateTransition { /// Returns ID of the created contract @@ -51,7 +51,9 @@ impl StateTransitionLike for IdentityCreateTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - IdentityCreateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + IdentityCreateTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } 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 b7436ee735a..b17b224dcd7 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 @@ -75,7 +75,8 @@ impl TryFrom for IdentityCreateTransitionV0 { let IdentityCreateTransitionV0Inner { public_keys, asset_lock_proof, - fee_multiplier, signature, + fee_multiplier, + signature, } = value; let identity_id = asset_lock_proof.create_identifier()?; Ok(Self { 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 ab0c2456e20..778327a6fce 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,11 +1,11 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::identity_create_transition::v0::IdentityCreateTransitionV0; use crate::state_transition::StateTransition; 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 a0ab6f69753..bb4e0ba1ad9 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::FeeMultiplier; use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreditTransferTransition { /// Returns ID of the credit_transferred contract @@ -53,7 +53,9 @@ impl StateTransitionLike for IdentityCreditTransferTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - IdentityCreditTransferTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + IdentityCreditTransferTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } 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 1e22d51556b..0f2a786a8ac 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,10 +1,10 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::identity_credit_transfer_transition::v0::IdentityCreditTransferTransitionV0; use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; 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 7d8ec93da43..d08725607e9 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::FeeMultiplier; use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityCreditWithdrawalTransition { /// Returns ID of the credit_withdrawalred contract @@ -49,7 +49,9 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - IdentityCreditWithdrawalTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + IdentityCreditWithdrawalTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } 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 57839a75b85..ee5974cba6b 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,10 +1,10 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; 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 41ce66cdf02..6830b9f99ce 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::FeeMultiplier; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityTopUpTransition { /// Returns ID of the topupd contract @@ -51,11 +51,12 @@ impl StateTransitionLike for IdentityTopUpTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - IdentityTopUpTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + IdentityTopUpTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } - fn owner_id(&self) -> Identifier { match self { IdentityTopUpTransition::V0(transition) => transition.owner_id(), 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 cae2d49c342..69c25d9bb40 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,12 +1,12 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, ProtocolError, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; 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 9f9ac089bc9..13592bb8e2c 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 @@ -11,8 +11,8 @@ use crate::state_transition::identity_topup_transition::fields::*; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionValueConvert; -use platform_version::version::PlatformVersion; use crate::state_transition::state_transitions::common_fields::property_names::FEE_MULTIPLIER; +use platform_version::version::PlatformVersion; impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { fn from_object( @@ -34,7 +34,10 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { .map_err(ProtocolError::ValueError)?; let asset_lock_proof = AssetLockProof::try_from(raw_asset_lock_proof)?; - let fee_multiplier = raw_object.get_optional_integer(FEE_MULTIPLIER).map_err(ProtocolError::ValueError)?.unwrap_or_default(); + let fee_multiplier = raw_object + .get_optional_integer(FEE_MULTIPLIER) + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(); Ok(IdentityTopUpTransitionV0 { signature, 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 5a473e4abd6..36f5b139212 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::FeeMultiplier; use crate::state_transition::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; use platform_value::{BinaryData, Identifier}; -use crate::prelude::FeeMultiplier; impl StateTransitionLike for IdentityUpdateTransition { /// Returns ID of the updated contract @@ -51,7 +51,9 @@ impl StateTransitionLike for IdentityUpdateTransition { /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { match self { - IdentityUpdateTransition::V0(transition) => transition.set_fee_multiplier(fee_multiplier), + IdentityUpdateTransition::V0(transition) => { + transition.set_fee_multiplier(fee_multiplier) + } } } 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 9b8b80b6900..6cd48279fc6 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,10 +1,10 @@ use platform_value::BinaryData; +use crate::prelude::FeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, }; -use crate::prelude::FeeMultiplier; use crate::state_transition::identity_update_transition::v0::IdentityUpdateTransitionV0; use crate::state_transition::identity_update_transition::IdentityUpdateTransition; 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 0c72a22ce04..6c7437f3b88 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 @@ -9,7 +9,9 @@ use crate::state_transition::identity_update_transition::v0::{ use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::state_transitions::common_fields::property_names::{FEE_MULTIPLIER, NONCE}; +use crate::state_transition::state_transitions::common_fields::property_names::{ + FEE_MULTIPLIER, NONCE, +}; use platform_version::version::PlatformVersion; impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { @@ -35,7 +37,8 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { .map_err(ProtocolError::ValueError)?; let fee_multiplier = raw_object .get_optional_integer(FEE_MULTIPLIER) - .map_err(ProtocolError::ValueError)?.unwrap_or_default(); + .map_err(ProtocolError::ValueError)? + .unwrap_or_default(); let add_public_keys = raw_object .remove_optional_array(property_names::ADD_PUBLIC_KEYS) .map_err(ProtocolError::ValueError)? 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 269484a6bd2..c8545cc203c 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 @@ -7,7 +7,6 @@ use std::convert::TryInto; impl IdentityPublicKeyInCreation { /// Get the original public key hash pub(super) fn hash_v0(&self) -> Result<[u8; 20], ProtocolError> { - Into::::into(self.clone()) - .hash() + Into::::into(self.clone()).hash() } } 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 804ad0ff866..1cd5fe516e4 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 @@ -429,7 +429,7 @@ mod tests { Some(1), platform_version, ) - .expect("expected to get key pair"); + .expect("expected to get key pair"); platform .drive @@ -444,7 +444,7 @@ mod tests { balance: 1000000000, revision: 0, } - .into(); + .into(); let dashpay = get_dashpay_contract_fixture(Some(identity.id()), 1, protocol_version); let mut create_contract_state_transition: StateTransition = dashpay @@ -502,7 +502,10 @@ mod tests { // The processing fees should be twice as much as a fee multiplier of 0, // since a fee multiplier of 100 means 100% more of 1 (gives 2) - assert_eq!(processing_result.aggregated_fees().processing_fee, 2604790 * 2); + assert_eq!( + processing_result.aggregated_fees().processing_fee, + 2604790 * 2 + ); let check_result = platform .check_tx(serialized.as_slice(), Recheck, platform_version) 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 4600daa1609..556d5a0c170 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 @@ -146,7 +146,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: None, operations, execution_operations: execution_context.operations_consume(), - fee_multiplier + fee_multiplier, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( diff --git a/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/fetch_identity_contract_nonce/v0/mod.rs b/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/fetch_identity_contract_nonce/v0/mod.rs index 1a6b646549f..a1e0ca636a0 100644 --- a/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/fetch_identity_contract_nonce/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/fetch_identity_contract_nonce/v0/mod.rs @@ -7,7 +7,7 @@ use crate::error::Error; use crate::fee::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; use dpp::fee::fee_result::FeeResult; -use dpp::prelude::{IdentityNonce}; +use dpp::prelude::IdentityNonce; use crate::drive::identity::contract_info::ContractInfoStructure::IdentityContractNonceKey; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/merge_identity_contract_nonce/v0/mod.rs b/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/merge_identity_contract_nonce/v0/mod.rs index f54bd0e5397..dd201da45e3 100644 --- a/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/merge_identity_contract_nonce/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/contract_info/identity_contract_nonce/merge_identity_contract_nonce/v0/mod.rs @@ -1,7 +1,9 @@ use crate::drive::grove_operations::BatchInsertTreeApplyType; use crate::drive::identity::contract_info::ContractInfoStructure::IdentityContractNonceKey; use crate::drive::identity::IdentityRootStructure::IdentityContractInfo; -use crate::drive::identity::{identity_contract_info_group_path, identity_contract_info_root_path_vec, identity_path_vec}; +use crate::drive::identity::{ + identity_contract_info_group_path, identity_contract_info_root_path_vec, identity_path_vec, +}; use crate::drive::object_size_info::{PathKeyElementInfo, PathKeyInfo}; use crate::drive::Drive; use crate::error::Error; @@ -18,7 +20,6 @@ use dpp::prelude::IdentityNonce; use crate::drive::identity::contract_info::identity_contract_nonce::merge_identity_contract_nonce::MergeIdentityNonceResult; use crate::drive::identity::contract_info::identity_contract_nonce::merge_identity_contract_nonce::MergeIdentityNonceResult::{MergeIdentityNonceSuccess, NonceAlreadyPresentAtTip, NonceAlreadyPresentInPast, NonceTooFarInFuture, NonceTooFarInPast}; - impl Drive { pub(in crate::drive::identity::contract_info) fn merge_identity_contract_nonce_v0( &self, 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 0d474ab05cd..d4120d07ce3 100644 --- a/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/queries/mod.rs @@ -6,9 +6,7 @@ use crate::error::Error; use crate::drive::identity::contract_info::ContractInfoStructure::IdentityContractNonceKey; use crate::drive::identity::IdentityRootStructure::{IdentityTreeNonce, IdentityTreeRevision}; -use crate::drive::identity::{ - identity_contract_info_group_path_vec, identity_path_vec, -}; +use crate::drive::identity::{identity_contract_info_group_path_vec, identity_path_vec}; use crate::error::query::QuerySyntaxError; use grovedb::{PathQuery, Query, SizedQuery}; 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 142b6c423c3..e20b4ab9ba8 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 @@ -7,10 +7,10 @@ use dpp::identity::{IdentityPublicKey, IdentityV0, PartialIdentity}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::Identity; use dpp::platform_value::Bytes36; +use dpp::prelude::FeeMultiplier; use dpp::version::PlatformVersion; use dpp::ProtocolError; use serde::{Deserialize, Serialize}; -use dpp::prelude::FeeMultiplier; /// action v0 #[derive(Default, Debug, Clone, Serialize, Deserialize)] 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 6811b5c3a53..597c75b8cb4 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 @@ -3,8 +3,8 @@ mod transformer; use dpp::identifier::Identifier; use dpp::platform_value::Bytes36; -use serde::{Deserialize, Serialize}; use dpp::prelude::FeeMultiplier; +use serde::{Deserialize, Serialize}; /// action v0 #[derive(Default, Debug, Clone, Serialize, Deserialize)] diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index c766fafdb38..2f558b89e6b 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -3,12 +3,12 @@ pub mod transformer; /// v0 pub mod v0; +use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; use crate::state_transition_action::identity::identity_update::v0::IdentityUpdateTransitionActionV0; use derive_more::From; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; use dpp::platform_value::Identifier; use dpp::prelude::{FeeMultiplier, Revision}; -use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; /// action #[derive(Debug, Clone, From)] diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index 6e61288c34f..02cfbf8c33d 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -16,8 +16,12 @@ use crate::state_transition_action::identity::identity_credit_transfer::Identity use crate::state_transition_action::identity::identity_credit_withdrawal::IdentityCreditWithdrawalTransitionAction; use crate::state_transition_action::identity::identity_topup::IdentityTopUpTransitionAction; use crate::state_transition_action::identity::identity_update::IdentityUpdateTransitionAction; -use crate::state_transition_action::system::bump_identity_data_contract_nonce_action::{BumpIdentityDataContractNonceAction, BumpIdentityDataContractNonceActionAccessorsV0}; -use crate::state_transition_action::system::bump_identity_nonce_action::{BumpIdentityNonceAction, BumpIdentityNonceActionAccessorsV0}; +use crate::state_transition_action::system::bump_identity_data_contract_nonce_action::{ + BumpIdentityDataContractNonceAction, BumpIdentityDataContractNonceActionAccessorsV0, +}; +use crate::state_transition_action::system::bump_identity_nonce_action::{ + BumpIdentityNonceAction, BumpIdentityNonceActionAccessorsV0, +}; use derive_more::From; use dpp::prelude::FeeMultiplier; @@ -59,11 +63,15 @@ impl StateTransitionAction { StateTransitionAction::DocumentsBatchAction(action) => action.fee_multiplier(), StateTransitionAction::IdentityCreateAction(action) => action.fee_multiplier(), StateTransitionAction::IdentityTopUpAction(action) => action.fee_multiplier(), - StateTransitionAction::IdentityCreditWithdrawalAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityCreditWithdrawalAction(action) => { + action.fee_multiplier() + } StateTransitionAction::IdentityUpdateAction(action) => action.fee_multiplier(), StateTransitionAction::IdentityCreditTransferAction(action) => action.fee_multiplier(), StateTransitionAction::BumpIdentityNonceAction(action) => action.fee_multiplier(), - StateTransitionAction::BumpIdentityDataContractNonceAction(action) => action.fee_multiplier(), + StateTransitionAction::BumpIdentityDataContractNonceAction(action) => { + action.fee_multiplier() + } } } } 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 99b4e076bd9..7ccfde7c9d5 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 @@ -17,8 +17,12 @@ impl BumpIdentityDataContractNonceAction { ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( - BumpIdentityDataContractNonceActionV0::try_from_base_transition(v0, identity_id, fee_multiplier)? - .into(), + BumpIdentityDataContractNonceActionV0::try_from_base_transition( + v0, + identity_id, + fee_multiplier, + )? + .into(), ), } } 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 5f903144c90..f93d557721c 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 @@ -13,7 +13,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityUpdateTransitionV0, ) -> Result { let IdentityUpdateTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -27,7 +30,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityUpdateTransitionV0, ) -> Result { let IdentityUpdateTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, @@ -41,7 +47,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityUpdateTransitionActionV0, ) -> Result { let IdentityUpdateTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -55,7 +64,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityUpdateTransitionActionV0, ) -> Result { let IdentityUpdateTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, @@ -69,7 +81,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditTransferTransitionV0, ) -> Result { let IdentityCreditTransferTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -83,7 +98,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditTransferTransitionV0, ) -> Result { let IdentityCreditTransferTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, @@ -97,7 +115,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditTransferTransitionActionV0, ) -> Result { let IdentityCreditTransferTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -111,7 +132,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditTransferTransitionActionV0, ) -> Result { let IdentityCreditTransferTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, @@ -125,7 +149,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditWithdrawalTransitionV0, ) -> Result { let IdentityCreditWithdrawalTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -139,7 +166,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditWithdrawalTransitionV0, ) -> Result { let IdentityCreditWithdrawalTransitionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, @@ -153,7 +183,10 @@ impl BumpIdentityNonceActionV0 { value: IdentityCreditWithdrawalTransitionActionV0, ) -> Result { let IdentityCreditWithdrawalTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, @@ -167,7 +200,10 @@ impl BumpIdentityNonceActionV0 { value: &IdentityCreditWithdrawalTransitionActionV0, ) -> Result { let IdentityCreditWithdrawalTransitionActionV0 { - identity_id, nonce, fee_multiplier, .. + identity_id, + nonce, + fee_multiplier, + .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, diff --git a/packages/rs-platform-value/src/inner_value_at_path.rs b/packages/rs-platform-value/src/inner_value_at_path.rs index 3f7574d065d..d98dc7cc6b8 100644 --- a/packages/rs-platform-value/src/inner_value_at_path.rs +++ b/packages/rs-platform-value/src/inner_value_at_path.rs @@ -337,12 +337,12 @@ impl Value { std::cmp::Ordering::Less => { //this already exists current_value = array.get_mut(number_part).unwrap(); - }, + } std::cmp::Ordering::Equal => { //we should create a new map array.push(Value::Map(ValueMap::new())); current_value = array.get_mut(number_part).unwrap(); - }, + } std::cmp::Ordering::Greater => { return Err(Error::StructureError( "trying to insert into an array path higher than current array length" diff --git a/packages/rs-platform-value/src/value_serialization/ser.rs b/packages/rs-platform-value/src/value_serialization/ser.rs index 63d7238e1f7..00d022223c5 100644 --- a/packages/rs-platform-value/src/value_serialization/ser.rs +++ b/packages/rs-platform-value/src/value_serialization/ser.rs @@ -253,11 +253,10 @@ impl serde::Serializer for Serializer { where T: ?Sized + Serialize, { - Ok(Value::Map( - vec![ - (Value::Text(String::from(variant)), tri!(to_value(value))) - ] - )) + Ok(Value::Map(vec![( + Value::Text(String::from(variant)), + tri!(to_value(value)), + )])) } #[inline] @@ -447,11 +446,10 @@ impl serde::ser::SerializeTupleVariant for SerializeTupleVariant { } fn end(self) -> Result { - Ok(Value::Map( - vec![ - (Value::Text(self.name), Value::Array(self.vec)) - ] - )) + Ok(Value::Map(vec![( + Value::Text(self.name), + Value::Array(self.vec), + )])) } } @@ -714,10 +712,9 @@ impl serde::ser::SerializeStructVariant for SerializeStructVariant { } fn end(self) -> Result { - Ok(Value::Map( - vec![ - (Value::Text(self.name), Value::Map(self.map)) - ] - )) + Ok(Value::Map(vec![( + Value::Text(self.name), + Value::Map(self.map), + )])) } } diff --git a/packages/strategy-tests/src/lib.rs b/packages/strategy-tests/src/lib.rs index b146a2e4ddb..a2befe0a9ee 100644 --- a/packages/strategy-tests/src/lib.rs +++ b/packages/strategy-tests/src/lib.rs @@ -1152,26 +1152,37 @@ impl Strategy { ); // Create `doc_type_count` doc types - let doc_types = Value::Map(doc_type_range.clone().filter_map(|_| { - match DocumentTypeV0::random_document_type( - params.clone(), - contract_id, - rng, - platform_version, - ) { - Ok(new_document_type) => { - let mut doc_type_clone = new_document_type.schema().clone(); - let name = doc_type_clone.remove("title").expect( + let doc_types = + Value::Map( + doc_type_range + .clone() + .filter_map(|_| match DocumentTypeV0::random_document_type( + params.clone(), + contract_id, + rng, + platform_version, + ) { + Ok(new_document_type) => { + let mut doc_type_clone = + new_document_type.schema().clone(); + let name = doc_type_clone.remove("title").expect( "Expected to get a doc type title in ContractCreate", ); - Some((Value::Text(name.to_string()), doc_type_clone)) - } - Err(e) => { - error!("Error generating random document type: {:?}", e); - None - } - } - }).collect()); + Some(( + Value::Text(name.to_string()), + doc_type_clone, + )) + } + Err(e) => { + error!( + "Error generating random document type: {:?}", + e + ); + None + } + }) + .collect(), + ); let created_data_contract = match contract_factory.create( owner_id, @@ -1198,7 +1209,8 @@ impl Strategy { }; // Sign transition - let public_key = identity.get_first_public_key_matching( + let public_key = identity + .get_first_public_key_matching( Purpose::AUTHENTICATION, HashSet::from([SecurityLevel::CRITICAL]), HashSet::from([KeyType::ECDSA_SECP256K1]), From c7012800441af999f5379211f5c2db41f510e2e0 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 05:26:42 +0700 Subject: [PATCH 03/22] fee multipler to use u16 --- packages/rs-dpp/src/lib.rs | 2 +- packages/rs-drive-abci/src/execution/check_tx/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index 8a76f5ffa15..fedfef3ba50 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -65,7 +65,7 @@ pub mod prelude { pub type TimestampMillis = u64; pub type Revision = u64; pub type IdentityNonce = u64; - pub type FeeMultiplier = u64; + pub type FeeMultiplier = u16; } pub use bincode; 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 42bec3fffc1..728100e744b 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/mod.rs @@ -67,7 +67,7 @@ pub struct CheckTxResult { pub unique_identifiers: Vec, /// Priority to return to tenderdash. State Transitions with higher priority take precedence /// over state transitions with lower priority - pub priority: u64, + pub priority: u16, } impl Platform From af3899ad67dca22d7218fa506966b8ddddc2fd2e Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 05:55:35 +0700 Subject: [PATCH 04/22] increased size of state transition --- .../DataContractCreateTransition.spec.js | 2 +- .../DataContractUpdateTransition.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js index c1d94c84843..973c2f90e31 100644 --- a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js +++ b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js @@ -66,7 +66,7 @@ describe('DataContractCreateTransition', () => { it('should return serialized State Transition', () => { const result = stateTransition.toBuffer(); expect(result).to.be.instanceOf(Buffer); - expect(result).to.have.lengthOf(2357); + expect(result).to.have.lengthOf(2358); }); it('should be able to restore contract config from bytes', () => { diff --git a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js index 074e375d90d..dd2cda514c3 100644 --- a/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js +++ b/packages/wasm-dpp/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.spec.js @@ -65,7 +65,7 @@ describe('DataContractUpdateTransition', () => { it('should return serialized State Transition', () => { const result = stateTransition.toBuffer(); expect(result).to.be.instanceOf(Buffer); - expect(result).to.have.lengthOf(2357); + expect(result).to.have.lengthOf(2358); }); it('should be able to restore contract config from bytes', () => { From e5e35e11bf6b3496f334d08dfead54e2ffe33e0b Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 11:37:23 +0700 Subject: [PATCH 05/22] renamed things --- packages/rs-dpp/src/fee/default_costs/constants.rs | 2 +- packages/rs-dpp/src/fee/fee_result/mod.rs | 4 ++-- packages/rs-dpp/src/lib.rs | 2 +- packages/rs-dpp/src/state_transition/mod.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../contract/data_contract_create_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../v0/value_conversion.rs | 1 - .../data_contract_update_transition/methods/mod.rs | 4 ++-- .../data_contract_update_transition/methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../contract/data_contract_update_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../data_contract_update_transition/v0/v0_methods.rs | 4 ++-- .../document/documents_batch_transition/methods/mod.rs | 6 +++--- .../documents_batch_transition/methods/v0/mod.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../document/documents_batch_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../documents_batch_transition/v0/v0_methods.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../identity/identity_create_transition/v0/mod.rs | 6 +++--- .../v0/state_transition_like.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../identity_credit_transfer_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../methods/mod.rs | 4 ++-- .../methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../identity_credit_withdrawal_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../v0/v0_methods.rs | 4 ++-- .../identity/identity_topup_transition/methods/mod.rs | 4 ++-- .../identity_topup_transition/methods/v0/mod.rs | 4 ++-- .../identity_topup_transition/state_transition_like.rs | 6 +++--- .../identity/identity_topup_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../identity_topup_transition/v0/v0_methods.rs | 4 ++-- .../identity/identity_update_transition/methods/mod.rs | 4 ++-- .../identity_update_transition/methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../identity/identity_update_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../identity_update_transition/v0/v0_methods.rs | 4 ++-- .../state_transition/traits/state_transition_like.rs | 6 +++--- .../src/execution/types/execution_event/mod.rs | 6 +++--- .../contract/data_contract_create/mod.rs | 4 ++-- .../contract/data_contract_create/v0/mod.rs | 4 ++-- .../contract/data_contract_update/mod.rs | 4 ++-- .../contract/data_contract_update/v0/mod.rs | 4 ++-- .../document/documents_batch/mod.rs | 4 ++-- .../document/documents_batch/v0/mod.rs | 4 ++-- .../identity/identity_create/mod.rs | 4 ++-- .../identity/identity_create/v0/mod.rs | 4 ++-- .../identity/identity_credit_transfer/mod.rs | 4 ++-- .../identity/identity_credit_transfer/v0/mod.rs | 4 ++-- .../identity/identity_credit_withdrawal/mod.rs | 4 ++-- .../identity/identity_credit_withdrawal/v0/mod.rs | 4 ++-- .../identity/identity_topup/mod.rs | 4 ++-- .../identity/identity_topup/v0/mod.rs | 4 ++-- .../identity/identity_update/mod.rs | 4 ++-- .../identity/identity_update/v0/mod.rs | 4 ++-- packages/rs-drive/src/state_transition_action/mod.rs | 4 ++-- .../bump_identity_data_contract_nonce_action/mod.rs | 4 ++-- .../transformer.rs | 10 +++++----- .../bump_identity_data_contract_nonce_action/v0/mod.rs | 6 +++--- .../v0/transformer.rs | 10 +++++----- .../system/bump_identity_nonce_action/mod.rs | 4 ++-- .../system/bump_identity_nonce_action/v0/mod.rs | 6 +++--- .../rs-sdk/src/platform/transition/put_settings.rs | 4 ++-- .../rs-sdk/src/platform/transition/top_up_identity.rs | 6 +++--- .../src/platform/transition/withdraw_from_identity.rs | 6 +++--- 72 files changed, 173 insertions(+), 174 deletions(-) diff --git a/packages/rs-dpp/src/fee/default_costs/constants.rs b/packages/rs-dpp/src/fee/default_costs/constants.rs index 4da1bce36dd..a3afb06691e 100644 --- a/packages/rs-dpp/src/fee/default_costs/constants.rs +++ b/packages/rs-dpp/src/fee/default_costs/constants.rs @@ -1,7 +1,7 @@ use crate::fee::Credits; pub const BASE_ST_PROCESSING_FEE: Credits = 10000; // 84000 -pub const DEFAULT_FEE_MULTIPLIER: Credits = 2; +pub const DEFAULT_SYSTEM_FEE_MULTIPLIER: Credits = 2; pub const DEFAULT_USER_TIP: Credits = 0; pub const STORAGE_CREDIT_PER_BYTE: Credits = 5000; pub const PROCESSING_CREDIT_PER_BYTE: Credits = 12; diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index 5646c113bff..96131818a9a 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -41,7 +41,7 @@ use crate::consensus::fee::fee_error::FeeError; use crate::fee::fee_result::refunds::FeeRefunds; use crate::fee::fee_result::BalanceChange::{AddToBalance, NoBalanceChange, RemoveFromBalance}; use crate::fee::Credits; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::ProtocolError; use platform_value::Identifier; use std::cmp::Ordering; @@ -195,7 +195,7 @@ impl FeeResult { } /// Apply a fee multiplier to a fee result - pub fn apply_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + pub fn apply_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { let additional_processing_fee = (self.processing_fee as u128) .saturating_mul(fee_multiplier as u128) .saturating_div(100); diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index fedfef3ba50..61011ad0688 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -65,7 +65,7 @@ pub mod prelude { pub type TimestampMillis = u64; pub type Revision = u64; pub type IdentityNonce = u64; - pub type FeeMultiplier = u16; + pub type UserFeeMultiplier = u16; } pub use bincode; diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index a00a63f02a0..8bc2739706b 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -51,7 +51,7 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGetter use crate::identity::signer::Signer; use crate::identity::state_transition::OptionallyAssetLockProved; use crate::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; -use crate::prelude::{AssetLockProof, FeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeMultiplier}; pub use state_transitions::*; use crate::serialization::Signable; @@ -302,7 +302,7 @@ impl StateTransition { } /// returns the fee_multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { call_method!(self, fee_multiplier) } @@ -339,7 +339,7 @@ impl StateTransition { } /// set fee multiplier - pub fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + pub fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { call_method!(self, set_fee_multiplier, fee_multiplier) } 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 2f44abc991a..84ced09039c 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -37,13 +37,13 @@ impl StateTransitionLike for DataContractCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DataContractCreateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { DataContractCreateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 c3e1a5e0d19..7dcd784253b 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 @@ -18,7 +18,7 @@ use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use bincode::{Decode, Encode}; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; @@ -37,7 +37,7 @@ use crate::version::PlatformVersion; pub struct DataContractCreateTransitionV0 { pub data_contract: DataContractInSerializationFormat, pub identity_nonce: IdentityNonce, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 b4600edab94..a6c4a2b5207 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -50,11 +50,11 @@ impl StateTransitionLike for DataContractCreateTransitionV0 { )] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 daa843c46f2..a0f3ad79e21 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 @@ -8,7 +8,6 @@ use crate::{data_contract::DataContract, ProtocolError}; use platform_version::TryIntoPlatformVersioned; use platform_version::version::PlatformVersion; use crate::data_contract::conversion::value::v0::DataContractValueConversionMethodsV0; -use crate::fee::default_costs::constants::DEFAULT_FEE_MULTIPLIER; use crate::state_transition::{StateTransitionFieldTypes, StateTransitionValueConvert}; use crate::state_transition::data_contract_create_transition::{DataContractCreateTransitionV0}; use crate::state_transition::data_contract_create_transition::fields::*; 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 bf7db6eb685..5f01a3917fd 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 @@ -12,7 +12,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use platform_version::version::PlatformVersion; impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { @@ -21,7 +21,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 a7cb0c9543c..d96ad49cfb4 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 @@ -2,7 +2,7 @@ use crate::data_contract::DataContract; use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; @@ -27,7 +27,7 @@ pub trait DataContractUpdateTransitionMethodsV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 3ba93bdbc00..45b607ce588 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -57,13 +57,13 @@ impl StateTransitionLike for DataContractUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DataContractUpdateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { DataContractUpdateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 aaa5cc88361..f3dd851669f 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,7 +18,7 @@ use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransition; use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; @@ -37,7 +37,7 @@ pub struct DataContractUpdateTransitionV0 { )] pub identity_contract_nonce: IdentityNonce, pub data_contract: DataContractInSerializationFormat, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 6479f81794e..4185e947cc9 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -51,11 +51,11 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 03d844299d5..5863c8b177b 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 @@ -3,7 +3,7 @@ use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; use crate::serialization::Signable; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, @@ -20,7 +20,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, _feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs index 1ed5064c885..2712758e096 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::IdentityPublicKey; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransition; use crate::state_transition::documents_batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use crate::state_transition::documents_batch_transition::{ @@ -36,7 +36,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -79,7 +79,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs index 7e60861f478..4e9c0a75609 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::{IdentityPublicKey, SecurityLevel}; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -22,7 +22,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -36,7 +36,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index c87b2c0f965..ba995f8a43e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -1,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::documents_batch_transition::DocumentsBatchTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for DocumentsBatchTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DocumentsBatchTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { DocumentsBatchTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs index c8445351c6c..271b96352d5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs @@ -15,7 +15,7 @@ use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use platform_value::{BinaryData, Identifier}; use serde::{Deserialize, Serialize}; @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; pub struct DocumentsBatchTransitionV0 { pub owner_id: Identifier, pub transitions: Vec, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index cf2400cdf35..c79ee496ba4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -1,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransitionV0Methods; use crate::state_transition::documents_batch_transition::{ @@ -62,11 +62,11 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 { .collect() } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index a7a889bcbd7..7483f8c01a6 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::identity::signer::Signer; use crate::identity::SecurityLevel; -use crate::prelude::{FeeMultiplier, IdentityNonce, IdentityPublicKey}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce, IdentityPublicKey}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransition; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -34,7 +34,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -74,7 +74,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, 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 364db6acff7..4ab0aeceecb 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { IdentityCreateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 b17b224dcd7..f945761c91a 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 @@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::Identity; -use crate::prelude::{FeeMultiplier, Identifier}; +use crate::prelude::{UserFeeMultiplier, Identifier}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::state_transition::AssetLockProved; @@ -45,7 +45,7 @@ pub struct IdentityCreateTransitionV0 { #[platform_signable(into = "Vec")] pub public_keys: Vec, pub asset_lock_proof: AssetLockProof, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, #[cfg_attr(feature = "state-transition-serde-conversion", serde(skip))] @@ -63,7 +63,7 @@ struct IdentityCreateTransitionV0Inner { public_keys: Vec, asset_lock_proof: AssetLockProof, // Generic identity ST fields - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, // protocol_version: u32, signature: BinaryData, } 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 778327a6fce..6c464dcba9d 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::{ prelude::Identifier, @@ -56,11 +56,11 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { vec![base64::encode(self.identity_id)] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 bb4e0ba1ad9..30eed66e3cd 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -45,13 +45,13 @@ impl StateTransitionLike for IdentityCreditTransferTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreditTransferTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { IdentityCreditTransferTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 4fb1ab608f6..5e11ee8feb9 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 @@ -10,7 +10,7 @@ mod version; use crate::identity::KeyID; -use crate::prelude::{FeeMultiplier, Identifier, IdentityNonce, Revision}; +use crate::prelude::{UserFeeMultiplier, Identifier, IdentityNonce, Revision}; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -41,7 +41,7 @@ pub struct IdentityCreditTransferTransitionV0 { pub recipient_id: Identifier, pub amount: u64, pub nonce: IdentityNonce, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 0f2a786a8ac..ecc734e8e50 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 { )] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 921372694e4..5a527690c0f 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 @@ -8,7 +8,7 @@ use crate::identity::signer::Signer; use crate::identity::Identity; use crate::identity::core_script::CoreScript; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransition; use crate::version::PlatformVersion; @@ -23,7 +23,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: S, nonce: IdentityNonce, platform_version: &PlatformVersion, 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 0472f76811e..f03aa064ea5 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 @@ -1,7 +1,7 @@ use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::Identity; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::withdrawal::Pooling; use crate::ProtocolError; @@ -15,7 +15,7 @@ pub trait IdentityCreditWithdrawalTransitionMethodsV0 { amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, 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 d08725607e9..0e96a6edbba 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -41,13 +41,13 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreditWithdrawalTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { IdentityCreditWithdrawalTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 8f8920b1ba4..bbad561694f 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 @@ -15,7 +15,7 @@ use platform_value::BinaryData; use serde::{Deserialize, Serialize}; use crate::balances::credits::CREDITS_PER_DUFF; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::{ identity::{core_script::CoreScript, KeyID}, prelude::{Identifier, Revision}, @@ -45,7 +45,7 @@ pub struct IdentityCreditWithdrawalTransitionV0 { pub pooling: Pooling, pub output_script: CoreScript, pub nonce: IdentityNonce, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 ee5974cba6b..5b8fdc5abf4 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -61,11 +61,11 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 { )] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index 0c0b8419ef6..40d25e871e5 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::identity::accessors::IdentityGettersV0; use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::{Identity, KeyType, Purpose, SecurityLevel}; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -19,7 +19,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, 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 d7a13286f35..74c3011e4ed 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 @@ -3,7 +3,7 @@ mod v0; pub use v0::*; use crate::identity::Identity; -use crate::prelude::{AssetLockProof, FeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeMultiplier}; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::StateTransition; @@ -18,7 +18,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, platform_version: &PlatformVersion, version: Option, ) -> Result { 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 5061deef80a..c0f6cc74f8c 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,5 +1,5 @@ use crate::identity::Identity; -use crate::prelude::{AssetLockProof, FeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeMultiplier}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -10,7 +10,7 @@ pub trait IdentityTopUpTransitionMethodsV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, platform_version: &PlatformVersion, version: Option, ) -> Result; 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 6830b9f99ce..cf2a3d1a9df 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityTopUpTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityTopUpTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { IdentityTopUpTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 cbbc809a4a2..8d43010d609 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 @@ -17,7 +17,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; -use crate::prelude::{FeeMultiplier, Identifier}; +use crate::prelude::{UserFeeMultiplier, Identifier}; use crate::ProtocolError; @@ -40,7 +40,7 @@ pub struct IdentityTopUpTransitionV0 { // Own ST fields pub asset_lock_proof: AssetLockProof, pub identity_id: Identifier, - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, } 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 69c25d9bb40..52bb0fe0642 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::{ prelude::Identifier, @@ -68,11 +68,11 @@ impl StateTransitionLike for IdentityTopUpTransitionV0 { } } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 c780fdddca4..e7554de154a 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 @@ -3,7 +3,7 @@ use dashcore::signer; use crate::identity::accessors::IdentityGettersV0; use crate::identity::Identity; -use crate::prelude::{AssetLockProof, FeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeMultiplier}; use crate::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; use crate::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; @@ -21,7 +21,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, _platform_version: &PlatformVersion, _version: Option, ) -> Result { 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 5a450fa95f8..1ccc8238284 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 @@ -11,7 +11,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use platform_version::version::PlatformVersion; impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { @@ -23,7 +23,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, version: Option, 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 ca436d72b7e..82104c8d794 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 @@ -2,7 +2,7 @@ use platform_version::version::PlatformVersion; use crate::identity::signer::Signer; use crate::identity::{Identity, IdentityPublicKey}; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::{identity::KeyID, state_transition::StateTransitionType, ProtocolError}; @@ -16,7 +16,7 @@ pub trait IdentityUpdateTransitionMethodsV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, platform_version: &PlatformVersion, version: Option, 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 36f5b139212..6f02e67fb96 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,4 +1,4 @@ -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::state_transition::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityUpdateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { match self { IdentityUpdateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 32f215a8068..f310061e474 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 @@ -18,7 +18,7 @@ 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::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; use crate::{ identity::KeyID, prelude::{Identifier, Revision, TimestampMillis}, @@ -60,7 +60,7 @@ pub struct IdentityUpdateTransitionV0 { pub public_keys_disabled_at: Option, /// The fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, /// The ID of the public key used to sing the State Transition #[platform_signable(exclude_from_sig_hash)] 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 6cd48279fc6..386071b5a5f 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::FeeMultiplier; +use crate::prelude::UserFeeMultiplier; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { self.fee_multiplier = fee_multiplier } } 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 be86537b5c6..61592b5facf 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 @@ -11,7 +11,7 @@ use crate::identity::{Identity, IdentityPublicKey}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::prelude::{FeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeMultiplier, IdentityNonce}; 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; @@ -34,7 +34,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, signer: &S, _platform_version: &PlatformVersion, _version: Option, 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 68e18754eba..52c5960b836 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 @@ -2,7 +2,7 @@ use std::fmt::Debug; use platform_value::BinaryData; -use crate::prelude::{FeeMultiplier, Identifier}; +use crate::prelude::{UserFeeMultiplier, Identifier}; use crate::version::FeatureVersion; use crate::state_transition::StateTransitionType; @@ -38,9 +38,9 @@ pub trait StateTransitionLike: /// set a new signature fn set_signature(&mut self, signature: BinaryData); /// returns the fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier; + fn fee_multiplier(&self) -> UserFeeMultiplier; /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: FeeMultiplier); + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier); /// get modified ids list fn modified_data_ids(&self) -> Vec; 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 556d5a0c170..b1d7f2f76fd 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 @@ -9,7 +9,7 @@ use dpp::block::epoch::Epoch; use dpp::fee::Credits; use dpp::identity::PartialIdentity; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; @@ -35,7 +35,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, }, /// A drive event that is paid from an asset lock PaidFromAssetLockDriveEvent { @@ -48,7 +48,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, }, /// A drive event that is free FreeDriveEvent { diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index aba8007e336..838f7be1e80 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// data contract create transition action #[derive(Debug, Clone, From)] @@ -37,7 +37,7 @@ impl DataContractCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DataContractCreateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs index 8520aafe292..d9fed3ceee9 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// data contract create transition action v0 #[derive(Debug, Clone)] @@ -12,5 +12,5 @@ pub struct DataContractCreateTransitionActionV0 { /// identity nonce pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index d7820ea0bf7..1d1f309ef96 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// data contract update transition action #[derive(Debug, Clone, From)] @@ -39,7 +39,7 @@ impl DataContractUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DataContractUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs index ebb9bacd532..27fb3ba4f0c 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// data contract update transition action v0 #[derive(Debug, Clone)] @@ -12,5 +12,5 @@ pub struct DataContractUpdateTransitionActionV0 { /// identity contract nonce pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs index a7131424277..5dce4a2c771 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs @@ -5,7 +5,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identity::SecurityLevel; use dpp::platform_value::Identifier; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::ProtocolError; use crate::state_transition_action::document::documents_batch::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; @@ -65,7 +65,7 @@ impl DocumentsBatchTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { DocumentsBatchTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs index f4d29d51a84..3d7d44b7d63 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs @@ -1,6 +1,6 @@ use crate::state_transition_action::document::documents_batch::document_transition::DocumentTransitionAction; use dpp::identifier::Identifier; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; /// action v0 #[derive(Default, Debug, Clone)] @@ -10,5 +10,5 @@ pub struct DocumentsBatchTransitionActionV0 { /// The inner transitions pub transitions: Vec, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs index 4b3766797f2..4bbe047c356 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs @@ -9,7 +9,7 @@ use crate::state_transition_action::identity::identity_create::v0::{ use derive_more::From; use dpp::identity::{Identity, IdentityPublicKey, PartialIdentity}; use dpp::platform_value::{Bytes36, Identifier}; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::version::PlatformVersion; use dpp::ProtocolError; @@ -51,7 +51,7 @@ impl IdentityCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 e20b4ab9ba8..d6e2f14af09 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 @@ -7,7 +7,7 @@ use dpp::identity::{IdentityPublicKey, IdentityV0, PartialIdentity}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::Identity; use dpp::platform_value::Bytes36; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::version::PlatformVersion; use dpp::ProtocolError; use serde::{Deserialize, Serialize}; @@ -25,7 +25,7 @@ pub struct IdentityCreateTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } impl From for PartialIdentity { 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 a3cf567e9dc..310926957da 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 @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_credit_transfer::v0::Iden use derive_more::From; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -46,7 +46,7 @@ impl IdentityCreditTransferTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreditTransferTransitionAction::V0(transition) => transition.fee_multiplier, } 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 2d2a1ec1d44..2b277b04d4b 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 @@ -2,7 +2,7 @@ mod transformer; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; use serde::{Deserialize, Serialize}; /// action v0 @@ -18,5 +18,5 @@ pub struct IdentityCreditTransferTransitionActionV0 { /// nonce pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index e72bbe4f72b..2ab626af83f 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -8,7 +8,7 @@ use derive_more::From; use dpp::document::Document; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -58,7 +58,7 @@ impl IdentityCreditWithdrawalTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs index ea9adb42bed..621c9437ed2 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::document::Document; use dpp::identifier::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; use serde::{Deserialize, Serialize}; @@ -19,5 +19,5 @@ pub struct IdentityCreditWithdrawalTransitionActionV0 { /// amount pub amount: u64, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs index 706535cb763..6c676587240 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpT use derive_more::From; use dpp::platform_value::{Bytes36, Identifier}; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; /// action #[derive(Debug, Clone, From)] @@ -39,7 +39,7 @@ impl IdentityTopUpTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityTopUpTransitionAction::V0(transition) => transition.fee_multiplier, } 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 597c75b8cb4..76b5af54647 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 @@ -3,7 +3,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::platform_value::Bytes36; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use serde::{Deserialize, Serialize}; /// action v0 @@ -17,5 +17,5 @@ pub struct IdentityTopUpTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index 2f558b89e6b..31d4d5a54c7 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -8,7 +8,7 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdat use derive_more::From; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, Revision}; +use dpp::prelude::{UserFeeMultiplier, Revision}; /// action #[derive(Debug, Clone, From)] @@ -62,7 +62,7 @@ impl IdentityUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { IdentityUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs index 6174bc9a2d7..b6e44f70919 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; -use dpp::prelude::{FeeMultiplier, IdentityNonce, Revision}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce, Revision}; use serde::{Deserialize, Serialize}; /// action v0 @@ -22,5 +22,5 @@ pub struct IdentityUpdateTransitionActionV0 { /// nonce used to prevent replay attacks pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index 02cfbf8c33d..863276c5735 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -23,7 +23,7 @@ use crate::state_transition_action::system::bump_identity_nonce_action::{ BumpIdentityNonceAction, BumpIdentityNonceActionAccessorsV0, }; use derive_more::From; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; /// ST action #[derive(Debug, Clone, From)] @@ -56,7 +56,7 @@ pub enum StateTransitionAction { impl StateTransitionAction { /// The fee multiplier for the action - pub fn fee_multiplier(&self) -> FeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeMultiplier { match self { StateTransitionAction::DataContractCreateAction(action) => action.fee_multiplier(), StateTransitionAction::DataContractUpdateAction(action) => action.fee_multiplier(), diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index 3cadfb145d0..b3a0ebd134b 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// transformer module pub mod transformer; @@ -35,7 +35,7 @@ impl BumpIdentityDataContractNonceActionAccessorsV0 for BumpIdentityDataContract } } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { BumpIdentityDataContractNonceAction::V0(transition) => transition.fee_multiplier, } 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 7ccfde7c9d5..3eb83e2f81a 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,5 +1,5 @@ use dpp::platform_value::Identifier; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; @@ -13,7 +13,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition( value: DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( @@ -31,7 +31,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_borrowed_document_base_transition( value: &DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( @@ -49,7 +49,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition_action( value: DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( @@ -67,7 +67,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_borrowed_base_transition_action( value: &DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index 8c0ba77a24a..feedb39e12b 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity data contract nonce action @@ -15,7 +15,7 @@ pub struct BumpIdentityDataContractNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } /// document base transition action accessors v0 @@ -27,5 +27,5 @@ pub trait BumpIdentityDataContractNonceActionAccessorsV0 { /// Identity contract nonce fn identity_contract_nonce(&self) -> IdentityNonce; /// Fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier; + fn fee_multiplier(&self) -> UserFeeMultiplier; } 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 fa8e044f53e..aeb8e8c925b 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,6 +1,6 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::platform_value::Identifier; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; @@ -14,7 +14,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition( value: DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -33,7 +33,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition( value: &DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -52,7 +52,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition_action( value: DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -71,7 +71,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition_action( value: &DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: FeeMultiplier, + fee_multiplier: UserFeeMultiplier, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index 580aae7ac74..318d2a2f688 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; /// transformer module pub mod transformer; @@ -29,7 +29,7 @@ impl BumpIdentityNonceActionAccessorsV0 for BumpIdentityNonceAction { } } - fn fee_multiplier(&self) -> FeeMultiplier { + fn fee_multiplier(&self) -> UserFeeMultiplier { match self { BumpIdentityNonceAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index 3c082635686..9d5fdec617b 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{FeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity nonce action @@ -14,7 +14,7 @@ pub struct BumpIdentityNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: FeeMultiplier, + pub fee_multiplier: UserFeeMultiplier, } /// document base transition action accessors v0 @@ -25,5 +25,5 @@ pub trait BumpIdentityNonceActionAccessorsV0 { fn identity_nonce(&self) -> IdentityNonce; /// fee multiplier - fn fee_multiplier(&self) -> FeeMultiplier; + fn fee_multiplier(&self) -> UserFeeMultiplier; } diff --git a/packages/rs-sdk/src/platform/transition/put_settings.rs b/packages/rs-sdk/src/platform/transition/put_settings.rs index c514e191bc0..8b7218ab569 100644 --- a/packages/rs-sdk/src/platform/transition/put_settings.rs +++ b/packages/rs-sdk/src/platform/transition/put_settings.rs @@ -1,4 +1,4 @@ -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use rs_dapi_client::RequestSettings; /// The options when putting something to platform @@ -6,5 +6,5 @@ use rs_dapi_client::RequestSettings; pub struct PutSettings { pub request_settings: RequestSettings, pub identity_nonce_stale_time_s: Option, - pub fee_multiplier: Option, + pub fee_multiplier: Option, } 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 20819e858a4..864f3aab7f9 100644 --- a/packages/rs-sdk/src/platform/transition/top_up_identity.rs +++ b/packages/rs-sdk/src/platform/transition/top_up_identity.rs @@ -3,7 +3,7 @@ use crate::{Error, Sdk}; use dapi_grpc::platform::VersionedGrpcResponse; use dpp::dashcore::PrivateKey; use dpp::identity::Identity; -use dpp::prelude::{AssetLockProof, FeeMultiplier}; +use dpp::prelude::{AssetLockProof, UserFeeMultiplier}; use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::proof_result::StateTransitionProofResult; @@ -17,7 +17,7 @@ pub trait TopUpIdentity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + fee_multiplier: Option, ) -> Result; } @@ -28,7 +28,7 @@ impl TopUpIdentity for Identity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + fee_multiplier: Option, ) -> Result { let state_transition = IdentityTopUpTransition::try_from_identity( self, 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 0a7d73fc424..d2b5465a0ea 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -5,7 +5,7 @@ use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::core_script::CoreScript; use dpp::identity::signer::Signer; use dpp::identity::Identity; -use dpp::prelude::FeeMultiplier; +use dpp::prelude::UserFeeMultiplier; use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; @@ -27,7 +27,7 @@ pub trait WithdrawFromIdentity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result; @@ -41,7 +41,7 @@ impl WithdrawFromIdentity for Identity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result { From 43252290ec0e5d65c8b1582261de5ad264a66489 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 11:41:59 +0700 Subject: [PATCH 06/22] renamed things --- packages/rs-dpp/src/fee/fee_result/mod.rs | 4 ++-- packages/rs-dpp/src/lib.rs | 2 +- packages/rs-dpp/src/state_transition/mod.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../contract/data_contract_create_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../data_contract_update_transition/methods/mod.rs | 4 ++-- .../data_contract_update_transition/methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../contract/data_contract_update_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../data_contract_update_transition/v0/v0_methods.rs | 4 ++-- .../document/documents_batch_transition/methods/mod.rs | 6 +++--- .../documents_batch_transition/methods/v0/mod.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../document/documents_batch_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../documents_batch_transition/v0/v0_methods.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../identity/identity_create_transition/v0/mod.rs | 6 +++--- .../v0/state_transition_like.rs | 6 +++--- .../state_transition_like.rs | 6 +++--- .../identity_credit_transfer_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../methods/mod.rs | 4 ++-- .../methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../identity_credit_withdrawal_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../v0/v0_methods.rs | 4 ++-- .../identity/identity_topup_transition/methods/mod.rs | 4 ++-- .../identity_topup_transition/methods/v0/mod.rs | 4 ++-- .../identity_topup_transition/state_transition_like.rs | 6 +++--- .../identity/identity_topup_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../identity_topup_transition/v0/v0_methods.rs | 4 ++-- .../identity/identity_update_transition/methods/mod.rs | 4 ++-- .../identity_update_transition/methods/v0/mod.rs | 4 ++-- .../state_transition_like.rs | 6 +++--- .../identity/identity_update_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 +++--- .../identity_update_transition/v0/v0_methods.rs | 4 ++-- .../state_transition/traits/state_transition_like.rs | 6 +++--- .../src/execution/types/execution_event/mod.rs | 6 +++--- .../contract/data_contract_create/mod.rs | 4 ++-- .../contract/data_contract_create/v0/mod.rs | 4 ++-- .../contract/data_contract_update/mod.rs | 4 ++-- .../contract/data_contract_update/v0/mod.rs | 4 ++-- .../document/documents_batch/mod.rs | 4 ++-- .../document/documents_batch/v0/mod.rs | 4 ++-- .../identity/identity_create/mod.rs | 4 ++-- .../identity/identity_create/v0/mod.rs | 4 ++-- .../identity/identity_credit_transfer/mod.rs | 4 ++-- .../identity/identity_credit_transfer/v0/mod.rs | 4 ++-- .../identity/identity_credit_withdrawal/mod.rs | 4 ++-- .../identity/identity_credit_withdrawal/v0/mod.rs | 4 ++-- .../identity/identity_topup/mod.rs | 4 ++-- .../identity/identity_topup/v0/mod.rs | 4 ++-- .../identity/identity_update/mod.rs | 4 ++-- .../identity/identity_update/v0/mod.rs | 4 ++-- packages/rs-drive/src/state_transition_action/mod.rs | 4 ++-- .../bump_identity_data_contract_nonce_action/mod.rs | 4 ++-- .../transformer.rs | 10 +++++----- .../bump_identity_data_contract_nonce_action/v0/mod.rs | 6 +++--- .../v0/transformer.rs | 10 +++++----- .../system/bump_identity_nonce_action/mod.rs | 4 ++-- .../system/bump_identity_nonce_action/v0/mod.rs | 6 +++--- .../rs-sdk/src/platform/transition/put_settings.rs | 4 ++-- .../rs-sdk/src/platform/transition/top_up_identity.rs | 6 +++--- .../src/platform/transition/withdraw_from_identity.rs | 6 +++--- 70 files changed, 172 insertions(+), 172 deletions(-) diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index 96131818a9a..a3fc73edeaa 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -41,7 +41,7 @@ use crate::consensus::fee::fee_error::FeeError; use crate::fee::fee_result::refunds::FeeRefunds; use crate::fee::fee_result::BalanceChange::{AddToBalance, NoBalanceChange, RemoveFromBalance}; use crate::fee::Credits; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::ProtocolError; use platform_value::Identifier; use std::cmp::Ordering; @@ -195,7 +195,7 @@ impl FeeResult { } /// Apply a fee multiplier to a fee result - pub fn apply_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + pub fn apply_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { let additional_processing_fee = (self.processing_fee as u128) .saturating_mul(fee_multiplier as u128) .saturating_div(100); diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index 61011ad0688..26be84cd819 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -65,7 +65,7 @@ pub mod prelude { pub type TimestampMillis = u64; pub type Revision = u64; pub type IdentityNonce = u64; - pub type UserFeeMultiplier = u16; + pub type UserFeeIncrease = u16; } pub use bincode; diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index 8bc2739706b..d44f3977130 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -51,7 +51,7 @@ use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGetter use crate::identity::signer::Signer; use crate::identity::state_transition::OptionallyAssetLockProved; use crate::identity::{IdentityPublicKey, KeyID, KeyType, Purpose, SecurityLevel}; -use crate::prelude::{AssetLockProof, UserFeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeIncrease}; pub use state_transitions::*; use crate::serialization::Signable; @@ -302,7 +302,7 @@ impl StateTransition { } /// returns the fee_multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { call_method!(self, fee_multiplier) } @@ -339,7 +339,7 @@ impl StateTransition { } /// set fee multiplier - pub fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + pub fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { call_method!(self, set_fee_multiplier, fee_multiplier) } 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 84ced09039c..67ffe84cb26 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -37,13 +37,13 @@ impl StateTransitionLike for DataContractCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { DataContractCreateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { DataContractCreateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 7dcd784253b..538af54c818 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 @@ -18,7 +18,7 @@ use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use bincode::{Decode, Encode}; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; @@ -37,7 +37,7 @@ use crate::version::PlatformVersion; pub struct DataContractCreateTransitionV0 { pub data_contract: DataContractInSerializationFormat, pub identity_nonce: IdentityNonce, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 a6c4a2b5207..c1283928be4 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -50,11 +50,11 @@ impl StateTransitionLike for DataContractCreateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 5f01a3917fd..af46bc2226e 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 @@ -12,7 +12,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use platform_version::version::PlatformVersion; impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { @@ -21,7 +21,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 d96ad49cfb4..5ea5e4c1ef8 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 @@ -2,7 +2,7 @@ use crate::data_contract::DataContract; use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; @@ -27,7 +27,7 @@ pub trait DataContractUpdateTransitionMethodsV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 45b607ce588..a69267295d4 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -57,13 +57,13 @@ impl StateTransitionLike for DataContractUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { DataContractUpdateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { DataContractUpdateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 f3dd851669f..b67e50eb80d 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,7 +18,7 @@ use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransition; use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; @@ -37,7 +37,7 @@ pub struct DataContractUpdateTransitionV0 { )] pub identity_contract_nonce: IdentityNonce, pub data_contract: DataContractInSerializationFormat, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 4185e947cc9..b1fd705840e 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -51,11 +51,11 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 5863c8b177b..33f2729d184 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 @@ -3,7 +3,7 @@ use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; use crate::serialization::Signable; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, @@ -20,7 +20,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs index 2712758e096..2d54596f3ee 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::IdentityPublicKey; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransition; use crate::state_transition::documents_batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use crate::state_transition::documents_batch_transition::{ @@ -36,7 +36,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -79,7 +79,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs index 4e9c0a75609..3a6967398ef 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; use crate::identity::signer::Signer; use crate::identity::{IdentityPublicKey, SecurityLevel}; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -22,7 +22,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -36,7 +36,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index ba995f8a43e..5d5be3ece20 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -1,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::documents_batch_transition::DocumentsBatchTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for DocumentsBatchTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { DocumentsBatchTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { DocumentsBatchTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs index 271b96352d5..1283305fe04 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs @@ -15,7 +15,7 @@ use crate::ProtocolError; use bincode::{Decode, Encode}; use platform_serialization_derive::PlatformSignable; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use platform_value::{BinaryData, Identifier}; use serde::{Deserialize, Serialize}; @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; pub struct DocumentsBatchTransitionV0 { pub owner_id: Identifier, pub transitions: Vec, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index c79ee496ba4..71685e44f26 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -1,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransitionV0Methods; use crate::state_transition::documents_batch_transition::{ @@ -62,11 +62,11 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 { .collect() } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index 7483f8c01a6..da3ebda0e9f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::{Document, DocumentV0Getters}; use crate::identity::signer::Signer; use crate::identity::SecurityLevel; -use crate::prelude::{UserFeeMultiplier, IdentityNonce, IdentityPublicKey}; +use crate::prelude::{UserFeeIncrease, IdentityNonce, IdentityPublicKey}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransition; use crate::state_transition::documents_batch_transition::document_transition::{ @@ -34,7 +34,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -74,7 +74,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, 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 4ab0aeceecb..947f8770707 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 f945761c91a..bb04a709646 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 @@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::Identity; -use crate::prelude::{UserFeeMultiplier, Identifier}; +use crate::prelude::{UserFeeIncrease, Identifier}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::state_transition::AssetLockProved; @@ -45,7 +45,7 @@ pub struct IdentityCreateTransitionV0 { #[platform_signable(into = "Vec")] pub public_keys: Vec, pub asset_lock_proof: AssetLockProof, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, #[cfg_attr(feature = "state-transition-serde-conversion", serde(skip))] @@ -63,7 +63,7 @@ struct IdentityCreateTransitionV0Inner { public_keys: Vec, asset_lock_proof: AssetLockProof, // Generic identity ST fields - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, // protocol_version: u32, signature: BinaryData, } 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 6c464dcba9d..5e1eda3ea7c 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_create_transition::IdentityCreateTransition; use crate::{ prelude::Identifier, @@ -56,11 +56,11 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { vec![base64::encode(self.identity_id)] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 30eed66e3cd..1cf2af49e4a 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -45,13 +45,13 @@ impl StateTransitionLike for IdentityCreditTransferTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreditTransferTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreditTransferTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 5e11ee8feb9..8b85ec26e62 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 @@ -10,7 +10,7 @@ mod version; use crate::identity::KeyID; -use crate::prelude::{UserFeeMultiplier, Identifier, IdentityNonce, Revision}; +use crate::prelude::{UserFeeIncrease, Identifier, IdentityNonce, Revision}; use crate::ProtocolError; use bincode::{Decode, Encode}; @@ -41,7 +41,7 @@ pub struct IdentityCreditTransferTransitionV0 { pub recipient_id: Identifier, pub amount: u64, pub nonce: IdentityNonce, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 ecc734e8e50..b537ee071ef 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 5a527690c0f..974c24dc582 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 @@ -8,7 +8,7 @@ use crate::identity::signer::Signer; use crate::identity::Identity; use crate::identity::core_script::CoreScript; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; use crate::state_transition::StateTransition; use crate::version::PlatformVersion; @@ -23,7 +23,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: S, nonce: IdentityNonce, platform_version: &PlatformVersion, 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 f03aa064ea5..b3e226ffe79 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 @@ -1,7 +1,7 @@ use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::Identity; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::withdrawal::Pooling; use crate::ProtocolError; @@ -15,7 +15,7 @@ pub trait IdentityCreditWithdrawalTransitionMethodsV0 { amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, 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 0e96a6edbba..838e13b4913 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -41,13 +41,13 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreditWithdrawalTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreditWithdrawalTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 bbad561694f..052c44949e1 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 @@ -15,7 +15,7 @@ use platform_value::BinaryData; use serde::{Deserialize, Serialize}; use crate::balances::credits::CREDITS_PER_DUFF; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::{ identity::{core_script::CoreScript, KeyID}, prelude::{Identifier, Revision}, @@ -45,7 +45,7 @@ pub struct IdentityCreditWithdrawalTransitionV0 { pub pooling: Pooling, pub output_script: CoreScript, pub nonce: IdentityNonce, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 5b8fdc5abf4..769399172ec 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -61,11 +61,11 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index 40d25e871e5..c4df12b9448 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -2,7 +2,7 @@ use crate::identity::accessors::IdentityGettersV0; use crate::identity::core_script::CoreScript; use crate::identity::signer::Signer; use crate::identity::{Identity, KeyType, Purpose, SecurityLevel}; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -19,7 +19,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, 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 74c3011e4ed..81e51ebc69c 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 @@ -3,7 +3,7 @@ mod v0; pub use v0::*; use crate::identity::Identity; -use crate::prelude::{AssetLockProof, UserFeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeIncrease}; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::StateTransition; @@ -18,7 +18,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, platform_version: &PlatformVersion, version: Option, ) -> Result { 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 c0f6cc74f8c..4f3e496004b 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,5 +1,5 @@ use crate::identity::Identity; -use crate::prelude::{AssetLockProof, UserFeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeIncrease}; use crate::state_transition::{StateTransition, StateTransitionType}; use crate::ProtocolError; use platform_version::version::{FeatureVersion, PlatformVersion}; @@ -10,7 +10,7 @@ pub trait IdentityTopUpTransitionMethodsV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, platform_version: &PlatformVersion, version: Option, ) -> Result; 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 cf2a3d1a9df..596bf343994 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityTopUpTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityTopUpTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityTopUpTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 8d43010d609..a28c335dde3 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 @@ -17,7 +17,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; -use crate::prelude::{UserFeeMultiplier, Identifier}; +use crate::prelude::{UserFeeIncrease, Identifier}; use crate::ProtocolError; @@ -40,7 +40,7 @@ pub struct IdentityTopUpTransitionV0 { // Own ST fields pub asset_lock_proof: AssetLockProof, pub identity_id: Identifier, - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, } 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 52bb0fe0642..7ea6b7d7ea5 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_topup_transition::IdentityTopUpTransition; use crate::{ prelude::Identifier, @@ -68,11 +68,11 @@ impl StateTransitionLike for IdentityTopUpTransitionV0 { } } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 e7554de154a..6502885fbe3 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 @@ -3,7 +3,7 @@ use dashcore::signer; use crate::identity::accessors::IdentityGettersV0; use crate::identity::Identity; -use crate::prelude::{AssetLockProof, UserFeeMultiplier}; +use crate::prelude::{AssetLockProof, UserFeeIncrease}; use crate::state_transition::identity_topup_transition::accessors::IdentityTopUpTransitionAccessorsV0; use crate::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; @@ -21,7 +21,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, _platform_version: &PlatformVersion, _version: Option, ) -> Result { 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 1ccc8238284..ed03ab3d72a 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 @@ -11,7 +11,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use platform_version::version::PlatformVersion; impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { @@ -23,7 +23,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, version: Option, 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 82104c8d794..32d7617fac7 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 @@ -2,7 +2,7 @@ use platform_version::version::PlatformVersion; use crate::identity::signer::Signer; use crate::identity::{Identity, IdentityPublicKey}; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::{identity::KeyID, state_transition::StateTransitionType, ProtocolError}; @@ -16,7 +16,7 @@ pub trait IdentityUpdateTransitionMethodsV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, version: Option, 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 6f02e67fb96..bf9cb426d5a 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,4 +1,4 @@ -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::state_transition::identity_update_transition::IdentityUpdateTransition; use crate::state_transition::{StateTransitionLike, StateTransitionType}; use crate::version::FeatureVersion; @@ -43,13 +43,13 @@ impl StateTransitionLike for IdentityUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityUpdateTransition::V0(transition) => transition.fee_multiplier(), } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityUpdateTransition::V0(transition) => { transition.set_fee_multiplier(fee_multiplier) 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 f310061e474..7534d1f6e4c 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 @@ -18,7 +18,7 @@ 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::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; use crate::{ identity::KeyID, prelude::{Identifier, Revision, TimestampMillis}, @@ -60,7 +60,7 @@ pub struct IdentityUpdateTransitionV0 { pub public_keys_disabled_at: Option, /// The fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, /// The ID of the public key used to sing the State Transition #[platform_signable(exclude_from_sig_hash)] 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 386071b5a5f..18a7220cf23 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,6 +1,6 @@ use platform_value::BinaryData; -use crate::prelude::UserFeeMultiplier; +use crate::prelude::UserFeeIncrease; use crate::{ prelude::Identifier, state_transition::{StateTransitionLike, StateTransitionType}, @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier) { + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 61592b5facf..29924ce32a2 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 @@ -11,7 +11,7 @@ use crate::identity::{Identity, IdentityPublicKey}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::prelude::{UserFeeMultiplier, IdentityNonce}; +use crate::prelude::{UserFeeIncrease, IdentityNonce}; 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; @@ -34,7 +34,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, signer: &S, _platform_version: &PlatformVersion, _version: Option, 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 52c5960b836..eff93df11b6 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 @@ -2,7 +2,7 @@ use std::fmt::Debug; use platform_value::BinaryData; -use crate::prelude::{UserFeeMultiplier, Identifier}; +use crate::prelude::{UserFeeIncrease, Identifier}; use crate::version::FeatureVersion; use crate::state_transition::StateTransitionType; @@ -38,9 +38,9 @@ pub trait StateTransitionLike: /// set a new signature fn set_signature(&mut self, signature: BinaryData); /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier; + fn fee_multiplier(&self) -> UserFeeIncrease; /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeMultiplier); + fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease); /// get modified ids list fn modified_data_ids(&self) -> Vec; 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 b1d7f2f76fd..6e712911151 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 @@ -9,7 +9,7 @@ use dpp::block::epoch::Epoch; use dpp::fee::Credits; use dpp::identity::PartialIdentity; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::version::PlatformVersion; use drive::state_transition_action::StateTransitionAction; @@ -35,7 +35,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, }, /// A drive event that is paid from an asset lock PaidFromAssetLockDriveEvent { @@ -48,7 +48,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, }, /// A drive event that is free FreeDriveEvent { diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index 838f7be1e80..e86fa9b01e4 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// data contract create transition action #[derive(Debug, Clone, From)] @@ -37,7 +37,7 @@ impl DataContractCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { DataContractCreateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs index d9fed3ceee9..d2e01ac8c3a 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// data contract create transition action v0 #[derive(Debug, Clone)] @@ -12,5 +12,5 @@ pub struct DataContractCreateTransitionActionV0 { /// identity nonce pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index 1d1f309ef96..92e530745d5 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// data contract update transition action #[derive(Debug, Clone, From)] @@ -39,7 +39,7 @@ impl DataContractUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { DataContractUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs index 27fb3ba4f0c..de93ef5b1a6 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// data contract update transition action v0 #[derive(Debug, Clone)] @@ -12,5 +12,5 @@ pub struct DataContractUpdateTransitionActionV0 { /// identity contract nonce pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs index 5dce4a2c771..80bff42d263 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs @@ -5,7 +5,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::identity::SecurityLevel; use dpp::platform_value::Identifier; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; use crate::state_transition_action::document::documents_batch::document_transition::document_base_transition_action::DocumentBaseTransitionActionAccessorsV0; @@ -65,7 +65,7 @@ impl DocumentsBatchTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { DocumentsBatchTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs index 3d7d44b7d63..87a0c073bb5 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs @@ -1,6 +1,6 @@ use crate::state_transition_action::document::documents_batch::document_transition::DocumentTransitionAction; use dpp::identifier::Identifier; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; /// action v0 #[derive(Default, Debug, Clone)] @@ -10,5 +10,5 @@ pub struct DocumentsBatchTransitionActionV0 { /// The inner transitions pub transitions: Vec, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs index 4bbe047c356..e6bd239cea4 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs @@ -9,7 +9,7 @@ use crate::state_transition_action::identity::identity_create::v0::{ use derive_more::From; use dpp::identity::{Identity, IdentityPublicKey, PartialIdentity}; use dpp::platform_value::{Bytes36, Identifier}; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::version::PlatformVersion; use dpp::ProtocolError; @@ -51,7 +51,7 @@ impl IdentityCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 d6e2f14af09..4443235d2fe 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 @@ -7,7 +7,7 @@ use dpp::identity::{IdentityPublicKey, IdentityV0, PartialIdentity}; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::Identity; use dpp::platform_value::Bytes36; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::version::PlatformVersion; use dpp::ProtocolError; use serde::{Deserialize, Serialize}; @@ -25,7 +25,7 @@ pub struct IdentityCreateTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } impl From for PartialIdentity { 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 310926957da..137c4af5c4f 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 @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_credit_transfer::v0::Iden use derive_more::From; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -46,7 +46,7 @@ impl IdentityCreditTransferTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreditTransferTransitionAction::V0(transition) => transition.fee_multiplier, } 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 2b277b04d4b..e0d0f2f680a 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 @@ -2,7 +2,7 @@ mod transformer; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; use serde::{Deserialize, Serialize}; /// action v0 @@ -18,5 +18,5 @@ pub struct IdentityCreditTransferTransitionActionV0 { /// nonce pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index 2ab626af83f..297059afeaa 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -8,7 +8,7 @@ use derive_more::From; use dpp::document::Document; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// action #[derive(Debug, Clone, From)] @@ -58,7 +58,7 @@ impl IdentityCreditWithdrawalTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs index 621c9437ed2..f9120efd281 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::document::Document; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; use serde::{Deserialize, Serialize}; @@ -19,5 +19,5 @@ pub struct IdentityCreditWithdrawalTransitionActionV0 { /// amount pub amount: u64, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs index 6c676587240..dcdb2098919 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_topup::v0::IdentityTopUpT use derive_more::From; use dpp::platform_value::{Bytes36, Identifier}; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; /// action #[derive(Debug, Clone, From)] @@ -39,7 +39,7 @@ impl IdentityTopUpTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityTopUpTransitionAction::V0(transition) => transition.fee_multiplier, } 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 76b5af54647..379f41cea85 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 @@ -3,7 +3,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::platform_value::Bytes36; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use serde::{Deserialize, Serialize}; /// action v0 @@ -17,5 +17,5 @@ pub struct IdentityTopUpTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index 31d4d5a54c7..48b960d626e 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -8,7 +8,7 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdat use derive_more::From; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, Revision}; +use dpp::prelude::{UserFeeIncrease, Revision}; /// action #[derive(Debug, Clone, From)] @@ -62,7 +62,7 @@ impl IdentityUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { IdentityUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs index b6e44f70919..a49e381ef42 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce, Revision}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce, Revision}; use serde::{Deserialize, Serialize}; /// action v0 @@ -22,5 +22,5 @@ pub struct IdentityUpdateTransitionActionV0 { /// nonce used to prevent replay attacks pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index 863276c5735..2e7b3030ec9 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -23,7 +23,7 @@ use crate::state_transition_action::system::bump_identity_nonce_action::{ BumpIdentityNonceAction, BumpIdentityNonceActionAccessorsV0, }; use derive_more::From; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; /// ST action #[derive(Debug, Clone, From)] @@ -56,7 +56,7 @@ pub enum StateTransitionAction { impl StateTransitionAction { /// The fee multiplier for the action - pub fn fee_multiplier(&self) -> UserFeeMultiplier { + pub fn fee_multiplier(&self) -> UserFeeIncrease { match self { StateTransitionAction::DataContractCreateAction(action) => action.fee_multiplier(), StateTransitionAction::DataContractUpdateAction(action) => action.fee_multiplier(), diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index b3a0ebd134b..2d9e2df7fd2 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// transformer module pub mod transformer; @@ -35,7 +35,7 @@ impl BumpIdentityDataContractNonceActionAccessorsV0 for BumpIdentityDataContract } } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { BumpIdentityDataContractNonceAction::V0(transition) => transition.fee_multiplier, } 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 3eb83e2f81a..5eed31ae0e5 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,5 +1,5 @@ use dpp::platform_value::Identifier; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransition; @@ -13,7 +13,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition( value: DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( @@ -31,7 +31,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_borrowed_document_base_transition( value: &DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( @@ -49,7 +49,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition_action( value: DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( @@ -67,7 +67,7 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_borrowed_base_transition_action( value: &DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index feedb39e12b..d10f9216b57 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity data contract nonce action @@ -15,7 +15,7 @@ pub struct BumpIdentityDataContractNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } /// document base transition action accessors v0 @@ -27,5 +27,5 @@ pub trait BumpIdentityDataContractNonceActionAccessorsV0 { /// Identity contract nonce fn identity_contract_nonce(&self) -> IdentityNonce; /// Fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier; + fn fee_multiplier(&self) -> UserFeeIncrease; } 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 aeb8e8c925b..592c1df60b8 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,6 +1,6 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::platform_value::Identifier; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::ProtocolError; use dpp::state_transition::data_contract_update_transition::DataContractUpdateTransitionV0; @@ -14,7 +14,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition( value: DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -33,7 +33,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition( value: &DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -52,7 +52,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition_action( value: DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -71,7 +71,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition_action( value: &DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: UserFeeMultiplier, + fee_multiplier: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index 318d2a2f688..0cff2547a28 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; /// transformer module pub mod transformer; @@ -29,7 +29,7 @@ impl BumpIdentityNonceActionAccessorsV0 for BumpIdentityNonceAction { } } - fn fee_multiplier(&self) -> UserFeeMultiplier { + fn fee_multiplier(&self) -> UserFeeIncrease { match self { BumpIdentityNonceAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index 9d5fdec617b..7454d2f7fab 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeMultiplier, IdentityNonce}; +use dpp::prelude::{UserFeeIncrease, IdentityNonce}; #[derive(Debug, Clone)] /// Version 0 of the bump identity nonce action @@ -14,7 +14,7 @@ pub struct BumpIdentityNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeMultiplier, + pub fee_multiplier: UserFeeIncrease, } /// document base transition action accessors v0 @@ -25,5 +25,5 @@ pub trait BumpIdentityNonceActionAccessorsV0 { fn identity_nonce(&self) -> IdentityNonce; /// fee multiplier - fn fee_multiplier(&self) -> UserFeeMultiplier; + fn fee_multiplier(&self) -> UserFeeIncrease; } diff --git a/packages/rs-sdk/src/platform/transition/put_settings.rs b/packages/rs-sdk/src/platform/transition/put_settings.rs index 8b7218ab569..c0dc2913076 100644 --- a/packages/rs-sdk/src/platform/transition/put_settings.rs +++ b/packages/rs-sdk/src/platform/transition/put_settings.rs @@ -1,4 +1,4 @@ -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use rs_dapi_client::RequestSettings; /// The options when putting something to platform @@ -6,5 +6,5 @@ use rs_dapi_client::RequestSettings; pub struct PutSettings { pub request_settings: RequestSettings, pub identity_nonce_stale_time_s: Option, - pub fee_multiplier: Option, + pub fee_multiplier: Option, } 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 864f3aab7f9..d024577c6a3 100644 --- a/packages/rs-sdk/src/platform/transition/top_up_identity.rs +++ b/packages/rs-sdk/src/platform/transition/top_up_identity.rs @@ -3,7 +3,7 @@ use crate::{Error, Sdk}; use dapi_grpc::platform::VersionedGrpcResponse; use dpp::dashcore::PrivateKey; use dpp::identity::Identity; -use dpp::prelude::{AssetLockProof, UserFeeMultiplier}; +use dpp::prelude::{AssetLockProof, UserFeeIncrease}; use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::proof_result::StateTransitionProofResult; @@ -17,7 +17,7 @@ pub trait TopUpIdentity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + fee_multiplier: Option, ) -> Result; } @@ -28,7 +28,7 @@ impl TopUpIdentity for Identity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + fee_multiplier: Option, ) -> Result { let state_transition = IdentityTopUpTransition::try_from_identity( self, 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 d2b5465a0ea..edc1371a54d 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -5,7 +5,7 @@ use dpp::identity::accessors::IdentityGettersV0; use dpp::identity::core_script::CoreScript; use dpp::identity::signer::Signer; use dpp::identity::Identity; -use dpp::prelude::UserFeeMultiplier; +use dpp::prelude::UserFeeIncrease; use dpp::state_transition::identity_credit_withdrawal_transition::IdentityCreditWithdrawalTransition; @@ -27,7 +27,7 @@ pub trait WithdrawFromIdentity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result; @@ -41,7 +41,7 @@ impl WithdrawFromIdentity for Identity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + fee_multiplier: Option, signer: S, settings: Option, ) -> Result { From e0a3d1888a5fff292047c1ae96884fa0dbc2d8e6 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 11:51:23 +0700 Subject: [PATCH 07/22] renamed things --- .../src/document/document_factory/v0/mod.rs | 2 +- .../specialized_document_factory/v0/mod.rs | 2 +- packages/rs-dpp/src/state_transition/mod.rs | 2 +- .../src/state_transition/serialization.rs | 10 ++++----- .../state_transition_like.rs | 4 ++-- .../data_contract_create_transition/v0/mod.rs | 6 ++--- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 2 +- .../v0/value_conversion.rs | 4 ++-- .../state_transition_like.rs | 4 ++-- .../data_contract_update_transition/v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 2 +- .../v0/value_conversion.rs | 4 ++-- .../state_transition_like.rs | 4 ++-- .../documents_batch_transition/v0/mod.rs | 2 +- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 4 ++-- .../state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 4 ++-- .../v0/mod.rs | 4 ++-- .../v0/state_transition_like.rs | 6 ++--- .../state_transition_like.rs | 4 ++-- .../v0/mod.rs | 2 +- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 2 +- .../state_transition_like.rs | 4 ++-- .../identity_topup_transition/v0/mod.rs | 2 +- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 2 +- .../v0/value_conversion.rs | 2 +- .../state_transition_like.rs | 4 ++-- .../v0/json_conversion.rs | 2 +- .../identity_update_transition/v0/mod.rs | 2 +- .../v0/state_transition_like.rs | 6 ++--- .../v0/v0_methods.rs | 2 +- .../v0/value_conversion.rs | 2 +- .../traits/state_transition_like.rs | 2 +- .../src/execution/check_tx/mod.rs | 2 +- .../src/execution/check_tx/v0/mod.rs | 8 +++---- .../execution/types/execution_event/mod.rs | 10 ++++----- .../data_contract_update/mod.rs | 4 ++-- .../documents_batch/state/v0/mod.rs | 4 ++-- .../documents_batch/transformer/v0/mod.rs | 2 +- .../tests/strategy_tests/strategy.rs | 8 +++---- .../contract/data_contract_create/mod.rs | 2 +- .../data_contract_create/v0/transformer.rs | 4 ++-- .../contract/data_contract_update/mod.rs | 2 +- .../data_contract_update/v0/transformer.rs | 4 ++-- .../document/documents_batch/mod.rs | 2 +- .../identity/identity_create/mod.rs | 2 +- .../identity/identity_credit_transfer/mod.rs | 2 +- .../v0/transformer.rs | 4 ++-- .../identity_credit_withdrawal/mod.rs | 2 +- .../v0/transformer.rs | 2 +- .../identity/identity_topup/mod.rs | 2 +- .../identity/identity_topup/v0/transformer.rs | 4 ++-- .../identity/identity_update/mod.rs | 2 +- .../identity_update/v0/transformer.rs | 4 ++-- .../src/state_transition_action/mod.rs | 22 +++++++++---------- .../mod.rs | 2 +- .../v0/mod.rs | 2 +- .../v0/transformer.rs | 4 ++-- .../system/bump_identity_nonce_action/mod.rs | 2 +- .../bump_identity_nonce_action/v0/mod.rs | 2 +- .../v0/transformer.rs | 12 +++++----- packages/strategy-tests/src/lib.rs | 8 +++---- packages/strategy-tests/src/transitions.rs | 4 ++-- 69 files changed, 139 insertions(+), 139 deletions(-) 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 81ae9d05c68..fdfe9bc248d 100644 --- a/packages/rs-dpp/src/document/document_factory/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/v0/mod.rs @@ -237,7 +237,7 @@ impl DocumentFactoryV0 { Ok(DocumentsBatchTransitionV0 { owner_id, transitions, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } 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 51871a998df..0d844c6ba62 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 @@ -246,7 +246,7 @@ impl SpecializedDocumentFactoryV0 { Ok(DocumentsBatchTransitionV0 { owner_id, transitions, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index d44f3977130..da085f06ed1 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -303,7 +303,7 @@ impl StateTransition { /// returns the fee_multiplier pub fn fee_multiplier(&self) -> UserFeeIncrease { - call_method!(self, fee_multiplier) + call_method!(self, user_fee_increase) } /// The transaction id is a single hash of the data with the signature diff --git a/packages/rs-dpp/src/state_transition/serialization.rs b/packages/rs-dpp/src/state_transition/serialization.rs index dc4163413df..7cdde9810ef 100644 --- a/packages/rs-dpp/src/state_transition/serialization.rs +++ b/packages/rs-dpp/src/state_transition/serialization.rs @@ -88,7 +88,7 @@ mod tests { let identity_topup_transition = IdentityTopUpTransitionV0 { asset_lock_proof: AssetLockProof::Instant(asset_lock_proof), identity_id: identity.id(), - fee_multiplier: 0, + user_fee_increase: 0, signature: [1u8; 65].to_vec().into(), }; let state_transition: StateTransition = identity_topup_transition.into(); @@ -126,7 +126,7 @@ mod tests { add_public_keys: add_public_keys_in_creation, disable_public_keys: vec![], public_keys_disabled_at: None, - fee_multiplier: 0, + user_fee_increase: 0, }; let key_signable_bytes = identity_update_transition @@ -194,7 +194,7 @@ mod tests { add_public_keys: add_public_keys_in_creation, disable_public_keys: vec![3, 4, 5], public_keys_disabled_at: Some(15), - fee_multiplier: 0, + user_fee_increase: 0, }; let key_signable_bytes = identity_update_transition @@ -249,7 +249,7 @@ mod tests { pooling: Pooling::Standard, output_script: CoreScript::from_bytes((0..23).collect::>()), nonce: 1, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: [1u8; 65].to_vec().into(), }; @@ -300,7 +300,7 @@ mod tests { .data_contract_owned() .try_into_platform_versioned(platform_version) .expect("expected a data contract"), - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: [1u8; 65].to_vec().into(), }); 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 67ffe84cb26..a068f14a8e2 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 @@ -37,9 +37,9 @@ impl StateTransitionLike for DataContractCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DataContractCreateTransition::V0(transition) => transition.fee_multiplier(), + DataContractCreateTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 538af54c818..b44a50c609b 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 @@ -37,7 +37,7 @@ use crate::version::PlatformVersion; pub struct DataContractCreateTransitionV0 { pub data_contract: DataContractInSerializationFormat, pub identity_nonce: IdentityNonce, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -68,7 +68,7 @@ impl TryFromPlatformVersioned for DataContractCreateTransitionV0 { Ok(DataContractCreateTransitionV0 { data_contract: value.try_into_platform_versioned(platform_version)?, identity_nonce: Default::default(), - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), }) @@ -86,7 +86,7 @@ impl TryFromPlatformVersioned for DataContractCreateTransit Ok(DataContractCreateTransitionV0 { data_contract: data_contract.try_into_platform_versioned(platform_version)?, identity_nonce, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), }) 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 c1283928be4..5ddf06900b1 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 @@ -50,11 +50,11 @@ impl StateTransitionLike for DataContractCreateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 df4de10fe1e..ddf987f5a5e 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 @@ -38,7 +38,7 @@ impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransitionV0 { let transition = DataContractCreateTransition::V0(DataContractCreateTransitionV0 { data_contract: data_contract.try_into_platform_versioned(platform_version)?, identity_nonce, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: key_id, signature: Default::default(), }); 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 a0f3ad79e21..47f95f56568 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 @@ -42,7 +42,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, - fee_multiplier: raw_object + user_fee_increase: raw_object .get_optional_integer(FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), @@ -76,7 +76,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, - fee_multiplier: raw_value_map + user_fee_increase: raw_value_map .remove_optional_integer(FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), 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 a69267295d4..258b8a61c4d 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 @@ -57,9 +57,9 @@ impl StateTransitionLike for DataContractUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DataContractUpdateTransition::V0(transition) => transition.fee_multiplier(), + DataContractUpdateTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 b67e50eb80d..ce2b1dfcfac 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 @@ -37,7 +37,7 @@ pub struct DataContractUpdateTransitionV0 { )] pub identity_contract_nonce: IdentityNonce, pub data_contract: DataContractInSerializationFormat, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -54,7 +54,7 @@ impl TryFromPlatformVersioned<(DataContract, IdentityNonce)> for DataContractUpd Ok(DataContractUpdateTransitionV0 { identity_contract_nonce: value.1, data_contract: value.0.try_into_platform_versioned(platform_version)?, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), }) 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 b1fd705840e..2707263518c 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 @@ -51,11 +51,11 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 33f2729d184..a5dfc1e9ec8 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 @@ -28,7 +28,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { let transition = DataContractUpdateTransition::V0(DataContractUpdateTransitionV0 { identity_contract_nonce, data_contract: data_contract.try_into_platform_versioned(platform_version)?, - fee_multiplier, + user_fee_increase: fee_multiplier, signature_public_key_id: key_id, signature: Default::default(), }); 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 cfd8f70fc3c..80b45a2f57b 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 @@ -78,7 +78,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, - fee_multiplier: raw_object + user_fee_increase: raw_object .get_optional_integer(FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), @@ -116,7 +116,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { platform_version, )? .try_into_platform_versioned(platform_version)?, - fee_multiplier: raw_value_map + user_fee_increase: raw_value_map .remove_optional_integer(FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index 5d5be3ece20..36ed6f20638 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -43,9 +43,9 @@ impl StateTransitionLike for DocumentsBatchTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DocumentsBatchTransition::V0(transition) => transition.fee_multiplier(), + DocumentsBatchTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs index 1283305fe04..eb5c291cfa8 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/mod.rs @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; pub struct DocumentsBatchTransitionV0 { pub owner_id: Identifier, pub transitions: Vec, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index 71685e44f26..cb4f75f6f2e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -62,11 +62,11 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 { .collect() } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index da3ebda0e9f..b53c882e7fd 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -54,7 +54,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![create_transition.into()], - fee_multiplier, + user_fee_increase: fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } @@ -93,7 +93,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![replace_transition.into()], - fee_multiplier, + user_fee_increase: fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } 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 947f8770707..61593014b41 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 @@ -43,9 +43,9 @@ impl StateTransitionLike for IdentityCreateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreateTransition::V0(transition) => transition.fee_multiplier(), + IdentityCreateTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 5e1eda3ea7c..ff458cc3999 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 @@ -56,7 +56,7 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { vec![base64::encode(self.identity_id)] } - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { self.fee_multiplier } 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 1cf2af49e4a..86387ff37b1 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 @@ -45,9 +45,9 @@ impl StateTransitionLike for IdentityCreditTransferTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreditTransferTransition::V0(transition) => transition.fee_multiplier(), + IdentityCreditTransferTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 8b85ec26e62..158911ce779 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 @@ -41,7 +41,7 @@ pub struct IdentityCreditTransferTransitionV0 { pub recipient_id: Identifier, pub amount: u64, pub nonce: IdentityNonce, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] @@ -79,7 +79,7 @@ mod test { recipient_id: Identifier::random(), amount: rng.gen(), nonce: 1, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: rng.gen(), signature: [0; 65].to_vec().into(), }; 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 b537ee071ef..ce4ee9c7f26 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 @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 838e13b4913..584a304c694 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 @@ -41,9 +41,9 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreditWithdrawalTransition::V0(transition) => transition.fee_multiplier(), + IdentityCreditWithdrawalTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 052c44949e1..e4c8bdabfe9 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 @@ -45,7 +45,7 @@ pub struct IdentityCreditWithdrawalTransitionV0 { pub pooling: Pooling, pub output_script: CoreScript, pub nonce: IdentityNonce, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature_public_key_id: KeyID, #[platform_signable(exclude_from_sig_hash)] 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 769399172ec..40ed636c31d 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 @@ -61,11 +61,11 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index c4df12b9448..a41caa43558 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -32,7 +32,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra pooling, output_script, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, signature_public_key_id: 0, signature: Default::default(), } 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 596bf343994..6fa21e5f2d1 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 @@ -43,9 +43,9 @@ impl StateTransitionLike for IdentityTopUpTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityTopUpTransition::V0(transition) => transition.fee_multiplier(), + IdentityTopUpTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 a28c335dde3..654b027c2fd 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 @@ -40,7 +40,7 @@ pub struct IdentityTopUpTransitionV0 { // Own ST fields pub asset_lock_proof: AssetLockProof, pub identity_id: Identifier, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, } 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 7ea6b7d7ea5..7ae1576d85b 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 @@ -68,11 +68,11 @@ impl StateTransitionLike for IdentityTopUpTransitionV0 { } } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 6502885fbe3..aa30dcefe90 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 @@ -28,7 +28,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { let identity_top_up_transition = IdentityTopUpTransitionV0 { asset_lock_proof, identity_id: identity.id(), - fee_multiplier, + user_fee_increase: fee_multiplier, signature: Default::default(), }; 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 13592bb8e2c..9463c1572b3 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 @@ -43,7 +43,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { signature, identity_id, asset_lock_proof, - fee_multiplier, + user_fee_increase: fee_multiplier, }) } 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 bf9cb426d5a..7b3cf299f52 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 @@ -43,9 +43,9 @@ impl StateTransitionLike for IdentityUpdateTransition { } /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityUpdateTransition::V0(transition) => transition.fee_multiplier(), + IdentityUpdateTransition::V0(transition) => transition.user_fee_increase(), } } /// set a fee multiplier 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 925d4c01a67..6ecab17352c 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 @@ -29,7 +29,7 @@ mod test { add_public_keys: vec![public_key.into()], disable_public_keys: vec![], public_keys_disabled_at: None, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: BinaryData::new(buffer.to_vec()), } 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 7534d1f6e4c..24d621b5379 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 @@ -60,7 +60,7 @@ pub struct IdentityUpdateTransitionV0 { pub public_keys_disabled_at: Option, /// The fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, /// The ID of the public key used to sing the State Transition #[platform_signable(exclude_from_sig_hash)] 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 18a7220cf23..cccb633d0ea 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 @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityUpdateTransitionV0 { )] } - fn fee_multiplier(&self) -> UserFeeIncrease { - self.fee_multiplier + fn user_fee_increase(&self) -> UserFeeIncrease { + self.user_fee_increase } fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 29924ce32a2..2d02a3e2a04 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 @@ -53,7 +53,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { add_public_keys: add_public_keys_in_creation, disable_public_keys, public_keys_disabled_at, - fee_multiplier, + user_fee_increase: fee_multiplier, }; let state_transition: StateTransition = identity_update_transition.clone().into(); 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 6c7437f3b88..92cd06cd259 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 @@ -61,7 +61,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { add_public_keys, disable_public_keys, public_keys_disabled_at, - fee_multiplier, + user_fee_increase: fee_multiplier, }) } 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 eff93df11b6..b08713fa362 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 @@ -38,7 +38,7 @@ pub trait StateTransitionLike: /// set a new signature fn set_signature(&mut self, signature: BinaryData); /// returns the fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease; + fn user_fee_increase(&self) -> UserFeeIncrease; /// set a fee multiplier fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease); /// get modified ids list 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 728100e744b..02209474f0a 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/mod.rs @@ -67,7 +67,7 @@ pub struct CheckTxResult { pub unique_identifiers: Vec, /// Priority to return to tenderdash. State Transitions with higher priority take precedence /// over state transitions with lower priority - pub priority: u16, + pub priority: u32, } impl Platform 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 1cd5fe516e4..cb66c852b7c 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 @@ -113,7 +113,7 @@ where let unique_identifiers = state_transition.unique_identifiers(); - let priority = state_transition.fee_multiplier(); + let priority = state_transition.user_fee_increase() as u32 * 100; let validation_result = state_transition_to_execution_event_for_check_tx( &platform_ref, @@ -1471,7 +1471,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key)], disable_public_keys: vec![], public_keys_disabled_at: None, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 1, signature: Default::default(), } @@ -1583,7 +1583,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key.clone())], disable_public_keys: vec![], public_keys_disabled_at: None, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } @@ -1608,7 +1608,7 @@ mod tests { add_public_keys: vec![IdentityPublicKeyInCreation::V0(new_key)], disable_public_keys: vec![], public_keys_disabled_at: None, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } 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 6e712911151..ab7b03017ba 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 @@ -67,7 +67,7 @@ impl<'a> ExecutionEvent<'a> { ) -> Result { match &action { StateTransitionAction::IdentityCreateAction(identity_create_action) => { - let fee_multiplier = identity_create_action.fee_multiplier(); + let fee_multiplier = identity_create_action.user_fee_increase(); let identity = identity_create_action.into(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -80,7 +80,7 @@ impl<'a> ExecutionEvent<'a> { }) } StateTransitionAction::IdentityTopUpAction(identity_top_up_action) => { - let fee_multiplier = identity_top_up_action.fee_multiplier(); + let fee_multiplier = identity_top_up_action.user_fee_increase(); let added_balance = identity_top_up_action.top_up_balance_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -99,7 +99,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditWithdrawalAction(identity_credit_withdrawal) => { - let fee_multiplier = identity_credit_withdrawal.fee_multiplier(); + let fee_multiplier = identity_credit_withdrawal.user_fee_increase(); let removed_balance = identity_credit_withdrawal.amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -118,7 +118,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditTransferAction(identity_credit_transfer) => { - let fee_multiplier = identity_credit_transfer.fee_multiplier(); + let fee_multiplier = identity_credit_transfer.user_fee_increase(); let removed_balance = identity_credit_transfer.transfer_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -137,7 +137,7 @@ impl<'a> ExecutionEvent<'a> { } } _ => { - let fee_multiplier = action.fee_multiplier(); + let fee_multiplier = action.user_fee_increase(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; if let Some(identity) = identity { 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 b9a12a26153..40dd90f8ca3 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 @@ -185,7 +185,7 @@ mod tests { platform_version, ) .expect("to be able to convert data contract to serialization format"), - fee_multiplier: 0, + user_fee_increase: 0, signature: BinaryData::new(vec![0; 65]), signature_public_key_id: 0, }; @@ -266,7 +266,7 @@ mod tests { platform_version, ) .expect("to be able to convert data contract to serialization format"), - fee_multiplier: 0, + user_fee_increase: 0, signature: BinaryData::new(vec![0; 65]), signature_public_key_id: 0, }; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs index 3dec4101ebd..2d986885956 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs @@ -94,7 +94,7 @@ impl DocumentsBatchStateTransitionStateValidationV0 for DocumentsBatchTransition ), ))?, owner_id, - state_transition_action.fee_multiplier(), + state_transition_action.user_fee_increase(), )?, ), ); @@ -136,7 +136,7 @@ impl DocumentsBatchStateTransitionStateValidationV0 for DocumentsBatchTransition ), ))?, owner_id, - state_transition_action.fee_multiplier(), + state_transition_action.user_fee_increase(), )?, ), ); diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs index 1f0c4cb5270..a09dc2701d5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs @@ -103,7 +103,7 @@ impl DocumentsBatchTransitionTransformerV0 for DocumentsBatchTransition { execution_context: &mut StateTransitionExecutionContext, ) -> Result, Error> { let owner_id = self.owner_id(); - let fee_multiplier = self.fee_multiplier(); + let fee_multiplier = self.user_fee_increase(); let platform_version = platform.state.current_platform_version()?; let mut transitions_by_contracts_and_types: BTreeMap< &Identifier, diff --git a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs index 07e0240e3a4..2ee612ce35b 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs @@ -555,7 +555,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -670,7 +670,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -769,7 +769,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_delete_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: BinaryData::default(), } @@ -870,7 +870,7 @@ impl NetworkStrategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_replace_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: BinaryData::default(), } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index e86fa9b01e4..d1337d0fb78 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -37,7 +37,7 @@ impl DataContractCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { DataContractCreateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 c55623be8b2..451e4c9dd68 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 @@ -21,7 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_nonce: value.identity_nonce, - fee_multiplier: value.fee_multiplier, + fee_multiplier: value.user_fee_increase, }) } } @@ -42,7 +42,7 @@ impl TryFromPlatformVersioned<&DataContractCreateTransitionV0> platform_version, )?, identity_nonce: value.identity_nonce, - fee_multiplier: value.fee_multiplier, + fee_multiplier: value.user_fee_increase, }) } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index 92e530745d5..288c65c536b 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -39,7 +39,7 @@ impl DataContractUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { DataContractUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 7a69368d51a..d45fce3c94e 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 @@ -21,7 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, - fee_multiplier: value.fee_multiplier, + fee_multiplier: value.user_fee_increase, }) } } @@ -42,7 +42,7 @@ impl TryFromPlatformVersioned<&DataContractUpdateTransitionV0> platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, - fee_multiplier: value.fee_multiplier, + fee_multiplier: value.user_fee_increase, }) } } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs index 80bff42d263..d8147526910 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs @@ -65,7 +65,7 @@ impl DocumentsBatchTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { DocumentsBatchTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs index e6bd239cea4..ccb1f4a57bb 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs @@ -51,7 +51,7 @@ impl IdentityCreateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { IdentityCreateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 137c4af5c4f..62a7d63181a 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 @@ -46,7 +46,7 @@ impl IdentityCreditTransferTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { IdentityCreditTransferTransitionAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs index e9b27796c4c..06da56daed4 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs @@ -8,7 +8,7 @@ impl From for IdentityCreditTransferTransiti recipient_id, amount, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; IdentityCreditTransferTransitionActionV0 { @@ -28,7 +28,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id, amount, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; IdentityCreditTransferTransitionActionV0 { diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index 297059afeaa..bea0748798c 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -58,7 +58,7 @@ impl IdentityCreditWithdrawalTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.fee_multiplier, } 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 6984796563d..4f72be110d9 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 @@ -47,7 +47,7 @@ impl IdentityCreditWithdrawalTransitionActionV0 { nonce: identity_credit_withdrawal.nonce, prepared_withdrawal_document: withdrawal_document, amount: identity_credit_withdrawal.amount, - fee_multiplier: identity_credit_withdrawal.fee_multiplier, + fee_multiplier: identity_credit_withdrawal.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs index dcdb2098919..01dfc7e066e 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs @@ -39,7 +39,7 @@ impl IdentityTopUpTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { IdentityTopUpTransitionAction::V0(transition) => transition.fee_multiplier, } 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 502d94b0637..b5ffcb61a42 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 @@ -17,7 +17,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; @@ -47,7 +47,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index 48b960d626e..f32ab824e3c 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -62,7 +62,7 @@ impl IdentityUpdateTransitionAction { } /// fee multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { IdentityUpdateTransitionAction::V0(transition) => transition.fee_multiplier, } 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 a949d1e198c..e64d41d1c74 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 @@ -10,7 +10,7 @@ impl From for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; IdentityUpdateTransitionActionV0 { @@ -34,7 +34,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; IdentityUpdateTransitionActionV0 { diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index 2e7b3030ec9..22c0969c677 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -56,21 +56,21 @@ pub enum StateTransitionAction { impl StateTransitionAction { /// The fee multiplier for the action - pub fn fee_multiplier(&self) -> UserFeeIncrease { + pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - StateTransitionAction::DataContractCreateAction(action) => action.fee_multiplier(), - StateTransitionAction::DataContractUpdateAction(action) => action.fee_multiplier(), - StateTransitionAction::DocumentsBatchAction(action) => action.fee_multiplier(), - StateTransitionAction::IdentityCreateAction(action) => action.fee_multiplier(), - StateTransitionAction::IdentityTopUpAction(action) => action.fee_multiplier(), + StateTransitionAction::DataContractCreateAction(action) => action.user_fee_increase(), + StateTransitionAction::DataContractUpdateAction(action) => action.user_fee_increase(), + StateTransitionAction::DocumentsBatchAction(action) => action.user_fee_increase(), + StateTransitionAction::IdentityCreateAction(action) => action.user_fee_increase(), + StateTransitionAction::IdentityTopUpAction(action) => action.user_fee_increase(), StateTransitionAction::IdentityCreditWithdrawalAction(action) => { - action.fee_multiplier() + action.user_fee_increase() } - StateTransitionAction::IdentityUpdateAction(action) => action.fee_multiplier(), - StateTransitionAction::IdentityCreditTransferAction(action) => action.fee_multiplier(), - StateTransitionAction::BumpIdentityNonceAction(action) => action.fee_multiplier(), + StateTransitionAction::IdentityUpdateAction(action) => action.user_fee_increase(), + StateTransitionAction::IdentityCreditTransferAction(action) => action.user_fee_increase(), + StateTransitionAction::BumpIdentityNonceAction(action) => action.user_fee_increase(), StateTransitionAction::BumpIdentityDataContractNonceAction(action) => { - action.fee_multiplier() + action.user_fee_increase() } } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index 2d9e2df7fd2..d25c2ce411d 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -35,7 +35,7 @@ impl BumpIdentityDataContractNonceActionAccessorsV0 for BumpIdentityDataContract } } - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { BumpIdentityDataContractNonceAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index d10f9216b57..9de4cd46312 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -27,5 +27,5 @@ pub trait BumpIdentityDataContractNonceActionAccessorsV0 { /// Identity contract nonce fn identity_contract_nonce(&self) -> IdentityNonce; /// Fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease; + fn user_fee_increase(&self) -> UserFeeIncrease; } 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 592c1df60b8..d100b80f7c5 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 @@ -93,7 +93,7 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { @@ -111,7 +111,7 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index 0cff2547a28..0bdf5eabc24 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -29,7 +29,7 @@ impl BumpIdentityNonceActionAccessorsV0 for BumpIdentityNonceAction { } } - fn fee_multiplier(&self) -> UserFeeIncrease { + fn user_fee_increase(&self) -> UserFeeIncrease { match self { BumpIdentityNonceAction::V0(transition) => transition.fee_multiplier, } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index 7454d2f7fab..a478fe3f156 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -25,5 +25,5 @@ pub trait BumpIdentityNonceActionAccessorsV0 { fn identity_nonce(&self) -> IdentityNonce; /// fee multiplier - fn fee_multiplier(&self) -> UserFeeIncrease; + fn user_fee_increase(&self) -> UserFeeIncrease; } 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 f93d557721c..b2256ae5b45 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 @@ -15,7 +15,7 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { @@ -32,7 +32,7 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { @@ -83,7 +83,7 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { @@ -100,7 +100,7 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { @@ -151,7 +151,7 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { @@ -168,7 +168,7 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase: fee_multiplier, .. } = value; Ok(BumpIdentityNonceActionV0 { diff --git a/packages/strategy-tests/src/lib.rs b/packages/strategy-tests/src/lib.rs index a2befe0a9ee..debb6159d5f 100644 --- a/packages/strategy-tests/src/lib.rs +++ b/packages/strategy-tests/src/lib.rs @@ -668,7 +668,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 2, signature: BinaryData::default(), } @@ -782,7 +782,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id(), transitions: vec![document_create_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 1, signature: BinaryData::default(), } @@ -885,7 +885,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_delete_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 1, signature: BinaryData::default(), } @@ -991,7 +991,7 @@ impl Strategy { DocumentsBatchTransitionV0 { owner_id: identity.id, transitions: vec![document_replace_transition.into()], - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 1, signature: BinaryData::default(), } diff --git a/packages/strategy-tests/src/transitions.rs b/packages/strategy-tests/src/transitions.rs index 08fc854cd7f..75950553a3e 100644 --- a/packages/strategy-tests/src/transitions.rs +++ b/packages/strategy-tests/src/transitions.rs @@ -481,7 +481,7 @@ pub fn create_identity_withdrawal_transition( pooling: Pooling::Never, output_script: CoreScript::random_p2sh(rng), nonce: *nonce, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } @@ -552,7 +552,7 @@ pub fn create_identity_credit_transfer_transition( recipient_id: recipient.id(), amount, nonce: *nonce, - fee_multiplier: 0, + user_fee_increase: 0, signature_public_key_id: 0, signature: Default::default(), } From b43bd895a94cadce0d217f2514153d136f668f07 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 11:55:37 +0700 Subject: [PATCH 08/22] changed an add to a saturating add --- packages/rs-dpp/src/fee/fee_result/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index a3fc73edeaa..178f90923ae 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -202,7 +202,7 @@ impl FeeResult { if additional_processing_fee > u64::MAX as u128 { self.processing_fee = u64::MAX; } else { - self.processing_fee += additional_processing_fee as u64; + self.processing_fee = self.processing_fee.saturating_add(additional_processing_fee as u64); } } From 94180de07e2334c0c7752a1644ca65af1bdb6061 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 12:00:22 +0700 Subject: [PATCH 09/22] renamed things --- packages/rs-dpp/src/fee/fee_result/mod.rs | 4 ++-- packages/rs-dpp/src/state_transition/mod.rs | 8 ++++---- .../state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 8 ++++---- .../v0/state_transition_like.rs | 2 +- .../documents_batch_transition/state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../identity_create_transition/state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../identity_topup_transition/state_transition_like.rs | 4 ++-- .../identity_topup_transition/v0/state_transition_like.rs | 2 +- .../identity_update_transition/state_transition_like.rs | 4 ++-- .../v0/state_transition_like.rs | 2 +- .../src/state_transition/traits/state_transition_like.rs | 2 +- packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs | 2 +- .../state_transition_processing/execute_event/v0/mod.rs | 2 +- .../validate_fees_of_event/v0/mod.rs | 4 ++-- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index 178f90923ae..34b5adf1cd1 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -195,9 +195,9 @@ impl FeeResult { } /// Apply a fee multiplier to a fee result - pub fn apply_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + pub fn apply_user_fee_increase(&mut self, add_fee_percentage_multiplier: UserFeeIncrease) { let additional_processing_fee = (self.processing_fee as u128) - .saturating_mul(fee_multiplier as u128) + .saturating_mul(add_fee_percentage_multiplier as u128) .saturating_div(100); if additional_processing_fee > u64::MAX as u128 { self.processing_fee = u64::MAX; diff --git a/packages/rs-dpp/src/state_transition/mod.rs b/packages/rs-dpp/src/state_transition/mod.rs index da085f06ed1..ed4ba49f282 100644 --- a/packages/rs-dpp/src/state_transition/mod.rs +++ b/packages/rs-dpp/src/state_transition/mod.rs @@ -301,8 +301,8 @@ impl StateTransition { call_method!(self, signature) } - /// returns the fee_multiplier - pub fn fee_multiplier(&self) -> UserFeeIncrease { + /// returns the fee_increase additional percentage multiplier, it affects only processing costs + pub fn user_fee_increase(&self) -> UserFeeIncrease { call_method!(self, user_fee_increase) } @@ -339,8 +339,8 @@ impl StateTransition { } /// set fee multiplier - pub fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { - call_method!(self, set_fee_multiplier, fee_multiplier) + pub fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { + call_method!(self, set_user_fee_increase, fee_multiplier) } /// set a new signature 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 a068f14a8e2..e8c7765558b 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 @@ -43,10 +43,10 @@ impl StateTransitionLike for DataContractCreateTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { DataContractCreateTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 5ddf06900b1..6f879c2b7e8 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 @@ -54,7 +54,7 @@ impl StateTransitionLike for DataContractCreateTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 258b8a61c4d..7c03a33becc 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 @@ -56,17 +56,17 @@ impl StateTransitionLike for DataContractUpdateTransition { } } - /// returns the fee multiplier + /// returns the fee increase multiplier fn user_fee_increase(&self) -> UserFeeIncrease { match self { DataContractUpdateTransition::V0(transition) => transition.user_fee_increase(), } } - /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + /// set a fee increase multiplier + fn set_user_fee_increase(&mut self, user_fee_increase: UserFeeIncrease) { match self { DataContractUpdateTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(user_fee_increase) } } } 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 2707263518c..5ada17858d9 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 @@ -55,7 +55,7 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs index 36ed6f20638..40f051e36a4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/state_transition_like.rs @@ -49,10 +49,10 @@ impl StateTransitionLike for DocumentsBatchTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { DocumentsBatchTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs index cb4f75f6f2e..4e7f896ef79 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/state_transition_like.rs @@ -66,7 +66,7 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 61593014b41..4c4c51d055b 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 @@ -49,10 +49,10 @@ impl StateTransitionLike for IdentityCreateTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreateTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 ff458cc3999..b7fa64591ce 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 @@ -60,7 +60,7 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { self.fee_multiplier } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.fee_multiplier = fee_multiplier } } 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 86387ff37b1..dd5cede96be 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 @@ -51,10 +51,10 @@ impl StateTransitionLike for IdentityCreditTransferTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreditTransferTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 ce4ee9c7f26..95133643c2b 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 @@ -64,7 +64,7 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 584a304c694..dc21b8c52db 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 @@ -47,10 +47,10 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityCreditWithdrawalTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 40ed636c31d..15c9358967e 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 @@ -65,7 +65,7 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 6fa21e5f2d1..ced05743a77 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 @@ -49,10 +49,10 @@ impl StateTransitionLike for IdentityTopUpTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityTopUpTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 7ae1576d85b..6ce15c32a56 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 @@ -72,7 +72,7 @@ impl StateTransitionLike for IdentityTopUpTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 7b3cf299f52..ccd82e9af96 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 @@ -49,10 +49,10 @@ impl StateTransitionLike for IdentityUpdateTransition { } } /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { match self { IdentityUpdateTransition::V0(transition) => { - transition.set_fee_multiplier(fee_multiplier) + transition.set_user_fee_increase(fee_multiplier) } } } 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 cccb633d0ea..8145e1d385a 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 @@ -64,7 +64,7 @@ impl StateTransitionLike for IdentityUpdateTransitionV0 { self.user_fee_increase } - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) { + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { self.user_fee_increase = fee_multiplier } } 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 b08713fa362..f5428b749a7 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 @@ -40,7 +40,7 @@ pub trait StateTransitionLike: /// returns the fee multiplier fn user_fee_increase(&self) -> UserFeeIncrease; /// set a fee multiplier - fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease); + fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease); /// get modified ids list fn modified_data_ids(&self) -> Vec; 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 cb66c852b7c..66573a73f8f 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 @@ -451,7 +451,7 @@ mod tests { .try_into_platform_versioned(platform_version) .expect("expected a state transition"); - create_contract_state_transition.set_fee_multiplier(100); // This means that things will be twice as expensive + create_contract_state_transition.set_user_fee_increase(100); // This means that things will be twice as expensive create_contract_state_transition .sign(&key, private_key.as_slice(), &NativeBlsModule) 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 f4c3c92a604..d7472179df7 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 @@ -86,7 +86,7 @@ where platform_version, )?; - individual_fee_result.apply_fee_multiplier(fee_multiplier); + individual_fee_result.apply_user_fee_increase(fee_multiplier); let balance_change = individual_fee_result.into_balance_change(identity.id); 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 29d793b4474..62ca3868d40 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 @@ -72,7 +72,7 @@ where platform_version, )?; - estimated_fee_result.apply_fee_multiplier(*fee_multiplier); + estimated_fee_result.apply_user_fee_increase(*fee_multiplier); // TODO: Should take into account refunds as well let total_fee = estimated_fee_result.total_base_fee(); @@ -124,7 +124,7 @@ where platform_version, )?; - estimated_fee_result.apply_fee_multiplier(*fee_multiplier); + estimated_fee_result.apply_user_fee_increase(*fee_multiplier); // TODO: Should take into account refunds as well let required_balance = estimated_fee_result.total_base_fee(); From f6a6c6055d47d33d187b31854c774ef9ef52809e Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 12:11:19 +0700 Subject: [PATCH 10/22] renamed things --- .../methods/mod.rs | 4 +- .../methods/v0/mod.rs | 2 +- .../v0/v0_methods.rs | 4 +- .../documents_batch_transition/methods/mod.rs | 8 ++-- .../methods/v0/mod.rs | 4 +- .../v0/v0_methods.rs | 8 ++-- .../identity_create_transition/v0/mod.rs | 9 ++-- .../v0/state_transition_like.rs | 4 +- .../methods/mod.rs | 4 +- .../methods/v0/mod.rs | 2 +- .../v0/v0_methods.rs | 4 +- .../identity_topup_transition/methods/mod.rs | 4 +- .../methods/v0/mod.rs | 2 +- .../v0/v0_methods.rs | 4 +- .../v0/value_conversion.rs | 2 +- .../identity_update_transition/methods/mod.rs | 4 +- .../methods/v0/mod.rs | 2 +- .../v0/v0_methods.rs | 4 +- .../v0/value_conversion.rs | 2 +- .../execute_event/v0/mod.rs | 4 +- .../validate_fees_of_event/v0/mod.rs | 4 +- .../execution/types/execution_event/mod.rs | 14 +++--- .../documents_batch/transformer/v0/mod.rs | 2 +- .../contract/data_contract_create/mod.rs | 2 +- .../contract/data_contract_create/v0/mod.rs | 2 +- .../data_contract_create/v0/transformer.rs | 4 +- .../contract/data_contract_update/mod.rs | 2 +- .../contract/data_contract_update/v0/mod.rs | 2 +- .../data_contract_update/v0/transformer.rs | 4 +- .../document/documents_batch/mod.rs | 2 +- .../document/documents_batch/v0/mod.rs | 2 +- .../identity/identity_create/mod.rs | 2 +- .../identity/identity_create/v0/mod.rs | 2 +- .../identity_create/v0/transformer.rs | 4 +- .../identity/identity_credit_transfer/mod.rs | 2 +- .../identity_credit_transfer/v0/mod.rs | 2 +- .../v0/transformer.rs | 8 ++-- .../identity_credit_withdrawal/mod.rs | 2 +- .../identity_credit_withdrawal/v0/mod.rs | 2 +- .../v0/transformer.rs | 2 +- .../identity/identity_topup/mod.rs | 2 +- .../identity/identity_topup/v0/mod.rs | 2 +- .../identity/identity_topup/v0/transformer.rs | 8 ++-- .../identity/identity_update/mod.rs | 2 +- .../identity/identity_update/v0/mod.rs | 2 +- .../identity_update/v0/transformer.rs | 8 ++-- .../mod.rs | 2 +- .../transformer.rs | 16 +++---- .../v0/mod.rs | 2 +- .../v0/transformer.rs | 32 ++++++------- .../system/bump_identity_nonce_action/mod.rs | 2 +- .../bump_identity_nonce_action/v0/mod.rs | 2 +- .../v0/transformer.rs | 48 +++++++++---------- 53 files changed, 137 insertions(+), 138 deletions(-) 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 af46bc2226e..ce5a7654f57 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 @@ -21,7 +21,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, feature_version: Option, @@ -38,7 +38,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { identity, key_id, identity_contract_nonce, - fee_multiplier, + user_fee_increase, signer, platform_version, feature_version, 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 5ea5e4c1ef8..d22b9209f2b 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 @@ -27,7 +27,7 @@ pub trait DataContractUpdateTransitionMethodsV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, feature_version: Option, 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 a5dfc1e9ec8..b81a74b5b05 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 @@ -20,7 +20,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { identity: &PartialIdentity, key_id: KeyID, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _feature_version: Option, @@ -28,7 +28,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 { let transition = DataContractUpdateTransition::V0(DataContractUpdateTransitionV0 { identity_contract_nonce, data_contract: data_contract.try_into_platform_versioned(platform_version)?, - user_fee_increase: fee_multiplier, + user_fee_increase, signature_public_key_id: key_id, signature: Default::default(), }); diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs index 2d54596f3ee..18d5b757207 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs @@ -36,7 +36,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -57,7 +57,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { entropy, identity_public_key, identity_contract_nonce, - fee_multiplier, + user_fee_increase, signer, platform_version, batch_feature_version, @@ -79,7 +79,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -99,7 +99,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransition { document_type, identity_public_key, identity_contract_nonce, - fee_multiplier, + user_fee_increase, signer, platform_version, batch_feature_version, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs index 3a6967398ef..880a83b55d3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs @@ -22,7 +22,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, batch_feature_version: Option, @@ -36,7 +36,7 @@ pub trait DocumentsBatchTransitionMethodsV0: DocumentsBatchTransitionAccessorsV0 document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index b53c882e7fd..7e7af068ed4 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -34,7 +34,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { entropy: [u8; 32], identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -54,7 +54,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![create_transition.into()], - user_fee_increase: fee_multiplier, + user_fee_increase, signature_public_key_id: 0, signature: Default::default(), } @@ -74,7 +74,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { document_type: DocumentTypeRef, identity_public_key: &IdentityPublicKey, identity_contract_nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, _batch_feature_version: Option, @@ -93,7 +93,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 { let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 { owner_id, transitions: vec![replace_transition.into()], - user_fee_increase: fee_multiplier, + user_fee_increase, signature_public_key_id: 0, signature: Default::default(), } 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 bb04a709646..0d9dcd226c3 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 @@ -45,7 +45,7 @@ pub struct IdentityCreateTransitionV0 { #[platform_signable(into = "Vec")] pub public_keys: Vec, pub asset_lock_proof: AssetLockProof, - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, #[platform_signable(exclude_from_sig_hash)] pub signature: BinaryData, #[cfg_attr(feature = "state-transition-serde-conversion", serde(skip))] @@ -63,8 +63,7 @@ struct IdentityCreateTransitionV0Inner { public_keys: Vec, asset_lock_proof: AssetLockProof, // Generic identity ST fields - fee_multiplier: UserFeeIncrease, - // protocol_version: u32, + user_fee_increase: UserFeeIncrease, signature: BinaryData, } @@ -75,14 +74,14 @@ impl TryFrom for IdentityCreateTransitionV0 { let IdentityCreateTransitionV0Inner { public_keys, asset_lock_proof, - fee_multiplier, + user_fee_increase, signature, } = value; let identity_id = asset_lock_proof.create_identifier()?; Ok(Self { public_keys, asset_lock_proof, - fee_multiplier, + user_fee_increase, signature, identity_id, }) 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 b7fa64591ce..9aa5ee38a6c 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 @@ -57,10 +57,10 @@ impl StateTransitionLike for IdentityCreateTransitionV0 { } fn user_fee_increase(&self) -> UserFeeIncrease { - self.fee_multiplier + self.user_fee_increase } fn set_user_fee_increase(&mut self, fee_multiplier: UserFeeIncrease) { - self.fee_multiplier = fee_multiplier + self.user_fee_increase = fee_multiplier } } 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 974c24dc582..3279f75f5f3 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 @@ -23,7 +23,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: S, nonce: IdentityNonce, platform_version: &PlatformVersion, @@ -41,7 +41,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount, pooling, core_fee_per_byte, - fee_multiplier, + user_fee_increase, signer, nonce, platform_version, 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 b3e226ffe79..9c23cf73d01 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 @@ -15,7 +15,7 @@ pub trait IdentityCreditWithdrawalTransitionMethodsV0 { amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index a41caa43558..8b6500f3daf 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -19,7 +19,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra amount: u64, pooling: Pooling, core_fee_per_byte: u32, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: S, nonce: IdentityNonce, _platform_version: &PlatformVersion, @@ -32,7 +32,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra pooling, output_script, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, signature_public_key_id: 0, signature: Default::default(), } 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 81e51ebc69c..80497eb1816 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 @@ -18,7 +18,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, platform_version: &PlatformVersion, version: Option, ) -> Result { @@ -32,7 +32,7 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransition { identity, asset_lock_proof, asset_lock_proof_private_key, - fee_multiplier, + user_fee_increase, platform_version, version, )?), 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 4f3e496004b..2eb43f57e13 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 @@ -10,7 +10,7 @@ pub trait IdentityTopUpTransitionMethodsV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, platform_version: &PlatformVersion, version: Option, ) -> Result; 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 aa30dcefe90..5a70704d269 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 @@ -21,14 +21,14 @@ impl IdentityTopUpTransitionMethodsV0 for IdentityTopUpTransitionV0 { identity: &Identity, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &[u8], - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, _platform_version: &PlatformVersion, _version: Option, ) -> Result { let identity_top_up_transition = IdentityTopUpTransitionV0 { asset_lock_proof, identity_id: identity.id(), - user_fee_increase: fee_multiplier, + user_fee_increase, signature: Default::default(), }; 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 9463c1572b3..3ab9f678d77 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 @@ -43,7 +43,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { signature, identity_id, asset_lock_proof, - user_fee_increase: fee_multiplier, + user_fee_increase, }) } 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 ed03ab3d72a..818233372d9 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 @@ -23,7 +23,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, version: Option, @@ -42,7 +42,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransition { disable_public_keys, public_keys_disabled_at, nonce, - fee_multiplier, + user_fee_increase, signer, platform_version, version, 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 32d7617fac7..8d3923a5db5 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 @@ -16,7 +16,7 @@ pub trait IdentityUpdateTransitionMethodsV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, platform_version: &PlatformVersion, version: Option, 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 2d02a3e2a04..d324e15be2f 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 @@ -34,7 +34,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { disable_public_keys: Vec, public_keys_disabled_at: Option, nonce: IdentityNonce, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, signer: &S, _platform_version: &PlatformVersion, _version: Option, @@ -53,7 +53,7 @@ impl IdentityUpdateTransitionMethodsV0 for IdentityUpdateTransitionV0 { add_public_keys: add_public_keys_in_creation, disable_public_keys, public_keys_disabled_at, - user_fee_increase: fee_multiplier, + user_fee_increase, }; let state_transition: StateTransition = identity_update_transition.clone().into(); 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 92cd06cd259..4b81615712a 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 @@ -61,7 +61,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { add_public_keys, disable_public_keys, public_keys_disabled_at, - user_fee_increase: fee_multiplier, + user_fee_increase, }) } 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 d7472179df7..7e8e07a0ee1 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 @@ -56,14 +56,14 @@ where identity, operations, execution_operations, - fee_multiplier, + user_fee_increase, .. } | ExecutionEvent::PaidDriveEvent { identity, operations, execution_operations, - fee_multiplier, + user_fee_increase, .. } => { if fee_validation_result.is_valid_with_data() { 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 62ca3868d40..674f5860cc6 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 @@ -48,7 +48,7 @@ where added_balance, operations, execution_operations, - fee_multiplier, + user_fee_increase, } => { let previous_balance = identity.balance.ok_or(Error::Execution( ExecutionError::CorruptedCodeExecution("partial identity info with no balance"), @@ -99,7 +99,7 @@ where removed_balance, operations, execution_operations, - fee_multiplier, + user_fee_increase, } => { let balance = identity.balance.ok_or(Error::Execution( ExecutionError::CorruptedCodeExecution("partial identity info with no balance"), 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 ab7b03017ba..8775f5274ec 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 @@ -35,7 +35,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, }, /// A drive event that is paid from an asset lock PaidFromAssetLockDriveEvent { @@ -48,7 +48,7 @@ pub(in crate::execution) enum ExecutionEvent<'a> { /// the execution operations that we must also pay for execution_operations: Vec, /// the fee multiplier that the user agreed to, 0 means 100% of the base fee, 1 means 101% - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, }, /// A drive event that is free FreeDriveEvent { @@ -76,7 +76,7 @@ impl<'a> ExecutionEvent<'a> { added_balance: 0, operations, execution_operations: execution_context.operations_consume(), - fee_multiplier, + user_fee_increase, }) } StateTransitionAction::IdentityTopUpAction(identity_top_up_action) => { @@ -90,7 +90,7 @@ impl<'a> ExecutionEvent<'a> { added_balance, operations, execution_operations: execution_context.operations_consume(), - fee_multiplier, + user_fee_increase, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -109,7 +109,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: Some(removed_balance), operations, execution_operations: execution_context.operations_consume(), - fee_multiplier, + user_fee_increase, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -128,7 +128,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: Some(removed_balance), operations, execution_operations: execution_context.operations_consume(), - fee_multiplier, + user_fee_increase, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( @@ -146,7 +146,7 @@ impl<'a> ExecutionEvent<'a> { removed_balance: None, operations, execution_operations: execution_context.operations_consume(), - fee_multiplier, + user_fee_increase, }) } else { Err(Error::Execution(ExecutionError::CorruptedCodeExecution( diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs index a09dc2701d5..075f3a228fe 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs @@ -156,7 +156,7 @@ impl DocumentsBatchTransitionTransformerV0 for DocumentsBatchTransition { let batch_transition_action = DocumentsBatchTransitionActionV0 { owner_id, transitions: validation_result.into_data()?, - fee_multiplier, + user_fee_increase, } .into(); Ok(ConsensusValidationResult::new_with_data( diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index d1337d0fb78..cd2a3aa11c6 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -39,7 +39,7 @@ impl DataContractCreateTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DataContractCreateTransitionAction::V0(transition) => transition.fee_multiplier, + DataContractCreateTransitionAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs index d2e01ac8c3a..d1bf2f2ea45 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs @@ -12,5 +12,5 @@ pub struct DataContractCreateTransitionActionV0 { /// identity nonce pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } 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 451e4c9dd68..9291d787372 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 @@ -21,7 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_nonce: value.identity_nonce, - fee_multiplier: value.user_fee_increase, + user_fee_increase: value.user_fee_increase, }) } } @@ -42,7 +42,7 @@ impl TryFromPlatformVersioned<&DataContractCreateTransitionV0> platform_version, )?, identity_nonce: value.identity_nonce, - fee_multiplier: value.user_fee_increase, + user_fee_increase: value.user_fee_increase, }) } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index 288c65c536b..f73ab4d30cc 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -41,7 +41,7 @@ impl DataContractUpdateTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DataContractUpdateTransitionAction::V0(transition) => transition.fee_multiplier, + DataContractUpdateTransitionAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs index de93ef5b1a6..6551c7b5bab 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs @@ -12,5 +12,5 @@ pub struct DataContractUpdateTransitionActionV0 { /// identity contract nonce pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } 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 d45fce3c94e..009da92b40e 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 @@ -21,7 +21,7 @@ impl TryFromPlatformVersioned platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, - fee_multiplier: value.user_fee_increase, + user_fee_increase: value.user_fee_increase, }) } } @@ -42,7 +42,7 @@ impl TryFromPlatformVersioned<&DataContractUpdateTransitionV0> platform_version, )?, identity_contract_nonce: value.identity_contract_nonce, - fee_multiplier: value.user_fee_increase, + user_fee_increase: value.user_fee_increase, }) } } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs index d8147526910..d6581cd9d1e 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/mod.rs @@ -67,7 +67,7 @@ impl DocumentsBatchTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - DocumentsBatchTransitionAction::V0(transition) => transition.fee_multiplier, + DocumentsBatchTransitionAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs index 87a0c073bb5..6fef9bd8537 100644 --- a/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/document/documents_batch/v0/mod.rs @@ -10,5 +10,5 @@ pub struct DocumentsBatchTransitionActionV0 { /// The inner transitions pub transitions: Vec, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs index ccb1f4a57bb..c2c978ca99c 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_create/mod.rs @@ -53,7 +53,7 @@ impl IdentityCreateTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreateTransitionAction::V0(transition) => transition.fee_multiplier, + IdentityCreateTransitionAction::V0(transition) => transition.user_fee_increase, } } } 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 4443235d2fe..4abd643ff98 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 @@ -25,7 +25,7 @@ pub struct IdentityCreateTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } impl From for PartialIdentity { 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 f17a20409d6..5a7880a477b 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 @@ -36,7 +36,7 @@ impl IdentityCreateTransitionActionV0 { initial_balance_amount, identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), - fee_multiplier: value.fee_multiplier, + user_fee_increase: value.user_fee_increase, }) } @@ -67,7 +67,7 @@ impl IdentityCreateTransitionActionV0 { initial_balance_amount, identity_id: *identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), - fee_multiplier: value.fee_multiplier, + user_fee_increase: value.user_fee_increase, }) } } 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 62a7d63181a..3f9ed324564 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 @@ -48,7 +48,7 @@ impl IdentityCreditTransferTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreditTransferTransitionAction::V0(transition) => transition.fee_multiplier, + IdentityCreditTransferTransitionAction::V0(transition) => transition.user_fee_increase, } } } 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 e0d0f2f680a..a6270711890 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 @@ -18,5 +18,5 @@ pub struct IdentityCreditTransferTransitionActionV0 { /// nonce pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs index 06da56daed4..940f77f37b9 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs @@ -8,7 +8,7 @@ impl From for IdentityCreditTransferTransiti recipient_id, amount, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; IdentityCreditTransferTransitionActionV0 { @@ -16,7 +16,7 @@ impl From for IdentityCreditTransferTransiti recipient_id, transfer_amount: amount, nonce, - fee_multiplier, + user_fee_increase, } } } @@ -28,7 +28,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id, amount, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; IdentityCreditTransferTransitionActionV0 { @@ -36,7 +36,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id: *recipient_id, transfer_amount: *amount, nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index bea0748798c..c4142f7dc9f 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -60,7 +60,7 @@ impl IdentityCreditWithdrawalTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.fee_multiplier, + IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs index f9120efd281..75726ab70cf 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs @@ -19,5 +19,5 @@ pub struct IdentityCreditWithdrawalTransitionActionV0 { /// amount pub amount: u64, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } 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 4f72be110d9..b1d352b97e4 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 @@ -47,7 +47,7 @@ impl IdentityCreditWithdrawalTransitionActionV0 { nonce: identity_credit_withdrawal.nonce, prepared_withdrawal_document: withdrawal_document, amount: identity_credit_withdrawal.amount, - fee_multiplier: identity_credit_withdrawal.user_fee_increase, + user_fee_increase: identity_credit_withdrawal.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs index 01dfc7e066e..b9900811c49 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_topup/mod.rs @@ -41,7 +41,7 @@ impl IdentityTopUpTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityTopUpTransitionAction::V0(transition) => transition.fee_multiplier, + IdentityTopUpTransitionAction::V0(transition) => transition.user_fee_increase, } } } 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 379f41cea85..98d6b5ad7d2 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 @@ -17,5 +17,5 @@ pub struct IdentityTopUpTransitionActionV0 { /// asset lock outpoint pub asset_lock_outpoint: Bytes36, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } 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 b5ffcb61a42..22d0c72cf59 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 @@ -17,7 +17,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; @@ -35,7 +35,7 @@ impl IdentityTopUpTransitionActionV0 { top_up_balance_amount, identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), - fee_multiplier, + user_fee_increase, }) } @@ -47,7 +47,7 @@ impl IdentityTopUpTransitionActionV0 { let IdentityTopUpTransitionV0 { identity_id, asset_lock_proof, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; @@ -65,7 +65,7 @@ impl IdentityTopUpTransitionActionV0 { top_up_balance_amount, identity_id: *identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index f32ab824e3c..151e1dfcffd 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -64,7 +64,7 @@ impl IdentityUpdateTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityUpdateTransitionAction::V0(transition) => transition.fee_multiplier, + IdentityUpdateTransitionAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs index a49e381ef42..6994432090a 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs @@ -22,5 +22,5 @@ pub struct IdentityUpdateTransitionActionV0 { /// nonce used to prevent replay attacks pub nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } 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 e64d41d1c74..c257ba94f48 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 @@ -10,7 +10,7 @@ impl From for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; IdentityUpdateTransitionActionV0 { @@ -20,7 +20,7 @@ impl From for IdentityUpdateTransitionActionV0 { identity_id, revision, nonce, - fee_multiplier, + user_fee_increase, } } } @@ -34,7 +34,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { public_keys_disabled_at, revision, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; IdentityUpdateTransitionActionV0 { @@ -47,7 +47,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { identity_id: *identity_id, revision: *revision, nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, } } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index d25c2ce411d..08490744430 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -37,7 +37,7 @@ impl BumpIdentityDataContractNonceActionAccessorsV0 for BumpIdentityDataContract fn user_fee_increase(&self) -> UserFeeIncrease { match self { - BumpIdentityDataContractNonceAction::V0(transition) => transition.fee_multiplier, + BumpIdentityDataContractNonceAction::V0(transition) => transition.user_fee_increase, } } } 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 5eed31ae0e5..ec98eb4d651 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 @@ -13,14 +13,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition( value: DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_base_transition( v0, identity_id, - fee_multiplier, + user_fee_increase, )? .into(), ), @@ -31,14 +31,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_borrowed_document_base_transition( value: &DocumentBaseTransition, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransition::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_borrowed_base_transition( v0, identity_id, - fee_multiplier, + user_fee_increase, )? .into(), ), @@ -49,14 +49,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_base_transition_action( value: DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_base_transition_action( v0, identity_id, - fee_multiplier, + user_fee_increase, )? .into(), ), @@ -67,14 +67,14 @@ impl BumpIdentityDataContractNonceAction { pub fn from_document_borrowed_base_transition_action( value: &DocumentBaseTransitionAction, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { match value { DocumentBaseTransitionAction::V0(v0) => Ok( BumpIdentityDataContractNonceActionV0::try_from_borrowed_base_transition_action( v0, identity_id, - fee_multiplier, + user_fee_increase, )? .into(), ), diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index 9de4cd46312..c6cbc9d35b5 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -15,7 +15,7 @@ pub struct BumpIdentityDataContractNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_contract_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } /// document base transition action accessors v0 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 d100b80f7c5..6a338e35c41 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 @@ -14,7 +14,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition( value: DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -25,7 +25,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id, identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -33,7 +33,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition( value: &DocumentBaseTransitionV0, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionV0 { data_contract_id, @@ -44,7 +44,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: *data_contract_id, identity_contract_nonce: *identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -52,7 +52,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_base_transition_action( value: DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -63,7 +63,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: data_contract.contract.id(), identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -71,7 +71,7 @@ impl BumpIdentityDataContractNonceActionV0 { pub fn try_from_borrowed_base_transition_action( value: &DocumentBaseTransitionActionV0, identity_id: Identifier, - fee_multiplier: UserFeeIncrease, + user_fee_increase: UserFeeIncrease, ) -> Result { let DocumentBaseTransitionActionV0 { data_contract, @@ -82,7 +82,7 @@ impl BumpIdentityDataContractNonceActionV0 { identity_id, data_contract_id: data_contract.contract.id(), identity_contract_nonce: *identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -93,14 +93,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -111,14 +111,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionV0 { data_contract, identity_contract_nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce: *identity_contract_nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -129,14 +129,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionActionV0 { data_contract, identity_contract_nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce, - fee_multiplier, + user_fee_increase, }) } @@ -147,14 +147,14 @@ impl BumpIdentityDataContractNonceActionV0 { let DataContractUpdateTransitionActionV0 { data_contract, identity_contract_nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityDataContractNonceActionV0 { identity_id: data_contract.owner_id(), data_contract_id: data_contract.id(), identity_contract_nonce: *identity_contract_nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index 0bdf5eabc24..10bf0ec6a16 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -31,7 +31,7 @@ impl BumpIdentityNonceActionAccessorsV0 for BumpIdentityNonceAction { fn user_fee_increase(&self) -> UserFeeIncrease { match self { - BumpIdentityNonceAction::V0(transition) => transition.fee_multiplier, + BumpIdentityNonceAction::V0(transition) => transition.user_fee_increase, } } } diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index a478fe3f156..8f20084c8d6 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -14,7 +14,7 @@ pub struct BumpIdentityNonceActionV0 { /// The identity contract nonce, this is used to stop replay attacks pub identity_nonce: IdentityNonce, /// fee multiplier - pub fee_multiplier: UserFeeIncrease, + pub user_fee_increase: UserFeeIncrease, } /// document base transition action accessors v0 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 b2256ae5b45..cdda13b8246 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 @@ -15,13 +15,13 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -32,13 +32,13 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } @@ -49,13 +49,13 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -66,13 +66,13 @@ impl BumpIdentityNonceActionV0 { let IdentityUpdateTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } @@ -83,13 +83,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -100,13 +100,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } @@ -117,13 +117,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -134,13 +134,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditTransferTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } @@ -151,13 +151,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -168,13 +168,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionV0 { identity_id, nonce, - user_fee_increase: fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } @@ -185,13 +185,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id, identity_nonce: nonce, - fee_multiplier, + user_fee_increase, }) } @@ -202,13 +202,13 @@ impl BumpIdentityNonceActionV0 { let IdentityCreditWithdrawalTransitionActionV0 { identity_id, nonce, - fee_multiplier, + user_fee_increase, .. } = value; Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - fee_multiplier: *fee_multiplier, + user_fee_increase: *fee_multiplier, }) } } From cb75e186878ff5a584761a08818326fa403b33cf Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 12:13:22 +0700 Subject: [PATCH 11/22] renamed things --- .../src/state_transition/state_transitions/common_fields.rs | 2 +- .../data_contract_create_transition/v0/value_conversion.rs | 6 +++--- .../data_contract_update_transition/v0/value_conversion.rs | 6 +++--- .../identity_topup_transition/v0/value_conversion.rs | 6 +++--- .../identity_update_transition/v0/value_conversion.rs | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs index b737c18781e..0f9ce40402d 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs @@ -3,7 +3,7 @@ pub mod property_names { pub const IDENTITY_CONTRACT_NONCE: &str = "identityContractNonce"; pub const IDENTITY_NONCE: &str = "identityNonce"; - pub const FEE_MULTIPLIER: &str = "feeMultiplier"; + pub const USER_FEE_MULTIPLIER: &str = "feeMultiplier"; pub const SIGNATURE_PUBLIC_KEY_ID: &str = "signaturePublicKeyId"; pub const SIGNATURE: &str = "signature"; pub const TRANSITION_TYPE: &str = "type"; 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 47f95f56568..3b7e2c02aef 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 @@ -11,7 +11,7 @@ use crate::data_contract::conversion::value::v0::DataContractValueConversionMeth 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::common_fields::property_names::FEE_MULTIPLIER; +use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_MULTIPLIER; use crate::state_transition::state_transitions::contract::data_contract_create_transition::fields::{BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS}; impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { @@ -43,7 +43,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_object - .get_optional_integer(FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) @@ -77,7 +77,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_value_map - .remove_optional_integer(FEE_MULTIPLIER) + .remove_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) 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 80b45a2f57b..9c7bc6d25c7 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 @@ -5,7 +5,7 @@ use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransitionV0, BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS, }; use crate::state_transition::state_transitions::common_fields::property_names::{ - FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE, + USER_FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE, }; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; @@ -79,7 +79,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_object - .get_optional_integer(FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) @@ -117,7 +117,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_value_map - .remove_optional_integer(FEE_MULTIPLIER) + .remove_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) 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 3ab9f678d77..272e0d46bac 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 @@ -11,7 +11,7 @@ use crate::state_transition::identity_topup_transition::fields::*; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::state_transitions::common_fields::property_names::FEE_MULTIPLIER; +use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_MULTIPLIER; use platform_version::version::PlatformVersion; impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { @@ -34,8 +34,8 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { .map_err(ProtocolError::ValueError)?; let asset_lock_proof = AssetLockProof::try_from(raw_asset_lock_proof)?; - let fee_multiplier = raw_object - .get_optional_integer(FEE_MULTIPLIER) + let user_fee_increase = raw_object + .get_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(); 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 4b81615712a..883c624de9d 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 @@ -10,7 +10,7 @@ use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation use crate::state_transition::StateTransitionValueConvert; use crate::state_transition::state_transitions::common_fields::property_names::{ - FEE_MULTIPLIER, NONCE, + USER_FEE_MULTIPLIER, NONCE, }; use platform_version::version::PlatformVersion; @@ -35,8 +35,8 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { let nonce = raw_object .get_integer(NONCE) .map_err(ProtocolError::ValueError)?; - let fee_multiplier = raw_object - .get_optional_integer(FEE_MULTIPLIER) + let user_fee_increase = raw_object + .get_optional_integer(USER_FEE_MULTIPLIER) .map_err(ProtocolError::ValueError)? .unwrap_or_default(); let add_public_keys = raw_object From ebe433eec516a323f06918426bf77d555d2169e6 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 12:16:10 +0700 Subject: [PATCH 12/22] renamed things --- .../execute_event/v0/mod.rs | 2 +- .../validate_fees_of_event/v0/mod.rs | 4 ++-- .../src/execution/types/execution_event/mod.rs | 10 +++++----- .../documents_batch/transformer/v0/mod.rs | 2 +- .../identity_credit_transfer/v0/transformer.rs | 2 +- .../identity/identity_topup/v0/transformer.rs | 2 +- .../identity/identity_update/v0/transformer.rs | 2 +- .../bump_identity_nonce_action/v0/transformer.rs | 12 ++++++------ 8 files changed, 18 insertions(+), 18 deletions(-) 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 7e8e07a0ee1..929fff2092d 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 @@ -86,7 +86,7 @@ where platform_version, )?; - individual_fee_result.apply_user_fee_increase(fee_multiplier); + individual_fee_result.apply_user_fee_increase(user_fee_increase); let balance_change = individual_fee_result.into_balance_change(identity.id); 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 674f5860cc6..f1e4106fea1 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 @@ -72,7 +72,7 @@ where platform_version, )?; - estimated_fee_result.apply_user_fee_increase(*fee_multiplier); + estimated_fee_result.apply_user_fee_increase(*user_fee_increase); // TODO: Should take into account refunds as well let total_fee = estimated_fee_result.total_base_fee(); @@ -124,7 +124,7 @@ where platform_version, )?; - estimated_fee_result.apply_user_fee_increase(*fee_multiplier); + estimated_fee_result.apply_user_fee_increase(*user_fee_increase); // TODO: Should take into account refunds as well let required_balance = estimated_fee_result.total_base_fee(); 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 8775f5274ec..f09a669c309 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 @@ -67,7 +67,7 @@ impl<'a> ExecutionEvent<'a> { ) -> Result { match &action { StateTransitionAction::IdentityCreateAction(identity_create_action) => { - let fee_multiplier = identity_create_action.user_fee_increase(); + let user_fee_increase = identity_create_action.user_fee_increase(); let identity = identity_create_action.into(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -80,7 +80,7 @@ impl<'a> ExecutionEvent<'a> { }) } StateTransitionAction::IdentityTopUpAction(identity_top_up_action) => { - let fee_multiplier = identity_top_up_action.user_fee_increase(); + let user_fee_increase = identity_top_up_action.user_fee_increase(); let added_balance = identity_top_up_action.top_up_balance_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -99,7 +99,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditWithdrawalAction(identity_credit_withdrawal) => { - let fee_multiplier = identity_credit_withdrawal.user_fee_increase(); + let user_fee_increase = identity_credit_withdrawal.user_fee_increase(); let removed_balance = identity_credit_withdrawal.amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -118,7 +118,7 @@ impl<'a> ExecutionEvent<'a> { } } StateTransitionAction::IdentityCreditTransferAction(identity_credit_transfer) => { - let fee_multiplier = identity_credit_transfer.user_fee_increase(); + let user_fee_increase = identity_credit_transfer.user_fee_increase(); let removed_balance = identity_credit_transfer.transfer_amount(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; @@ -137,7 +137,7 @@ impl<'a> ExecutionEvent<'a> { } } _ => { - let fee_multiplier = action.user_fee_increase(); + let user_fee_increase = action.user_fee_increase(); let operations = action.into_high_level_drive_operations(epoch, platform_version)?; if let Some(identity) = identity { diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs index 075f3a228fe..8ba97782e98 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/transformer/v0/mod.rs @@ -103,7 +103,7 @@ impl DocumentsBatchTransitionTransformerV0 for DocumentsBatchTransition { execution_context: &mut StateTransitionExecutionContext, ) -> Result, Error> { let owner_id = self.owner_id(); - let fee_multiplier = self.user_fee_increase(); + let user_fee_increase = self.user_fee_increase(); let platform_version = platform.state.current_platform_version()?; let mut transitions_by_contracts_and_types: BTreeMap< &Identifier, diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs index 940f77f37b9..72f79a34d68 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_transfer/v0/transformer.rs @@ -36,7 +36,7 @@ impl From<&IdentityCreditTransferTransitionV0> for IdentityCreditTransferTransit recipient_id: *recipient_id, transfer_amount: *amount, nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, } } } 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 22d0c72cf59..75516f4fd63 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 @@ -65,7 +65,7 @@ impl IdentityTopUpTransitionActionV0 { top_up_balance_amount, identity_id: *identity_id, asset_lock_outpoint: Bytes36::new(outpoint_bytes), - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } } 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 c257ba94f48..6b96f281fd2 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 @@ -47,7 +47,7 @@ impl From<&IdentityUpdateTransitionV0> for IdentityUpdateTransitionActionV0 { identity_id: *identity_id, revision: *revision, nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, } } } 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 cdda13b8246..9c99de49239 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 @@ -38,7 +38,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -72,7 +72,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -106,7 +106,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -140,7 +140,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -174,7 +174,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } @@ -208,7 +208,7 @@ impl BumpIdentityNonceActionV0 { Ok(BumpIdentityNonceActionV0 { identity_id: *identity_id, identity_nonce: *nonce, - user_fee_increase: *fee_multiplier, + user_fee_increase: *user_fee_increase, }) } } From 69785be376c01347fe27ef2043879f334b8edaaa Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 14:46:40 +0700 Subject: [PATCH 13/22] fmt --- packages/rs-dpp/src/fee/fee_result/mod.rs | 4 +++- .../contract/data_contract_create_transition/v0/mod.rs | 2 +- .../contract/data_contract_update_transition/methods/mod.rs | 2 +- .../data_contract_update_transition/methods/v0/mod.rs | 2 +- .../contract/data_contract_update_transition/v0/mod.rs | 2 +- .../data_contract_update_transition/v0/v0_methods.rs | 2 +- .../data_contract_update_transition/v0/value_conversion.rs | 2 +- .../document/documents_batch_transition/methods/mod.rs | 2 +- .../document/documents_batch_transition/methods/v0/mod.rs | 2 +- .../document/documents_batch_transition/v0/v0_methods.rs | 2 +- .../identity/identity_create_transition/v0/mod.rs | 2 +- .../identity/identity_credit_transfer_transition/v0/mod.rs | 2 +- .../identity_credit_withdrawal_transition/methods/mod.rs | 2 +- .../identity_credit_withdrawal_transition/methods/v0/mod.rs | 2 +- .../identity_credit_withdrawal_transition/v0/mod.rs | 2 +- .../identity_credit_withdrawal_transition/v0/v0_methods.rs | 2 +- .../identity/identity_topup_transition/v0/mod.rs | 2 +- .../identity/identity_topup_transition/v0/v0_methods.rs | 2 +- .../identity/identity_update_transition/methods/mod.rs | 2 +- .../identity/identity_update_transition/methods/v0/mod.rs | 2 +- .../identity/identity_update_transition/v0/mod.rs | 2 +- .../identity/identity_update_transition/v0/v0_methods.rs | 2 +- .../identity_update_transition/v0/value_conversion.rs | 2 +- .../src/state_transition/traits/state_transition_like.rs | 2 +- .../state_transitions/documents_batch/state/v0/mod.rs | 2 +- .../query/identity_based_queries/identity_nonce/v0/mod.rs | 1 - .../contract/data_contract_create/mod.rs | 2 +- .../contract/data_contract_create/v0/mod.rs | 2 +- .../contract/data_contract_update/mod.rs | 2 +- .../contract/data_contract_update/v0/mod.rs | 2 +- .../identity/identity_credit_transfer/mod.rs | 2 +- .../identity/identity_credit_transfer/v0/mod.rs | 2 +- .../identity/identity_credit_withdrawal/mod.rs | 6 ++++-- .../identity/identity_credit_withdrawal/v0/mod.rs | 2 +- .../state_transition_action/identity/identity_update/mod.rs | 2 +- .../identity/identity_update/v0/mod.rs | 2 +- packages/rs-drive/src/state_transition_action/mod.rs | 4 +++- .../system/bump_identity_data_contract_nonce_action/mod.rs | 2 +- .../bump_identity_data_contract_nonce_action/v0/mod.rs | 2 +- .../system/bump_identity_nonce_action/mod.rs | 2 +- .../system/bump_identity_nonce_action/v0/mod.rs | 2 +- .../src/data_contract_factory/data_contract_factory.rs | 4 +--- .../identity_topup_transition/identity_topup_transition.rs | 4 +++- 43 files changed, 51 insertions(+), 46 deletions(-) diff --git a/packages/rs-dpp/src/fee/fee_result/mod.rs b/packages/rs-dpp/src/fee/fee_result/mod.rs index 34b5adf1cd1..c58e7b97c25 100644 --- a/packages/rs-dpp/src/fee/fee_result/mod.rs +++ b/packages/rs-dpp/src/fee/fee_result/mod.rs @@ -202,7 +202,9 @@ impl FeeResult { if additional_processing_fee > u64::MAX as u128 { self.processing_fee = u64::MAX; } else { - self.processing_fee = self.processing_fee.saturating_add(additional_processing_fee as u64); + self.processing_fee = self + .processing_fee + .saturating_add(additional_processing_fee as u64); } } 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 b44a50c609b..054004a6dc5 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 @@ -18,7 +18,7 @@ use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; use crate::data_contract::created_data_contract::CreatedDataContract; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::data_contract_create_transition::DataContractCreateTransition; use bincode::{Decode, Encode}; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; 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 ce5a7654f57..98522c59720 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 @@ -12,7 +12,7 @@ use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use platform_version::version::PlatformVersion; impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransition { 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 d22b9209f2b..1dd2d579b34 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 @@ -2,7 +2,7 @@ use crate::data_contract::DataContract; use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::StateTransition; use crate::version::FeatureVersion; use crate::ProtocolError; 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 ce2b1dfcfac..144d706ecca 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,7 +18,7 @@ use platform_version::version::PlatformVersion; use platform_version::{TryFromPlatformVersioned, TryIntoPlatformVersioned}; use crate::data_contract::serialized_version::DataContractInSerializationFormat; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::data_contract_update_transition::DataContractUpdateTransition; use crate::state_transition::StateTransition; use crate::{data_contract::DataContract, identity::KeyID, ProtocolError}; 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 b81a74b5b05..732b684b7ac 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 @@ -3,7 +3,7 @@ use crate::identity::signer::Signer; use crate::identity::{KeyID, PartialIdentity}; use crate::serialization::Signable; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::data_contract_update_transition::methods::DataContractUpdateTransitionMethodsV0; use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransition, DataContractUpdateTransitionV0, 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 9c7bc6d25c7..99a266a9142 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 @@ -5,7 +5,7 @@ use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransitionV0, BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS, }; use crate::state_transition::state_transitions::common_fields::property_names::{ - USER_FEE_MULTIPLIER, IDENTITY_CONTRACT_NONCE, + IDENTITY_CONTRACT_NONCE, USER_FEE_MULTIPLIER, }; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs index a107fe18372..c44b929bc47 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/mod.rs @@ -6,7 +6,7 @@ use crate::document::Document; use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::IdentityPublicKey; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::documents_batch_transition::document_transition::DocumentTransition; use crate::state_transition::documents_batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0; use crate::state_transition::documents_batch_transition::DocumentsBatchTransition; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs index c9b3aa326bc..ef36e3ce411 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/methods/v0/mod.rs @@ -7,7 +7,7 @@ use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::IdentityPublicKey; use crate::identity::SecurityLevel; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; use crate::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods; use crate::state_transition::documents_batch_transition::document_transition::{ diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs index 5e0ec08f448..7711326a0e3 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/v0/v0_methods.rs @@ -6,9 +6,9 @@ use crate::document::{Document, DocumentV0Getters}; use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::SecurityLevel; -use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::prelude::IdentityPublicKey; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::state_transition::documents_batch_transition::accessors::DocumentsBatchTransitionAccessorsV0; #[cfg(feature = "state-transition-signing")] use crate::state_transition::documents_batch_transition::document_create_transition::DocumentCreateTransition; 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 f44a49ca5cb..36fba74378f 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 @@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; use crate::identity::Identity; -use crate::prelude::{UserFeeIncrease, Identifier}; +use crate::prelude::{Identifier, UserFeeIncrease}; use crate::identity::accessors::IdentityGettersV0; use crate::identity::state_transition::AssetLockProved; 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 12698181fa2..b04b6f3f761 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 @@ -10,7 +10,7 @@ mod version; use crate::identity::KeyID; -use crate::prelude::{UserFeeIncrease, Identifier, IdentityNonce}; +use crate::prelude::{Identifier, IdentityNonce, UserFeeIncrease}; use crate::ProtocolError; use bincode::{Decode, Encode}; 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 348e4349c44..3aaef91f3c4 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 @@ -13,7 +13,7 @@ use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] use crate::identity::core_script::CoreScript; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::state_transition::identity_credit_withdrawal_transition::v0::IdentityCreditWithdrawalTransitionV0; #[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 4142b504095..c739eadb0eb 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 @@ -5,7 +5,7 @@ use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::Identity; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; 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 0a81d09eecb..2a5246b9ab7 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 @@ -16,7 +16,7 @@ use platform_value::BinaryData; use serde::{Deserialize, Serialize}; use crate::balances::credits::CREDITS_PER_DUFF; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::{ identity::{core_script::CoreScript, KeyID}, prelude::Identifier, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs index b6e843ea3f4..8824c15498b 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_withdrawal_transition/v0/v0_methods.rs @@ -7,7 +7,7 @@ use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::{Identity, KeyType, Purpose, SecurityLevel}; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] 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 0ed278d9ab4..8541ad0e7b8 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 @@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize}; use crate::identity::state_transition::asset_lock_proof::AssetLockProof; -use crate::prelude::{UserFeeIncrease, Identifier}; +use crate::prelude::{Identifier, UserFeeIncrease}; use crate::ProtocolError; 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 1252e1d16de..da2b8f680b3 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 @@ -2,9 +2,9 @@ use crate::identity::accessors::IdentityGettersV0; #[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::Identifier; #[cfg(feature = "state-transition-signing")] use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] 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 6d7948556df..7b5b482cb63 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 @@ -18,7 +18,7 @@ use crate::version::FeatureVersion; use crate::ProtocolError; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use platform_version::version::PlatformVersion; 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 2a897db8014..82bbceb7f1f 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 @@ -3,7 +3,7 @@ use crate::identity::signer::Signer; #[cfg(feature = "state-transition-signing")] use crate::identity::{Identity, IdentityPublicKey}; #[cfg(feature = "state-transition-signing")] -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; #[cfg(feature = "state-transition-signing")] use crate::state_transition::StateTransition; use crate::state_transition::StateTransitionType; 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 6ef1d384283..1a00215f53a 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 @@ -19,7 +19,7 @@ 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::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, UserFeeIncrease}; use crate::{ identity::KeyID, prelude::{Identifier, Revision, TimestampMillis}, 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 6e200474c50..9d58fafe151 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 @@ -19,7 +19,7 @@ use crate::identity::{Identity, IdentityPublicKey}; use crate::identity::accessors::IdentityGettersV0; #[cfg(feature = "state-transition-signing")] use crate::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use crate::prelude::{UserFeeIncrease, IdentityNonce}; +use crate::prelude::{IdentityNonce, 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; 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 883c624de9d..32c9eb46fd2 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 @@ -10,7 +10,7 @@ use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation use crate::state_transition::StateTransitionValueConvert; use crate::state_transition::state_transitions::common_fields::property_names::{ - USER_FEE_MULTIPLIER, NONCE, + NONCE, USER_FEE_MULTIPLIER, }; use platform_version::version::PlatformVersion; 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 f5428b749a7..a1d78449bee 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 @@ -2,7 +2,7 @@ use std::fmt::Debug; use platform_value::BinaryData; -use crate::prelude::{UserFeeIncrease, Identifier}; +use crate::prelude::{Identifier, UserFeeIncrease}; use crate::version::FeatureVersion; use crate::state_transition::StateTransitionType; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs index f0f4d5b0754..ac3ccabd4be 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/state/v0/mod.rs @@ -108,7 +108,7 @@ impl DocumentsBatchStateTransitionStateValidationV0 for DocumentsBatchTransition &data_trigger_execution_context, platform_version, )?; - + if !data_trigger_execution_result.is_valid() { tracing::debug!( "{:?} state transition data trigger was not valid, errors are {:?}", diff --git a/packages/rs-drive-abci/src/query/identity_based_queries/identity_nonce/v0/mod.rs b/packages/rs-drive-abci/src/query/identity_based_queries/identity_nonce/v0/mod.rs index 3e77dfd200e..0f62c511b10 100644 --- a/packages/rs-drive-abci/src/query/identity_based_queries/identity_nonce/v0/mod.rs +++ b/packages/rs-drive-abci/src/query/identity_based_queries/identity_nonce/v0/mod.rs @@ -146,7 +146,6 @@ mod tests { let identity = create_test_identity_with_rng(&platform.drive, id, &mut rng, None, version) .expect("expected to create a test identity"); - platform .drive .merge_identity_nonce( diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs index cd2a3aa11c6..f34eca7070f 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_create::v0::DataContractCreateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// data contract create transition action #[derive(Debug, Clone, From)] diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs index d1bf2f2ea45..2bcde179d62 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_create/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// data contract create transition action v0 #[derive(Debug, Clone)] diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs index f73ab4d30cc..3ea424e0e62 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/mod.rs @@ -6,7 +6,7 @@ pub mod v0; use crate::state_transition_action::contract::data_contract_update::v0::DataContractUpdateTransitionActionV0; use derive_more::From; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// data contract update transition action #[derive(Debug, Clone, From)] diff --git a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs index 6551c7b5bab..5b3bfca097a 100644 --- a/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/contract/data_contract_update/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::data_contract::DataContract; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// data contract update transition action v0 #[derive(Debug, Clone)] 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 3f9ed324564..01dabf088d7 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 @@ -7,7 +7,7 @@ use crate::state_transition_action::identity::identity_credit_transfer::v0::Iden use derive_more::From; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// action #[derive(Debug, Clone, From)] 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 a6270711890..9ee87543cb2 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 @@ -2,7 +2,7 @@ mod transformer; use dpp::fee::Credits; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; use serde::{Deserialize, Serialize}; /// action v0 diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs index c4142f7dc9f..ef579b4d5cf 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/mod.rs @@ -8,7 +8,7 @@ use derive_more::From; use dpp::document::Document; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// action #[derive(Debug, Clone, From)] @@ -60,7 +60,9 @@ impl IdentityCreditWithdrawalTransitionAction { /// fee multiplier pub fn user_fee_increase(&self) -> UserFeeIncrease { match self { - IdentityCreditWithdrawalTransitionAction::V0(transition) => transition.user_fee_increase, + IdentityCreditWithdrawalTransitionAction::V0(transition) => { + transition.user_fee_increase + } } } } diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs index 75726ab70cf..0e1be9120cb 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_credit_withdrawal/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::document::Document; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; use serde::{Deserialize, Serialize}; diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs index 151e1dfcffd..51e22249889 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/mod.rs @@ -8,7 +8,7 @@ use crate::state_transition_action::identity::identity_update::v0::IdentityUpdat use derive_more::From; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, Revision}; +use dpp::prelude::{Revision, UserFeeIncrease}; /// action #[derive(Debug, Clone, From)] diff --git a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs index 6994432090a..7c1f947b30b 100644 --- a/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/identity/identity_update/v0/mod.rs @@ -2,7 +2,7 @@ mod transformer; use dpp::identifier::Identifier; use dpp::identity::{IdentityPublicKey, KeyID, TimestampMillis}; -use dpp::prelude::{UserFeeIncrease, IdentityNonce, Revision}; +use dpp::prelude::{IdentityNonce, Revision, UserFeeIncrease}; use serde::{Deserialize, Serialize}; /// action v0 diff --git a/packages/rs-drive/src/state_transition_action/mod.rs b/packages/rs-drive/src/state_transition_action/mod.rs index 22c0969c677..f3f90a1c6aa 100644 --- a/packages/rs-drive/src/state_transition_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/mod.rs @@ -67,7 +67,9 @@ impl StateTransitionAction { action.user_fee_increase() } StateTransitionAction::IdentityUpdateAction(action) => action.user_fee_increase(), - StateTransitionAction::IdentityCreditTransferAction(action) => action.user_fee_increase(), + StateTransitionAction::IdentityCreditTransferAction(action) => { + action.user_fee_increase() + } StateTransitionAction::BumpIdentityNonceAction(action) => action.user_fee_increase(), StateTransitionAction::BumpIdentityDataContractNonceAction(action) => { action.user_fee_increase() diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs index 08490744430..bcd59379b31 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// transformer module pub mod transformer; diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs index c6cbc9d35b5..52780ee2b4b 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_data_contract_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; #[derive(Debug, Clone)] /// Version 0 of the bump identity data contract nonce action diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs index 10bf0ec6a16..c66be8b36a3 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/mod.rs @@ -1,7 +1,7 @@ use derive_more::From; use dpp::platform_value::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; /// transformer module pub mod transformer; diff --git a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs index 8f20084c8d6..8437a51f704 100644 --- a/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs +++ b/packages/rs-drive/src/state_transition_action/system/bump_identity_nonce_action/v0/mod.rs @@ -2,7 +2,7 @@ pub mod transformer; use dpp::identifier::Identifier; -use dpp::prelude::{UserFeeIncrease, IdentityNonce}; +use dpp::prelude::{IdentityNonce, UserFeeIncrease}; #[derive(Debug, Clone)] /// Version 0 of the bump identity nonce action diff --git a/packages/wasm-dpp/src/data_contract_factory/data_contract_factory.rs b/packages/wasm-dpp/src/data_contract_factory/data_contract_factory.rs index 3036b9d8497..4d1d87166b4 100644 --- a/packages/wasm-dpp/src/data_contract_factory/data_contract_factory.rs +++ b/packages/wasm-dpp/src/data_contract_factory/data_contract_factory.rs @@ -28,9 +28,7 @@ impl From for DataContractFactory { #[wasm_bindgen(js_class=DataContractFactory)] impl DataContractFactoryWasm { #[wasm_bindgen(constructor)] - pub fn new( - protocol_version: u32, - ) -> DataContractFactoryWasm { + pub fn new(protocol_version: u32) -> DataContractFactoryWasm { DataContractFactory::new(protocol_version) .with_js_error() .expect("should create a factory") diff --git a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs index 0de70583fa1..bbe6315614c 100644 --- a/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs +++ b/packages/wasm-dpp/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs @@ -66,7 +66,9 @@ impl IdentityTopUpTransitionWasm { pub fn set_asset_lock_proof(&mut self, asset_lock_proof: JsValue) -> Result<(), JsValue> { let asset_lock_proof = create_asset_lock_proof_from_wasm_instance(&asset_lock_proof)?; - self.0.set_asset_lock_proof(asset_lock_proof).map_err(from_dpp_err) + self.0 + .set_asset_lock_proof(asset_lock_proof) + .map_err(from_dpp_err) } #[wasm_bindgen(getter, js_name=assetLockProof)] From 266948a8b0f0a7ccb2ab2badab07e0d6330f89b1 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 14:48:28 +0700 Subject: [PATCH 14/22] added comment --- packages/rs-dpp/src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/rs-dpp/src/lib.rs b/packages/rs-dpp/src/lib.rs index 26be84cd819..1ebf54d0a79 100644 --- a/packages/rs-dpp/src/lib.rs +++ b/packages/rs-dpp/src/lib.rs @@ -65,6 +65,9 @@ pub mod prelude { pub type TimestampMillis = u64; pub type Revision = u64; pub type IdentityNonce = u64; + + /// 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. pub type UserFeeIncrease = u16; } From cc8bfdfbaeb68e4c41303bc7600a6ae5bab7ede1 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 15:05:27 +0700 Subject: [PATCH 15/22] fixed priority test --- packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ea34827151e..547f4c08859 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 @@ -474,7 +474,7 @@ mod tests { assert!(validation_result.errors.is_empty()); - assert_eq!(validation_result.data.unwrap().priority, 100); + assert_eq!(validation_result.data.unwrap().priority, 10000); let check_result = platform .check_tx(serialized.as_slice(), Recheck, platform_version) @@ -482,7 +482,7 @@ mod tests { assert!(check_result.is_valid()); - assert_eq!(check_result.data.unwrap().priority, 100); + assert_eq!(check_result.data.unwrap().priority, 10000); let transaction = platform.drive.grove.start_transaction(); @@ -510,7 +510,7 @@ mod tests { assert!(check_result.is_valid()); // it should still be valid, because we didn't commit the transaction - assert_eq!(check_result.data.unwrap().priority, 100); + assert_eq!(check_result.data.unwrap().priority, 10000); platform .drive @@ -525,7 +525,7 @@ mod tests { assert!(check_result.is_valid()); // it should still be valid, because we don't validate state - assert_eq!(check_result.data.unwrap().priority, 100); + assert_eq!(check_result.data.unwrap().priority, 10000); } #[test] From 668a1de7a5f830364365f7c839d927a1534b54e1 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 19:52:59 +0700 Subject: [PATCH 16/22] renamed variable --- .../src/state_transition/state_transitions/common_fields.rs | 2 +- .../data_contract_create_transition/v0/value_conversion.rs | 6 +++--- .../data_contract_update_transition/v0/value_conversion.rs | 6 +++--- .../identity_topup_transition/v0/value_conversion.rs | 4 ++-- .../identity_update_transition/v0/value_conversion.rs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs index 0f9ce40402d..fc9a770f231 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/common_fields.rs @@ -3,7 +3,7 @@ pub mod property_names { pub const IDENTITY_CONTRACT_NONCE: &str = "identityContractNonce"; pub const IDENTITY_NONCE: &str = "identityNonce"; - pub const USER_FEE_MULTIPLIER: &str = "feeMultiplier"; + pub const USER_FEE_INCREASE: &str = "userFeeIncrease"; pub const SIGNATURE_PUBLIC_KEY_ID: &str = "signaturePublicKeyId"; pub const SIGNATURE: &str = "signature"; pub const TRANSITION_TYPE: &str = "type"; 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 3b7e2c02aef..f79c2f765fd 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 @@ -11,7 +11,7 @@ use crate::data_contract::conversion::value::v0::DataContractValueConversionMeth 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::common_fields::property_names::USER_FEE_MULTIPLIER; +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}; impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { @@ -43,7 +43,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_object - .get_optional_integer(USER_FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) @@ -77,7 +77,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_value_map - .remove_optional_integer(USER_FEE_MULTIPLIER) + .remove_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) 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 99a266a9142..9759ab775b4 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 @@ -5,7 +5,7 @@ use crate::state_transition::data_contract_update_transition::{ DataContractUpdateTransitionV0, BINARY_FIELDS, IDENTIFIER_FIELDS, U32_FIELDS, }; use crate::state_transition::state_transitions::common_fields::property_names::{ - IDENTITY_CONTRACT_NONCE, USER_FEE_MULTIPLIER, + IDENTITY_CONTRACT_NONCE, USER_FEE_INCREASE, }; use crate::state_transition::StateTransitionFieldTypes; use crate::state_transition::StateTransitionValueConvert; @@ -79,7 +79,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_object - .get_optional_integer(USER_FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) @@ -117,7 +117,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 { )? .try_into_platform_versioned(platform_version)?, user_fee_increase: raw_value_map - .remove_optional_integer(USER_FEE_MULTIPLIER) + .remove_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(), }) 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 272e0d46bac..46ba75bd23a 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 @@ -11,7 +11,7 @@ use crate::state_transition::identity_topup_transition::fields::*; use crate::state_transition::identity_topup_transition::v0::IdentityTopUpTransitionV0; use crate::state_transition::StateTransitionValueConvert; -use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_MULTIPLIER; +use crate::state_transition::state_transitions::common_fields::property_names::USER_FEE_INCREASE; use platform_version::version::PlatformVersion; impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { @@ -35,7 +35,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityTopUpTransitionV0 { let asset_lock_proof = AssetLockProof::try_from(raw_asset_lock_proof)?; let user_fee_increase = raw_object - .get_optional_integer(USER_FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(); 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 32c9eb46fd2..2af88151d87 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 @@ -10,7 +10,7 @@ use crate::state_transition::public_key_in_creation::IdentityPublicKeyInCreation use crate::state_transition::StateTransitionValueConvert; use crate::state_transition::state_transitions::common_fields::property_names::{ - NONCE, USER_FEE_MULTIPLIER, + NONCE, USER_FEE_INCREASE, }; use platform_version::version::PlatformVersion; @@ -36,7 +36,7 @@ impl<'a> StateTransitionValueConvert<'a> for IdentityUpdateTransitionV0 { .get_integer(NONCE) .map_err(ProtocolError::ValueError)?; let user_fee_increase = raw_object - .get_optional_integer(USER_FEE_MULTIPLIER) + .get_optional_integer(USER_FEE_INCREASE) .map_err(ProtocolError::ValueError)? .unwrap_or_default(); let add_public_keys = raw_object From 1469f6cea80a78838e4b51f8c3a81789638ad384 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 19:53:11 +0700 Subject: [PATCH 17/22] fmt --- .../block_start/clear_drive_block_cache/v0/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_start/clear_drive_block_cache/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_start/clear_drive_block_cache/v0/mod.rs index d988eb34c7e..06750ab6e0d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_start/clear_drive_block_cache/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_start/clear_drive_block_cache/v0/mod.rs @@ -11,8 +11,7 @@ where pub(super) fn clear_drive_block_cache_v0(&self) { self.drive.cache.data_contracts.clear_block_cache(); - let mut protocol_versions_counter = - self.drive.cache.protocol_versions_counter.write(); + let mut protocol_versions_counter = self.drive.cache.protocol_versions_counter.write(); protocol_versions_counter.clear_block_cache() } From a798faceae6901cb31bbb6e6e2fdbadac2f0ff22 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 19:54:21 +0700 Subject: [PATCH 18/22] rename --- packages/rs-sdk/src/platform/transition/put_document.rs | 2 +- packages/rs-sdk/src/platform/transition/put_settings.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rs-sdk/src/platform/transition/put_document.rs b/packages/rs-sdk/src/platform/transition/put_document.rs index 3b7ca6607b2..8c9edfd70bb 100644 --- a/packages/rs-sdk/src/platform/transition/put_document.rs +++ b/packages/rs-sdk/src/platform/transition/put_document.rs @@ -81,7 +81,7 @@ impl PutDocument for Document { document_state_transition_entropy, &identity_public_key, new_identity_contract_nonce, - settings.fee_multiplier.unwrap_or_default(), + settings.user_fee_increase.unwrap_or_default(), signer, sdk.version(), None, diff --git a/packages/rs-sdk/src/platform/transition/put_settings.rs b/packages/rs-sdk/src/platform/transition/put_settings.rs index c0dc2913076..7ddaef7a687 100644 --- a/packages/rs-sdk/src/platform/transition/put_settings.rs +++ b/packages/rs-sdk/src/platform/transition/put_settings.rs @@ -6,5 +6,5 @@ use rs_dapi_client::RequestSettings; pub struct PutSettings { pub request_settings: RequestSettings, pub identity_nonce_stale_time_s: Option, - pub fee_multiplier: Option, + pub user_fee_increase: Option, } From d8b85c996b1122866b12f6b4a717720465809834 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 19:57:12 +0700 Subject: [PATCH 19/22] rename --- .../rs-sdk/src/platform/transition/withdraw_from_identity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 edc1371a54d..60a02900465 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -27,7 +27,7 @@ pub trait WithdrawFromIdentity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + user_fee_increase: Option, signer: S, settings: Option, ) -> Result; From 1355e5a0994710433b8e37ad7e0047836ed7cf4d Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 19:57:59 +0700 Subject: [PATCH 20/22] rename --- packages/rs-sdk/src/platform/transition/top_up_identity.rs | 6 +++--- .../src/platform/transition/withdraw_from_identity.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 d024577c6a3..2aa5eb3b942 100644 --- a/packages/rs-sdk/src/platform/transition/top_up_identity.rs +++ b/packages/rs-sdk/src/platform/transition/top_up_identity.rs @@ -17,7 +17,7 @@ pub trait TopUpIdentity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + user_fee_increase: Option, ) -> Result; } @@ -28,13 +28,13 @@ impl TopUpIdentity for Identity { sdk: &Sdk, asset_lock_proof: AssetLockProof, asset_lock_proof_private_key: &PrivateKey, - fee_multiplier: Option, + user_fee_increase: Option, ) -> Result { let state_transition = IdentityTopUpTransition::try_from_identity( self, asset_lock_proof, asset_lock_proof_private_key.inner.as_ref(), - fee_multiplier.unwrap_or_default(), + user_fee_increase.unwrap_or_default(), sdk.version(), None, )?; 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 60a02900465..093c182e43f 100644 --- a/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs +++ b/packages/rs-sdk/src/platform/transition/withdraw_from_identity.rs @@ -41,7 +41,7 @@ impl WithdrawFromIdentity for Identity { address: Address, amount: u64, core_fee_per_byte: Option, - fee_multiplier: Option, + user_fee_increase: Option, signer: S, settings: Option, ) -> Result { @@ -52,7 +52,7 @@ impl WithdrawFromIdentity for Identity { amount, Pooling::Never, core_fee_per_byte.unwrap_or(1), - fee_multiplier.unwrap_or_default(), + user_fee_increase.unwrap_or_default(), signer, new_identity_nonce, sdk.version(), From aa1b85e65c1ffb9b955f095f50ab689d56e5230c Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 20:09:58 +0700 Subject: [PATCH 21/22] fixed a test --- .../rs-drive-abci/src/execution/check_tx/v0/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 b5ac2715202..a03f4ee5f32 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 @@ -434,8 +434,8 @@ mod tests { .expect_verify_instant_lock() .returning(|_, _| Ok(true)); - let state = platform.state.read(); - let protocol_version = state.current_protocol_version_in_consensus(); + let platform_state = platform.state.load(); + let protocol_version = platform_state.current_protocol_version_in_consensus(); let platform_version = PlatformVersion::get(protocol_version).unwrap(); let (key, private_key) = IdentityPublicKey::random_ecdsa_critical_level_authentication_key( @@ -486,7 +486,7 @@ mod tests { .expect("expected to insert identity"); let validation_result = platform - .check_tx(serialized.as_slice(), FirstTimeCheck, platform_version) + .check_tx(serialized.as_slice(), FirstTimeCheck, &platform_state, platform_version) .expect("expected to check tx"); assert!(validation_result.errors.is_empty()); @@ -494,7 +494,7 @@ mod tests { assert_eq!(validation_result.data.unwrap().priority, 10000); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, platform_version) + .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) .expect("expected to check tx"); assert!(check_result.is_valid()); @@ -507,7 +507,7 @@ mod tests { .platform .process_raw_state_transitions( &vec![serialized.clone()], - &state, + &platform_state, &BlockInfo::default(), &transaction, platform_version, @@ -522,7 +522,7 @@ mod tests { ); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, platform_version) + .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we didn't commit the transaction @@ -537,7 +537,7 @@ mod tests { .expect("expected to commit"); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, platform_version) + .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we don't validate state From 68a07c40bbaa1dbfd2b84f9339803fe6775eea82 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 8 Mar 2024 20:10:04 +0700 Subject: [PATCH 22/22] fixed a test --- .../src/execution/check_tx/v0/mod.rs | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) 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 a03f4ee5f32..4ad51c685e7 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 @@ -486,7 +486,12 @@ mod tests { .expect("expected to insert identity"); let validation_result = platform - .check_tx(serialized.as_slice(), FirstTimeCheck, &platform_state, platform_version) + .check_tx( + serialized.as_slice(), + FirstTimeCheck, + &platform_state, + platform_version, + ) .expect("expected to check tx"); assert!(validation_result.errors.is_empty()); @@ -494,7 +499,12 @@ mod tests { assert_eq!(validation_result.data.unwrap().priority, 10000); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) + .check_tx( + serialized.as_slice(), + Recheck, + &platform_state, + platform_version, + ) .expect("expected to check tx"); assert!(check_result.is_valid()); @@ -522,7 +532,12 @@ mod tests { ); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) + .check_tx( + serialized.as_slice(), + Recheck, + &platform_state, + platform_version, + ) .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we didn't commit the transaction @@ -537,7 +552,12 @@ mod tests { .expect("expected to commit"); let check_result = platform - .check_tx(serialized.as_slice(), Recheck, &platform_state, platform_version) + .check_tx( + serialized.as_slice(), + Recheck, + &platform_state, + platform_version, + ) .expect("expected to check tx"); assert!(check_result.is_valid()); // it should still be valid, because we don't validate state