starknet_committer: add number of empty leaves to BlockModificationsCounts

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;
@@ -45,15 +46,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(BlockModificationsCounts {
             storage_tries: n_storage_tries_modifications,
             contracts_trie: n_contracts_trie_modifications,
             classes_trie: actual_classes_updates.len(),
+            emptied_storage_leaves: 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

@@ -98,6 +98,7 @@ pub struct BlockModificationsCounts {
     pub storage_tries: usize,
     pub contracts_trie: usize,
     pub classes_trie: usize,
+    pub emptied_storage_leaves: usize,
 }
 
 #[derive(Default, Clone)]

crates/starknet_committer_cli/src/utils_test.rs

@@ -15,12 +15,14 @@ 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(BlockModificationsCounts {
         storage_tries: N_MODIFICATIONS,
         contracts_trie: N_MODIFICATIONS,
         classes_trie: N_MODIFICATIONS,
+        emptied_storage_leaves: N_EMPTY_LEAVES,
     });
     measurements.start_measurement(Action::EndToEnd);
     measurements.start_measurement(Action::Read);
@@ -69,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,
+                emptied_storage_leaves: N_EMPTY_LEAVES,
             }
         );
     }