fix failing tests

Author: gballet

consensus/beacon/consensus.go

@@ -382,7 +382,7 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 	// This step needs to happen as late as possible to catch all access events.
 	if chain.Config().IsVerkle(header.Number, header.Time) {
 		// TODO(gballet) move this to the end of the overlay conversion function in a subsequent PR
-		statedb.Database().SaveTransitionState(header.Root, &state.TransitionState{Ended: true})
+		statedb.Database().(*state.CachingDB).SaveTransitionState(header.Root, &state.TransitionState{Ended: true})
 		keys := statedb.AccessEvents().Keys()
 
 		// Open the pre-tree to prove the pre-state against

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.

core/state/database.go

@@ -66,12 +66,6 @@ type Database interface {
 
 	// Snapshot returns the underlying state snapshot.
 	Snapshot() *snapshot.Tree
-
-	// SaveTransitionState saves the tree transition progress markers to the database.
-	SaveTransitionState(common.Hash, *TransitionState)
-
-	// LoadTransitionState loads the tree transition progress markers from the database.
-	LoadTransitionState(common.Hash) *TransitionState
 }
 
 // Trie is a Ethereum Merkle Patricia trie.

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 {