feat(platform): allow new tokens on contract update and refactor contract struct validations

packages/rs-dpp/src/data_contract/methods/validate_update/mod.rs

@@ -1,3 +1,4 @@
+use crate::block::block_info::BlockInfo;
 use crate::prelude::DataContract;
 use platform_version::version::PlatformVersion;
 
@@ -10,6 +11,7 @@ impl DataContractUpdateValidationMethodsV0 for DataContract {
     fn validate_update(
         &self,
         data_contract: &DataContract,
+        block_info: &BlockInfo,
         platform_version: &PlatformVersion,
     ) -> Result<SimpleConsensusValidationResult, ProtocolError> {
         match platform_version
@@ -18,7 +20,7 @@ impl DataContractUpdateValidationMethodsV0 for DataContract {
             .methods
             .validate_update
         {
-            0 => self.validate_update_v0(data_contract, platform_version),
+            0 => self.validate_update_v0(data_contract, block_info, platform_version),
             version => Err(ProtocolError::UnknownVersionMismatch {
                 method: "DataContract::validate_update".to_string(),
                 known_versions: vec![0],

packages/rs-drive-abci/src/execution/validation/state_transition/check_tx_verification/v0/mod.rs

@@ -64,7 +64,7 @@ pub(super) fn state_transition_to_execution_event_for_check_tx_v0<'a, C: CoreRPC
             }
 
             // Only Data contract update does not have basic structure validation
-            if state_transition.has_basic_structure_validation() {
+            if state_transition.has_basic_structure_validation(platform_version) {
                 // First we validate the basic structure
                 let result = state_transition.validate_basic_structure(platform_version)?;
 

packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs

@@ -21,9 +21,9 @@ use drive::grovedb::TransactionArg;
 use drive::state_transition_action::StateTransitionAction;
 use std::collections::BTreeMap;
 
-use crate::execution::types::state_transition_execution_context::{StateTransitionExecutionContext};
+use crate::execution::types::state_transition_execution_context::StateTransitionExecutionContext;
 use crate::execution::validation::state_transition::common::validate_simple_pre_check_balance::ValidateSimplePreCheckBalance;
-use crate::execution::validation::state_transition::common::validate_state_transition_identity_signed::{ValidateStateTransitionIdentitySignature};
+use crate::execution::validation::state_transition::common::validate_state_transition_identity_signed::ValidateStateTransitionIdentitySignature;
 use crate::execution::validation::state_transition::identity_create::{StateTransitionStateValidationForIdentityCreateTransitionV0, StateTransitionStructureKnownInStateValidationForIdentityCreateTransitionV0};
 use crate::execution::validation::state_transition::identity_top_up::StateTransitionIdentityTopUpTransitionActionTransformer;
 use crate::execution::validation::state_transition::state_transitions::identity_update::advanced_structure::v0::IdentityUpdateStateTransitionIdentityAndSignaturesValidationV0;
@@ -105,7 +105,7 @@ pub(super) fn process_state_transition_v0<'a, C: CoreRPCLike>(
     }
 
     // Only Data contract state transitions and Masternode vote do not have basic structure validation
-    if state_transition.has_basic_structure_validation() {
+    if state_transition.has_basic_structure_validation(platform_version) {
         // We validate basic structure validation after verifying the identity,
         // this is structure validation that does not require state and is already checked on check_tx
         let consensus_result = state_transition.validate_basic_structure(platform_version)?;
@@ -333,7 +333,7 @@ pub(crate) trait StateTransitionBasicStructureValidationV0 {
 
     /// True if the state transition has basic structure validation.
     /// Currently only data contract update does not
-    fn has_basic_structure_validation(&self) -> bool {
+    fn has_basic_structure_validation(&self, _platform_version: &PlatformVersion) -> bool {
         true
     }
 }
@@ -516,9 +516,7 @@ impl StateTransitionBasicStructureValidationV0 for StateTransition {
         platform_version: &PlatformVersion,
     ) -> Result<SimpleConsensusValidationResult, Error> {
         match self {
-            StateTransition::DataContractCreate(_)
-            | StateTransition::DataContractUpdate(_)
-            | StateTransition::MasternodeVote(_) => {
+            StateTransition::MasternodeVote(_) => {
                 // no basic structure validation
                 Ok(SimpleConsensusValidationResult::new())
             }
@@ -532,15 +530,66 @@ impl StateTransitionBasicStructureValidationV0 for StateTransition {
             StateTransition::IdentityCreditTransfer(st) => {
                 st.validate_basic_structure(platform_version)
             }
+            StateTransition::DataContractCreate(st) => {
+                if platform_version
+                    .drive_abci
+                    .validation_and_processing
+                    .state_transitions
+                    .contract_create_state_transition
+                    .basic_structure
+                    .is_some()
+                {
+                    st.validate_basic_structure(platform_version)
+                } else {
+                    Ok(SimpleConsensusValidationResult::new())
+                }
+            }
+            StateTransition::DataContractUpdate(st) => {
+                if platform_version
+                    .drive_abci
+                    .validation_and_processing
+                    .state_transitions
+                    .contract_update_state_transition
+                    .basic_structure
+                    .is_some()
+                {
+                    st.validate_basic_structure(platform_version)
+                } else {
+                    Ok(SimpleConsensusValidationResult::new())
+                }
+            }
         }
     }
-    fn has_basic_structure_validation(&self) -> bool {
-        !matches!(
-            self,
-            StateTransition::DataContractCreate(_)
-                | StateTransition::DataContractUpdate(_)
-                | StateTransition::MasternodeVote(_)
-        )
+    fn has_basic_structure_validation(&self, platform_version: &PlatformVersion) -> bool {
+        match self {
+            StateTransition::DataContractCreate(_) => {
+                // Added in protocol version 9 (version 2.0)
+                platform_version
+                    .drive_abci
+                    .validation_and_processing
+                    .state_transitions
+                    .contract_create_state_transition
+                    .basic_structure
+                    .is_some()
+            }
+            StateTransition::DataContractUpdate(_) => {
+                // Added in protocol version 9  (version 2.0)
+                platform_version
+                    .drive_abci
+                    .validation_and_processing
+                    .state_transitions
+                    .contract_update_state_transition
+                    .basic_structure
+                    .is_some()
+            }
+            StateTransition::Batch(_)
+            | StateTransition::IdentityCreate(_)
+            | StateTransition::IdentityTopUp(_)
+            | StateTransition::IdentityCreditWithdrawal(_)
+            | StateTransition::IdentityUpdate(_)
+            | StateTransition::IdentityCreditTransfer(_) => true,
+            StateTransition::MasternodeVote(_) => false,
+        }
     }
 }
 

packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_create/advanced_structure/mod.rs

@@ -1 +1,2 @@
 pub(crate) mod v0;
+pub(crate) mod v1;