starknet_committer: add a field indicating if storage tries should be created concurrently

Author: nimrod-starkware

crates/apollo_deployments/resources/app_configs/committer_config.json

@@ -1,6 +1,7 @@
 {
     "committer_config.db_path": "/data/committer",
     "committer_config.reader_config.warn_on_trivial_modifications": false,
+    "committer_config.reader_config.build_storage_tries_concurrently": false,
     "committer_config.storage_config.cache_on_write": true,
     "committer_config.storage_config.cache_size": 1000000,
     "committer_config.storage_config.include_inner_stats": true,

crates/apollo_deployments/resources/app_configs/replacer_committer_config.json

@@ -1,6 +1,7 @@
 {
   "committer_config.db_path": "/data/committer",
   "committer_config.reader_config.warn_on_trivial_modifications": false,
+  "committer_config.reader_config.build_storage_tries_concurrently": false,
   "committer_config.storage_config.cache_on_write": true,
   "committer_config.storage_config.cache_size": "$$$_COMMITTER_CONFIG-STORAGE_CONFIG-CACHE_SIZE_$$$",
   "committer_config.storage_config.include_inner_stats": true,

crates/apollo_node/resources/config_schema.json

@@ -509,6 +509,11 @@
     "privacy": "Public",
     "value": false
   },
+  "committer_config.reader_config.build_storage_tries_concurrently": {
+    "description": "Whether to build the storage tries concurrently or sequentially.",
+    "privacy": "Public",
+    "value": false
+  },
   "committer_config.storage_config.cache_on_write": {
     "description": "If true, the cache is updated on write operations",
     "privacy": "Public",

crates/starknet_committer/src/block_committer/input.rs

@@ -122,11 +122,15 @@ impl From<ThinStateDiff> for StateDiff {
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct ReaderConfig {
     warn_on_trivial_modifications: bool,
+    build_storage_tries_concurrently: bool,
 }
 
 impl ReaderConfig {
-    pub fn new(warn_on_trivial_modifications: bool) -> Self {
-        Self { warn_on_trivial_modifications }
+    pub fn new(
+        warn_on_trivial_modifications: bool,
+        build_storage_tries_concurrently: bool,
+    ) -> Self {
+        Self { warn_on_trivial_modifications, build_storage_tries_concurrently }
     }
 
     /// Indicates whether a warning should be given in case of a trivial state update.
@@ -135,16 +139,29 @@ impl ReaderConfig {
     pub fn warn_on_trivial_modifications(&self) -> bool {
         self.warn_on_trivial_modifications
     }
+
+    /// Indicates whether to build the storage tries concurrently or sequentially.
+    pub fn build_storage_tries_concurrently(&self) -> bool {
+        self.build_storage_tries_concurrently
+    }
 }
 
 impl SerializeConfig for ReaderConfig {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
-        BTreeMap::from_iter([ser_param(
-            "warn_on_trivial_modifications",
-            &self.warn_on_trivial_modifications,
-            "Whether to warn on trivial state update.",
-            ParamPrivacyInput::Public,
-        )])
+        BTreeMap::from_iter([
+            ser_param(
+                "warn_on_trivial_modifications",
+                &self.warn_on_trivial_modifications,
+                "Whether to warn on trivial state update.",
+                ParamPrivacyInput::Public,
+            ),
+            ser_param(
+                "build_storage_tries_concurrently",
+                &self.build_storage_tries_concurrently,
+                "Whether to build the storage tries concurrently or sequentially.",
+                ParamPrivacyInput::Public,
+            ),
+        ])
     }
 }
 

crates/starknet_committer/src/forest/skeleton_forest_test.rs

@@ -150,7 +150,7 @@ pub(crate) fn create_contract_state_leaf_entry(val: u128) -> (DbKey, DbValue) {
             contracts_trie_root_hash: HashOutput(Felt::from(861_u128 + 248_u128)),
             classes_trie_root_hash: HashOutput(Felt::from(155_u128 + 248_u128)),
         }),
-        config: ReaderConfig::new(true),
+        config: ReaderConfig::new(true, false),
     },
     MapStorage(DbHashMap::from([
         // Roots.
@@ -327,7 +327,7 @@ async fn test_create_original_skeleton_forest(
             &actual_storage_updates,
             &actual_classes_updates,
             &forest_sorted_indices,
-            ReaderConfig::new(false),
+            ReaderConfig::new(false, false),
         )
         .await
         .unwrap();

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/cast.rs

@@ -85,6 +85,8 @@ impl TryFrom<RawInput> for CommitterFactsDbInputImpl {
                 inner_map,
             )?;
         }
+        // TODO(Nimrod): Get this by adding a field to `RawInput`.
+        let build_storage_tries_concurrently = false;
         let input = Input {
             initial_read_context: FactsDbInitialRead(StateRoots {
                 contracts_trie_root_hash: HashOutput(Felt::from_bytes_be_slice(
@@ -100,7 +102,10 @@ impl TryFrom<RawInput> for CommitterFactsDbInputImpl {
                 class_hash_to_compiled_class_hash,
                 storage_updates,
             },
-            config: ReaderConfig::new(raw_input.config.warn_on_trivial_modifications),
+            config: ReaderConfig::new(
+                raw_input.config.warn_on_trivial_modifications,
+                build_storage_tries_concurrently,
+            ),
         };
         Ok(Self { input, log_level: raw_input.config.log_level.into(), storage })
     }

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/read_test.rs

@@ -220,7 +220,7 @@ fn test_simple_input_parsing() {
             contracts_trie_root_hash: expected_contracts_trie_root_hash,
             classes_trie_root_hash: expected_classes_trie_root_hash,
         }),
-        config: ReaderConfig::new(true),
+        config: ReaderConfig::new(true, false),
     };
     assert_eq!(
         parse_input(input).unwrap(),