blockifier_reexecution: seperate reexecute block from verify correctness

Author: AvivYossef-starkware

crates/blockifier_reexecution/src/state_reader/reexecution_state_reader.rs

@@ -133,7 +133,9 @@ pub trait ConsecutiveReexecutionStateReaders<S: StateReader + Send + Sync + 'sta
 
     fn get_next_block_state_diff(&self) -> ReexecutionResult<CommitmentStateDiff>;
 
-    fn reexecute_and_verify_correctness(self) -> Option<CachedState<S>> {
+    /// Reexecutes a block and returns the block state along with the expected and actual state
+    /// diffs. Does not verify that the state diffs match.
+    fn reexecute_block(self) -> (Option<CachedState<S>>, CommitmentStateDiff, CommitmentStateDiff) {
         let expected_state_diff = self.get_next_block_state_diff().unwrap();
 
         let all_txs_in_next_block = self.get_next_block_txs().unwrap();
@@ -153,8 +155,14 @@ pub trait ConsecutiveReexecutionStateReaders<S: StateReader + Send + Sync + 'sta
             .expect("Couldn't finalize block")
             .state_diff;
 
+        (transaction_executor.block_state, expected_state_diff, actual_state_diff)
+    }
+
+    fn reexecute_and_verify_correctness(self) -> Option<CachedState<S>> {
+        let (block_state, expected_state_diff, actual_state_diff) = self.reexecute_block();
+
         assert_eq_state_diff!(expected_state_diff, actual_state_diff);
 
-        transaction_executor.block_state
+        block_state
     }
 }

crates/blockifier_reexecution/src/state_reader/utils.rs

@@ -276,8 +276,21 @@ pub fn write_block_reexecution_data_to_file(
 
     let old_block_hash = consecutive_state_readers.get_old_block_hash().unwrap();
 
-    // Run the reexecution test and get the state maps and contract class mapping.
-    let block_state = consecutive_state_readers.reexecute_and_verify_correctness().unwrap();
+    // Run the reexecution and get the state maps and contract class mapping.
+    let (block_state, expected_state_diff, actual_state_diff) =
+        consecutive_state_readers.reexecute_block();
+
+    // Warn if state diffs don't match, but continue writing the file.
+    let expected_comparable = ComparableStateDiff::from(expected_state_diff);
+    let actual_comparable = ComparableStateDiff::from(actual_state_diff);
+    if expected_comparable != actual_comparable {
+        println!(
+            "WARNING: State diff mismatch for block {block_number}. Expected and actual state \
+             diffs do not match."
+        );
+    }
+
+    let block_state = block_state.unwrap();
     let serializable_data_prev_block = SerializableDataPrevBlock {
         state_maps: block_state.get_initial_reads().unwrap().into(),
         contract_class_mapping: block_state