From 7db003447d7750b44c5a8be9681b57811f1c553f Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:09:37 +0100
Subject: [PATCH 1/2] fix post-verge sync

---
 core/blockchain.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/blockchain.go b/core/blockchain.go
index 36e58ca8df57..3cb374d2136b 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1768,6 +1768,10 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 			if !bc.stateCache.InTransition() && !bc.stateCache.Transitioned() {
 				bc.stateCache.StartVerkleTransition(parent.Root, emptyVerkleRoot, bc.Config(), bc.Config().PragueTime, parent.Root)
 			}
+		} else {
+			// If the verkle activation time hasn't started, declare it as "not started".
+			// This is so that
+			bc.stateCache.InitTransitionStatus(false, false)
 		}
 		if parent.Number.Uint64() == conversionBlock {
 			bc.StartVerkleTransition(parent.Root, emptyVerkleRoot, bc.Config(), &parent.Time, parent.Root)

From a6d9d384676460be80730afdd2732364de4bccea Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:00:02 +0000
Subject: [PATCH 2/2] review: fix truncated comment

---
 core/blockchain.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index 3cb374d2136b..9143fd6c699d 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1770,7 +1770,8 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 			}
 		} else {
 			// If the verkle activation time hasn't started, declare it as "not started".
-			// This is so that
+			// This is so that if the miner activates the conversion, the insertion happens
+			// in the correct mode.
 			bc.stateCache.InitTransitionStatus(false, false)
 		}
 		if parent.Number.Uint64() == conversionBlock {