Merge branch 'v2.0-dev' into feat/token-search-contract

Author: pauldelucia

packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/mod.rs

@@ -175,18 +175,7 @@ mod test {
 
         let state_transition = DataContractCreateTransition::from_object(
             Value::from([
-                (
-                    STATE_TRANSITION_PROTOCOL_VERSION,
-                    Value::U16(
-                        LATEST_PLATFORM_VERSION
-                            .drive_abci
-                            .validation_and_processing
-                            .state_transitions
-                            .contract_create_state_transition
-                            .basic_structure
-                            .unwrap(),
-                    ),
-                ),
+                (STATE_TRANSITION_PROTOCOL_VERSION, Value::U16(0)),
                 (
                     IDENTITY_NONCE,
                     Value::U64(created_data_contract.identity_nonce()),

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

@@ -84,16 +84,16 @@ impl StateTransitionAdvancedStructureValidationV0 for DataContractCreateTransiti
             .validation_and_processing
             .state_transitions
             .contract_create_state_transition
-            .basic_structure
+            .advanced_structure
         {
             Some(0) => self.validate_advanced_structure_v0(execution_context, platform_version),
             Some(version) => Err(Error::Execution(ExecutionError::UnknownVersionMismatch {
-                method: "data contract create transition: validate_basic_structure".to_string(),
+                method: "data contract create transition: validate_advanced_structure".to_string(),
                 known_versions: vec![0],
                 received: version,
             })),
             None => Err(Error::Execution(ExecutionError::VersionNotActive {
-                method: "data contract create transition: validate_basic_structure".to_string(),
+                method: "data contract create transition: validate_advanced_structure".to_string(),
                 known_versions: vec![0],
             })),
         }

packages/rs-platform-version/src/version/drive_abci_versions/drive_abci_validation_versions/v1.rs

@@ -80,8 +80,8 @@ pub const DRIVE_ABCI_VALIDATION_VERSIONS_V1: DriveAbciValidationVersions =
                 transform_into_action: 0,
             },
             contract_create_state_transition: DriveAbciStateTransitionValidationVersion {
-                basic_structure: Some(0),
-                advanced_structure: None,
+                basic_structure: None,
+                advanced_structure: Some(0),
                 identity_signatures: None,
                 advanced_minimum_balance_pre_check: None,
                 nonce: Some(0),

packages/rs-platform-version/src/version/drive_abci_versions/drive_abci_validation_versions/v2.rs

@@ -80,8 +80,8 @@ pub const DRIVE_ABCI_VALIDATION_VERSIONS_V2: DriveAbciValidationVersions =
                 transform_into_action: 0,
             },
             contract_create_state_transition: DriveAbciStateTransitionValidationVersion {
-                basic_structure: Some(0),
-                advanced_structure: None,
+                basic_structure: None,
+                advanced_structure: Some(0),
                 identity_signatures: None,
                 advanced_minimum_balance_pre_check: None,
                 nonce: Some(0),

packages/rs-platform-version/src/version/drive_abci_versions/drive_abci_validation_versions/v3.rs

@@ -80,8 +80,8 @@ pub const DRIVE_ABCI_VALIDATION_VERSIONS_V3: DriveAbciValidationVersions =
                 transform_into_action: 0,
             },
             contract_create_state_transition: DriveAbciStateTransitionValidationVersion {
-                basic_structure: Some(0),
-                advanced_structure: None,
+                basic_structure: None,
+                advanced_structure: Some(0),
                 identity_signatures: None,
                 advanced_minimum_balance_pre_check: None,
                 nonce: Some(0),

packages/rs-platform-version/src/version/drive_abci_versions/drive_abci_validation_versions/v4.rs

@@ -83,8 +83,8 @@ pub const DRIVE_ABCI_VALIDATION_VERSIONS_V4: DriveAbciValidationVersions =
                 transform_into_action: 0,
             },
             contract_create_state_transition: DriveAbciStateTransitionValidationVersion {
-                basic_structure: Some(0),
-                advanced_structure: None,
+                basic_structure: None,
+                advanced_structure: Some(0),
                 identity_signatures: None,
                 advanced_minimum_balance_pre_check: None,
                 nonce: Some(0),

packages/rs-platform-version/src/version/drive_abci_versions/drive_abci_validation_versions/v5.rs

@@ -84,8 +84,8 @@ pub const DRIVE_ABCI_VALIDATION_VERSIONS_V5: DriveAbciValidationVersions =
                 transform_into_action: 0,
             },
             contract_create_state_transition: DriveAbciStateTransitionValidationVersion {
-                basic_structure: Some(0),
-                advanced_structure: None,
+                basic_structure: None,
+                advanced_structure: Some(0),
                 identity_signatures: None,
                 advanced_minimum_balance_pre_check: None,
                 nonce: Some(0),

packages/rs-platform-version/src/version/v9.rs

@@ -18,6 +18,7 @@ use crate::version::drive_abci_versions::drive_abci_method_versions::v6::DRIVE_A
 use crate::version::drive_abci_versions::drive_abci_query_versions::v1::DRIVE_ABCI_QUERY_VERSIONS_V1;
 use crate::version::drive_abci_versions::drive_abci_structure_versions::v1::DRIVE_ABCI_STRUCTURE_VERSIONS_V1;
 use crate::version::drive_abci_versions::drive_abci_validation_versions::v4::DRIVE_ABCI_VALIDATION_VERSIONS_V4;
+use crate::version::drive_abci_versions::drive_abci_validation_versions::v5::DRIVE_ABCI_VALIDATION_VERSIONS_V5;
 use crate::version::drive_abci_versions::drive_abci_withdrawal_constants::v2::DRIVE_ABCI_WITHDRAWAL_CONSTANTS_V2;
 use crate::version::drive_abci_versions::DriveAbciVersion;
 use crate::version::drive_versions::v4::DRIVE_VERSION_V4;
@@ -37,7 +38,7 @@ pub const PLATFORM_V9: PlatformVersion = PlatformVersion {
     drive_abci: DriveAbciVersion {
         structs: DRIVE_ABCI_STRUCTURE_VERSIONS_V1,
         methods: DRIVE_ABCI_METHOD_VERSIONS_V6, // changed because of the genesis state
-        validation_and_processing: DRIVE_ABCI_VALIDATION_VERSIONS_V4,
+        validation_and_processing: DRIVE_ABCI_VALIDATION_VERSIONS_V5,
         withdrawal_constants: DRIVE_ABCI_WITHDRAWAL_CONSTANTS_V2,
         query: DRIVE_ABCI_QUERY_VERSIONS_V1,
     },