feat(rs-dpp): introduce StateTransitionFactory

packages/rs-dpp/src/data_contract/data_contract_facade.rs

@@ -1,6 +1,3 @@
-use crate::data_contract::state_transition::{
-    DataContractCreateTransition, DataContractUpdateTransition,
-};
 use crate::data_contract::validation::data_contract_validator::DataContractValidator;
 use crate::data_contract::{DataContract, DataContractFactory};
 use crate::document::document_transition::document_base_transition::JsonValue;
@@ -9,6 +6,9 @@ use crate::version::ProtocolVersionValidator;
 use crate::ProtocolError;
 use std::sync::Arc;
 
+use super::state_transition::data_contract_create_transition::DataContractCreateTransition;
+use super::state_transition::data_contract_update_transition::DataContractUpdateTransition;
+
 pub struct DataContractFacade {
     factory: DataContractFactory,
     data_contract_validator: Arc<DataContractValidator>,

packages/rs-dpp/src/data_contract/data_contract_factory.rs

@@ -15,11 +15,9 @@ use crate::{
     util::entropy_generator,
 };
 
-use super::{
-    state_transition::{DataContractCreateTransition, DataContractUpdateTransition},
-    validation::data_contract_validator::DataContractValidator,
-    DataContract,
-};
+use super::state_transition::data_contract_create_transition::DataContractCreateTransition;
+use super::state_transition::data_contract_update_transition::DataContractUpdateTransition;
+use super::{validation::data_contract_validator::DataContractValidator, DataContract};
 
 /// A way to provide external entropy generator.
 pub trait EntropyGenerator {

packages/rs-dpp/src/data_contract/state_transition/data_contract_create_transition/mod.rs

@@ -91,11 +91,6 @@ impl DataContractCreateTransition {
     pub fn get_entropy(&self) -> &[u8; 32] {
         &self.entropy
     }
-
-    /// Returns ID of the created contract
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![&self.data_contract.id]
-    }
 }
 
 impl StateTransitionIdentitySigned for DataContractCreateTransition {
@@ -114,6 +109,11 @@ impl StateTransitionIdentitySigned for DataContractCreateTransition {
 }
 
 impl StateTransitionLike for DataContractCreateTransition {
+    /// Returns ID of the created contract
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![self.data_contract.id]
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/data_contract/state_transition/data_contract_create_transition/validation/state/validate_data_contract_create_transition_state.rs

@@ -4,7 +4,10 @@ use anyhow::Result;
 use async_trait::async_trait;
 
 use crate::{
-    data_contract::{state_transition::DataContractCreateTransition, DataContract},
+    data_contract::{
+        state_transition::data_contract_create_transition::DataContractCreateTransition,
+        DataContract,
+    },
     errors::StateError,
     state_repository::StateRepositoryLike,
     state_transition::StateTransitionLike,

packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/mod.rs

@@ -73,11 +73,6 @@ impl DataContractUpdateTransition {
     pub fn set_data_contract(&mut self, data_contract: DataContract) {
         self.data_contract = data_contract;
     }
-
-    /// Returns ID of the created contract
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![&self.data_contract.id]
-    }
 }
 
 impl StateTransitionIdentitySigned for DataContractUpdateTransition {
@@ -96,6 +91,11 @@ impl StateTransitionIdentitySigned for DataContractUpdateTransition {
 }
 
 impl StateTransitionLike for DataContractUpdateTransition {
+    /// Returns ID of the created contract
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![self.data_contract.id]
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/basic/validate_data_contract_update_transition_basic.rs

@@ -7,6 +7,7 @@ use crate::consensus::basic::decode::ProtocolVersionParsingError;
 use crate::consensus::basic::invalid_data_contract_version_error::InvalidDataContractVersionError;
 use crate::consensus::ConsensusError;
 use crate::state_transition::state_transition_execution_context::StateTransitionExecutionContext;
+use crate::validation::AsyncDataValidatorWithContext;
 use crate::{
     consensus::basic::BasicError,
     data_contract::{
@@ -22,6 +23,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use anyhow::Context;
+use async_trait::async_trait;
 use json_patch::PatchOperation;
 use lazy_static::lazy_static;
 use serde_json::{json, Value as JsonValue};
@@ -65,8 +67,16 @@ where
             json_schema_validator,
         })
     }
+}
+
+#[async_trait(?Send)]
+impl<SR> AsyncDataValidatorWithContext for DataContractUpdateTransitionBasicValidator<SR>
+where
+    SR: StateRepositoryLike,
+{
+    type Item = JsonValue;
 
-    pub async fn validate(
+    async fn validate(
         &self,
         raw_state_transition: &JsonValue,
         execution_context: &StateTransitionExecutionContext,

packages/rs-dpp/src/data_contract/state_transition/data_contract_update_transition/validation/state/validate_data_contract_update_transition_state.rs

@@ -5,7 +5,10 @@ use async_trait::async_trait;
 
 use crate::consensus::basic::invalid_data_contract_version_error::InvalidDataContractVersionError;
 use crate::{
-    data_contract::{state_transition::DataContractUpdateTransition, DataContract},
+    data_contract::{
+        state_transition::data_contract_update_transition::DataContractUpdateTransition,
+        DataContract,
+    },
     errors::consensus::basic::BasicError,
     state_repository::StateRepositoryLike,
     state_transition::StateTransitionLike,
@@ -94,7 +97,7 @@ pub async fn validate_data_contract_update_transition_state(
 mod test {
     use super::*;
     use crate::{
-        data_contract::state_transition::DataContractUpdateTransition,
+        data_contract::state_transition::data_contract_update_transition::DataContractUpdateTransition,
         state_repository::MockStateRepositoryLike, state_transition::StateTransitionLike,
         tests::fixtures::get_data_contract_fixture,
     };

packages/rs-dpp/src/data_contract/state_transition/mod.rs

@@ -1,6 +1,3 @@
-pub use data_contract_create_transition::*;
-pub use data_contract_update_transition::*;
-
 pub mod data_contract_create_transition;
 pub mod data_contract_update_transition;
 pub mod errors;

packages/rs-dpp/src/document/state_transition/documents_batch_transition/mod.rs

@@ -191,11 +191,6 @@ impl DocumentsBatchTransition {
     pub fn get_transitions(&self) -> &Vec<DocumentTransition> {
         &self.transitions
     }
-
-    // TODO to decide if this should be a lazy iterator or a vector
-    pub fn get_modified_data_ids(&self) -> impl Iterator<Item = &Identifier> {
-        self.transitions.iter().map(|t| &t.base().id)
-    }
 }
 
 impl StateTransitionIdentitySigned for DocumentsBatchTransition {
@@ -368,6 +363,10 @@ impl StateTransitionConvert for DocumentsBatchTransition {
 }
 
 impl StateTransitionLike for DocumentsBatchTransition {
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        self.transitions.iter().map(|t| t.base().id).collect()
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/document/state_transition/documents_batch_transition/validation/basic/validate_documents_batch_transition_basic.rs

@@ -1,6 +1,7 @@
 use std::{
     collections::{hash_map::Entry, HashMap},
     convert::{TryFrom, TryInto},
+    sync::Arc,
 };
 
 use crate::consensus::basic::document::{
@@ -60,10 +61,45 @@ pub trait Validator {
     fn validate(&self, data: JsonValue) -> Result<ValidationResult<()>, ProtocolError>;
 }
 
+pub struct DocumentBatchTransitionBasicValidator<SR> {
+    state_repository: Arc<SR>,
+    protocol_version_validator: Arc<ProtocolVersionValidator>,
+}
+
+impl<SR> DocumentBatchTransitionBasicValidator<SR>
+where
+    SR: StateRepositoryLike,
+{
+    pub fn new(
+        state_repository: Arc<SR>,
+        protocol_version_validator: Arc<ProtocolVersionValidator>,
+    ) -> Self {
+        Self {
+            state_repository,
+            protocol_version_validator,
+        }
+    }
+
+    pub async fn validate(
+        &self,
+        raw_state_transition: &JsonValue,
+        execution_context: &StateTransitionExecutionContext,
+    ) -> Result<ValidationResult<()>, ProtocolError> {
+        // TODO: move validation code into function body to avoid cloning of state_repository
+        validate_documents_batch_transition_basic(
+            &self.protocol_version_validator,
+            raw_state_transition,
+            self.state_repository.clone(),
+            execution_context,
+        )
+        .await
+    }
+}
+
 pub async fn validate_documents_batch_transition_basic(
     protocol_version_validator: &ProtocolVersionValidator,
     raw_state_transition: &JsonValue,
-    state_repository: &impl StateRepositoryLike,
+    state_repository: Arc<impl StateRepositoryLike>,
     execution_context: &StateTransitionExecutionContext,
 ) -> Result<ValidationResult<()>, ProtocolError> {
     let mut result = ValidationResult::default();

packages/rs-dpp/src/errors/errors.rs

@@ -10,7 +10,8 @@ use crate::data_contract::state_transition::errors::PublicKeyIsDisabledError;
 use crate::document::errors::*;
 use crate::state_transition::errors::{
     InvalidIdentityPublicKeyTypeError, InvalidSignaturePublicKeyError, PublicKeyMismatchError,
-    PublicKeySecurityLevelNotMetError, StateTransitionIsNotSignedError, WrongPublicKeyPurposeError,
+    PublicKeySecurityLevelNotMetError, StateTransitionError, StateTransitionIsNotSignedError,
+    WrongPublicKeyPurposeError,
 };
 use crate::{CompatibleProtocolVersionIsNotDefinedError, NonConsensusError, SerdeParsingError};
 use platform_value::Error as ValueError;
@@ -48,6 +49,9 @@ pub enum ProtocolError {
     #[error(transparent)]
     DataContractError(#[from] DataContractError),
 
+    #[error(transparent)]
+    StateTransitionError(#[from] StateTransitionError),
+
     #[error(transparent)]
     StructureError(#[from] StructureError),
 

packages/rs-dpp/src/identity/state_transition/identity_create_transition/identity_create_transition.rs

@@ -237,11 +237,6 @@ impl IdentityCreateTransition {
         Ok(json_map)
     }
 
-    /// Returns ids of created identities
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![self.get_identity_id()]
-    }
-
     pub fn set_protocol_version(&mut self, protocol_version: u32) {
         self.protocol_version = protocol_version;
     }
@@ -321,6 +316,11 @@ impl StateTransitionConvert for IdentityCreateTransition {
 }
 
 impl StateTransitionLike for IdentityCreateTransition {
+    /// Returns ids of created identities
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![*self.get_identity_id()]
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/identity/state_transition/identity_create_transition/validation/basic/identity_create_transition_basic_validator.rs

@@ -29,7 +29,7 @@ pub struct IdentityCreateTransitionBasicValidator<T, S, SR: StateRepositoryLike,
     public_keys_validator: Arc<T>,
     public_keys_in_identity_transition_validator: Arc<S>,
     asset_lock_proof_validator: Arc<AssetLockProofValidator<SR>>,
-    public_keys_signatures_validator: SV,
+    public_keys_signatures_validator: Arc<SV>,
     bls_adapter: BLS,
 }
 
@@ -47,7 +47,7 @@ impl<
         public_keys_in_identity_transition_validator: Arc<S>,
         asset_lock_proof_validator: Arc<AssetLockProofValidator<SR>>,
         bls_adapter: BLS,
-        public_keys_signatures_validator: SV,
+        public_keys_signatures_validator: Arc<SV>,
     ) -> Result<Self, DashPlatformProtocolInitError> {
         let json_schema_validator =
             JsonSchemaValidator::new(INDENTITY_CREATE_TRANSITION_SCHEMA.clone())?;

packages/rs-dpp/src/identity/state_transition/identity_credit_withdrawal_transition/mod.rs

@@ -111,11 +111,6 @@ impl IdentityCreditWithdrawalTransition {
         Self::from_value(raw_object)
     }
 
-    /// Returns ID of the created contract
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![&self.identity_id]
-    }
-
     pub fn set_revision(&mut self, revision: Revision) {
         self.revision = revision;
     }
@@ -141,6 +136,10 @@ impl StateTransitionIdentitySigned for IdentityCreditWithdrawalTransition {
 }
 
 impl StateTransitionLike for IdentityCreditWithdrawalTransition {
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![self.identity_id]
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/identity/state_transition/identity_topup_transition/identity_topup_transition.rs

@@ -197,11 +197,6 @@ impl IdentityTopUpTransition {
     pub fn set_protocol_version(&mut self, protocol_version: u32) {
         self.protocol_version = protocol_version;
     }
-
-    /// Returns ids of created identities
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![self.get_identity_id()]
-    }
 }
 
 impl StateTransitionConvert for IdentityTopUpTransition {
@@ -268,6 +263,11 @@ impl StateTransitionLike for IdentityTopUpTransition {
         self.signature = signature
     }
 
+    /// Returns ids of created identities
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![*self.get_identity_id()]
+    }
+
     fn get_execution_context(&self) -> &StateTransitionExecutionContext {
         &self.execution_context
     }

packages/rs-dpp/src/identity/state_transition/identity_update_transition/identity_update_transition.rs

@@ -178,11 +178,6 @@ impl IdentityUpdateTransition {
         self.public_keys_disabled_at
     }
 
-    /// Returns ids of created identities
-    pub fn get_modified_data_ids(&self) -> Vec<&Identifier> {
-        vec![self.get_identity_id()]
-    }
-
     pub fn set_protocol_version(&mut self, protocol_version: u32) {
         self.protocol_version = protocol_version;
     }
@@ -295,6 +290,11 @@ impl StateTransitionConvert for IdentityUpdateTransition {
 }
 
 impl StateTransitionLike for IdentityUpdateTransition {
+    /// Returns ids of created identities
+    fn get_modified_data_ids(&self) -> Vec<Identifier> {
+        vec![*self.get_identity_id()]
+    }
+
     fn get_protocol_version(&self) -> u32 {
         self.protocol_version
     }

packages/rs-dpp/src/identity/state_transition/identity_update_transition/validate_identity_update_transition_basic.rs

@@ -27,8 +27,7 @@ pub struct ValidateIdentityUpdateTransitionBasic<KV, SV> {
     protocol_version_validator: ProtocolVersionValidator,
     json_schema_validator: JsonSchemaValidator,
     public_keys_validator: Arc<KV>,
-
-    public_keys_signatures_validator: SV,
+    public_keys_signatures_validator: Arc<SV>,
 }
 
 impl<KV, SV> ValidateIdentityUpdateTransitionBasic<KV, SV>
@@ -39,7 +38,7 @@ where
     pub fn new(
         protocol_version_validator: ProtocolVersionValidator,
         public_keys_validator: Arc<KV>,
-        public_keys_signatures_validator: SV,
+        public_keys_signatures_validator: Arc<SV>,
     ) -> Result<Self, ProtocolError> {
         let json_schema_validator = JsonSchemaValidator::new(IDENTITY_UPDATE_SCHEMA.clone())
             .map_err(|e| {

packages/rs-dpp/src/state_repository.rs

@@ -36,10 +36,12 @@ pub struct FetchTransactionResponse {
 #[async_trait(?Send)]
 pub trait StateRepositoryLike: Sync {
     type ConversionError: Into<ProtocolError>;
-    type FetchDataContract: TryInto<DataContract, Error = Self::ConversionError>;
+    type FetchDataContract: TryInto<DataContract, Error = Self::ConversionError> + Send;
     type FetchDocument: TryInto<Document, Error = Self::ConversionError>;
     type FetchIdentity: TryInto<Identity, Error = Self::ConversionError>;
-    type FetchTransaction: TryInto<FetchTransactionResponse, Error = Self::ConversionError>;
+    type FetchTransaction: TryInto<FetchTransactionResponse, Error = Self::ConversionError>
+        + Send
+        + Sync;
 
     /// Fetch the Data Contract by ID
     /// By default, the method should return data as bytes (`Vec<u8>`), but the deserialization to [`DataContract`] should be also possible