starknet_committer: add number of empty leaves to TimeMeasurementTrait

Author: rotem-starkware

crates/starknet_committer/src/block_committer/commit.rs

@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use async_trait::async_trait;
 use starknet_api::core::{ClassHash, ContractAddress, Nonce};
 use starknet_patricia::patricia_merkle_tree::types::{NodeIndex, SortedLeafIndices};
+use starknet_types_core::felt::Felt;
 use tracing::{info, warn};
 
 use crate::block_committer::errors::BlockCommitmentError;
@@ -41,15 +42,21 @@ pub trait CommitBlockTrait: Send {
         let actual_storage_updates = input.state_diff.actual_storage_updates();
         let actual_classes_updates = input.state_diff.actual_classes_updates();
         // Record the number of modifications.
+        let n_empty_leaves = actual_storage_updates
+            .values()
+            .map(|storage_entry| {
+                storage_entry.values().filter(|value| value.0 == Felt::ZERO).count()
+            })
+            .sum::<usize>();
         let n_storage_tries_modifications =
             actual_storage_updates.values().map(|value| value.len()).sum();
         measurements.set_number_of_modifications(
             n_storage_tries_modifications,
             n_contracts_trie_modifications,
             actual_classes_updates.len(),
+            n_empty_leaves,
         );
         // Reads - fetch_nodes.
-
         measurements.start_measurement(Action::Read);
         let roots =
             trie_reader.read_roots(input.initial_read_context).await.map_err(ForestError::from)?;

crates/starknet_committer/src/block_committer/measurements_util.rs

@@ -67,6 +67,7 @@ pub trait MeasurementsTrait {
         n_storage_tries_modifications: usize,
         n_contracts_trie_modifications: usize,
         n_classes_trie_modifications: usize,
+        n_empty_leaves: usize,
     );
 }
 
@@ -88,6 +89,7 @@ impl MeasurementsTrait for NoMeasurements {
         _n_storage_tries_modifications: usize,
         _n_contracts_trie_modifications: usize,
         _n_classes_trie_modifications: usize,
+        _n_empty_leaves: usize,
     ) {
     }
 }
@@ -105,6 +107,7 @@ pub struct BlockModificationsCounts {
     pub storage_tries: usize,
     pub contracts_trie: usize,
     pub classes_trie: usize,
+    pub empty_leaves: usize,
 }
 
 #[derive(Default, Clone)]
@@ -167,11 +170,13 @@ impl MeasurementsTrait for SingleBlockMeasurements {
         n_storage_tries_modifications: usize,
         n_contracts_trie_modifications: usize,
         n_classes_trie_modifications: usize,
+        n_empty_leaves: usize,
     ) {
         self.block_measurement.modifications_counts = BlockModificationsCounts {
             storage_tries: n_storage_tries_modifications,
             contracts_trie: n_contracts_trie_modifications,
             classes_trie: n_classes_trie_modifications,
+            empty_leaves: n_empty_leaves,
         };
     }
 }

crates/starknet_committer_cli/src/utils.rs

@@ -81,11 +81,13 @@ impl MeasurementsTrait for BenchmarkMeasurements {
         n_storage_tries_modifications: usize,
         n_contracts_trie_modifications: usize,
         n_classes_trie_modifications: usize,
+        n_empty_leaves: usize,
     ) {
         self.current_measurement.set_number_of_modifications(
             n_storage_tries_modifications,
             n_contracts_trie_modifications,
             n_classes_trie_modifications,
+            n_empty_leaves,
         );
     }
 }

crates/starknet_committer_cli/src/utils_test.rs

@@ -15,9 +15,15 @@ const WRITE_DURATION: u64 = 100;
 const N_READ_ENTRIES: usize = 100;
 const N_WRITE_ENTRIES: usize = 100;
 const N_MODIFICATIONS: usize = 100;
+const N_EMPTY_LEAVES: usize = 10;
 
 async fn measure_block(measurements: &mut BenchmarkMeasurements) {
-    measurements.set_number_of_modifications(N_MODIFICATIONS, N_MODIFICATIONS, N_MODIFICATIONS);
+    measurements.set_number_of_modifications(
+        N_MODIFICATIONS,
+        N_MODIFICATIONS,
+        N_MODIFICATIONS,
+        N_EMPTY_LEAVES,
+    );
     measurements.start_measurement(Action::EndToEnd);
     measurements.start_measurement(Action::Read);
     sleep(Duration::from_millis(READ_DURATION)).await;
@@ -65,7 +71,8 @@ fn assert_block_measurement(measurements: &BenchmarkMeasurements, number_of_bloc
             BlockModificationsCounts {
                 storage_tries: N_MODIFICATIONS,
                 contracts_trie: N_MODIFICATIONS,
-                classes_trie: N_MODIFICATIONS
+                classes_trie: N_MODIFICATIONS,
+                empty_leaves: N_EMPTY_LEAVES,
             }
         );
     }