From e703973dc6ea74ca93453f5750cb0dffc3c25eb3 Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <a.shekhirin@gmail.com>
Date: Mon, 29 May 2023 15:42:16 +0400
Subject: [PATCH] fix(stages): reset Merkle checkpoint (#2877)

---
 crates/stages/src/stages/merkle.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/stages/src/stages/merkle.rs b/crates/stages/src/stages/merkle.rs
index 513983a4d..f661aec2d 100644
--- a/crates/stages/src/stages/merkle.rs
+++ b/crates/stages/src/stages/merkle.rs
@@ -161,7 +161,7 @@ impl<DB: Database> Stage<DB> for MerkleStage {
 
         let block_root = tx.get_header(current_block)?.state_root;
 
-        let checkpoint = self.get_execution_checkpoint(tx)?;
+        let mut checkpoint = self.get_execution_checkpoint(tx)?;
 
         let trie_root = if range.is_empty() {
             block_root
@@ -185,6 +185,7 @@ impl<DB: Database> Stage<DB> for MerkleStage {
                     "Rebuilding trie"
                 );
                 // Reset the checkpoint and clear trie tables
+                checkpoint = None;
                 self.save_execution_checkpoint(tx, None)?;
                 tx.clear::<tables::AccountsTrie>()?;
                 tx.clear::<tables::StoragesTrie>()?;