From bb038c64a51ffb62df6e465041b3355d95929596 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Mon, 14 Apr 2025 12:16:30 +0200
Subject: [PATCH] fix failing tests

---
 core/genesis.go       | 2 +-
 core/state/statedb.go | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/genesis.go b/core/genesis.go
index ab80f3eded..da01a420c4 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -470,7 +470,7 @@ func (g *Genesis) chainConfigOrDefault(ghash common.Hash, stored *params.ChainCo
 // IsVerkle indicates whether the state is already stored in a verkle
 // tree at genesis time.
 func (g *Genesis) IsVerkle() bool {
-	return g.Config.VerkleTime != nil && *g.Config.VerkleTime == g.Timestamp
+	return g != nil && g.Config != nil && g.Config.VerkleTime != nil && *g.Config.VerkleTime == g.Timestamp
 }
 
 // ToBlock returns the genesis block according to genesis specification.
diff --git a/core/state/statedb.go b/core/state/statedb.go
index 175f67155d..6d1ef45a7b 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -1275,7 +1275,6 @@ func (s *StateDB) commitAndFlush(block uint64, deleteEmptyObjects bool, noStorag
 			return nil, err
 		}
 	}
-	s.db.SaveTransitionState(ret.root, &TransitionState{Ended: true})
 	if !ret.empty() {
 		// If snapshotting is enabled, update the snapshot tree with this new version
 		if snap := s.db.Snapshot(); snap != nil && snap.Snapshot(ret.originRoot) != nil {