From ab55ea5e04292f21a60a83eeed5b8542f9c55d09 Mon Sep 17 00:00:00 2001
From: Roman Krasiuk <rokrassyuk@gmail.com>
Date: Mon, 8 May 2023 16:13:08 +0300
Subject: [PATCH] fix(execution): extend poststate before threshold check
 (#2602)

---
 crates/stages/src/stages/execution.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/stages/src/stages/execution.rs b/crates/stages/src/stages/execution.rs
index 700b678eab..eaabd96ceb 100644
--- a/crates/stages/src/stages/execution.rs
+++ b/crates/stages/src/stages/execution.rs
@@ -162,6 +162,10 @@ impl<EF: ExecutorFactory> ExecutionStage<EF> {
                 .mgas_processed_total
                 .increment(block.header.gas_used as f64 / MGAS_TO_GAS as f64);
 
+            // Merge state changes
+            state.extend(block_state);
+            progress = block_number;
+
             // Write history periodically to free up memory
             if self.thresholds.should_write_history(state.changeset_size() as u64) {
                 info!(target: "sync::stages::execution", ?block_number, "Writing history.");
@@ -175,10 +179,6 @@ impl<EF: ExecutorFactory> ExecutionStage<EF> {
                 info!(target: "sync::stages::execution", ?block_number, "Threshold hit, committing.");
                 break
             }
-
-            // Merge state changes
-            state.extend(block_state);
-            progress = block_number;
         }
 
         // Write remaining changes