feat: register init contracts on second block of strategy

packages/rs-dpp/Cargo.toml

@@ -60,7 +60,7 @@ ed25519-dalek = { version = "2.0.0-rc.2", features = ["rand_core"], optional = t
 nohash-hasher = "0.2.0"
 rust_decimal = "1.29.1"
 rust_decimal_macros = "1.29.1"
-indexmap = { version = "2.0.2"}
+indexmap = { version = "2.0.2", features = ["serde"] }
 strum = { version = "0.25.0", features = ["derive"] }
 json-schema-compatibility-validator = { path = '../rs-json-schema-compatibility-validator' }
 

packages/rs-dpp/src/data_contract/document_type/property/mod.rs

@@ -15,20 +15,21 @@ use platform_value::Value;
 use rand::distributions::{Alphanumeric, Standard};
 use rand::rngs::StdRng;
 use rand::Rng;
+use serde::Serialize;
 
 pub mod array;
 
 // This struct will be changed in future to support more validation logic and serialization
 // It will become versioned and it will be introduced by a new document type version
 // @append_only
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Serialize)]
 pub struct DocumentProperty {
     pub property_type: DocumentPropertyType,
     pub required: bool,
 }
 
 // @append_only
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Serialize)]
 pub enum DocumentPropertyType {
     ///Todo decompose integer
     Integer,

packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/v0/v0_methods.rs

@@ -46,15 +46,24 @@ impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransitionV0 {
         let mut state_transition: StateTransition = transition.into();
         let value = state_transition.signable_bytes()?;
 
-        let public_key =
-            identity
-                .loaded_public_keys
-                .get(&key_id)
-                .ok_or(ProtocolError::NonConsensusError(
-                    NonConsensusError::StateTransitionCreationError(
-                        "public key did not exist".to_string(),
-                    ),
-                ))?;
+        // The public key ids don't always match the keys in the map, so we need to do this.
+        let matching_key = identity
+            .loaded_public_keys
+            .iter()
+            .find_map(|(&key, public_key)| {
+                if public_key.id() == key_id {
+                    Some(key)
+                } else {
+                    None
+                }
+            })
+            .expect("No matching public key id found in the map");
+
+        let public_key = identity.loaded_public_keys.get(&matching_key).ok_or(
+            ProtocolError::NonConsensusError(NonConsensusError::StateTransitionCreationError(
+                "public key did not exist".to_string(),
+            )),
+        )?;
 
         let security_level_requirements = state_transition.security_level_requirement().ok_or(
             ProtocolError::CorruptedCodeExecution(

packages/rs-drive-abci/tests/strategy_tests/chain_lock_update.rs

@@ -16,10 +16,10 @@ mod tests {
         // simple case where quorums do not change
         let strategy = NetworkStrategy {
             strategy: Strategy {
-                contracts_with_updates: vec![],
+                start_contracts: vec![],
                 operations: vec![],
                 start_identities: StartIdentities::default(),
-                identities_inserts: IdentityInsertInfo::default(),
+                identity_inserts: IdentityInsertInfo::default(),
 
                 identity_contract_nonce_gaps: None,
                 signer: None,

packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs

@@ -15,10 +15,10 @@ mod tests {
     fn run_chain_random_bans() {
         let strategy = NetworkStrategy {
             strategy: Strategy {
-                contracts_with_updates: vec![],
+                start_contracts: vec![],
                 operations: vec![],
                 start_identities: StartIdentities::default(),
-                identities_inserts: IdentityInsertInfo::default(),
+                identity_inserts: IdentityInsertInfo::default(),
 
                 identity_contract_nonce_gaps: None,
                 signer: None,
@@ -113,10 +113,10 @@ mod tests {
     fn run_chain_random_removals() {
         let strategy = NetworkStrategy {
             strategy: Strategy {
-                contracts_with_updates: vec![],
+                start_contracts: vec![],
                 operations: vec![],
                 start_identities: StartIdentities::default(),
-                identities_inserts: IdentityInsertInfo::default(),
+                identity_inserts: IdentityInsertInfo::default(),
 
                 identity_contract_nonce_gaps: None,
                 signer: None,
@@ -197,10 +197,10 @@ mod tests {
     fn run_chain_random_bans_and_unbans() {
         let strategy = NetworkStrategy {
             strategy: Strategy {
-                contracts_with_updates: vec![],
+                start_contracts: vec![],
                 operations: vec![],
                 start_identities: StartIdentities::default(),
-                identities_inserts: IdentityInsertInfo::default(),
+                identity_inserts: IdentityInsertInfo::default(),
 
                 identity_contract_nonce_gaps: None,
                 signer: None,