From 0144095e6446c8d47cff2819351e887f1b4b34c5 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:50:39 +0800
Subject: [PATCH] fix load genesis (#834)

* fix `SetupGenesisBlockWithOverride`

* fix `configOrDefault`
---
 core/genesis.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/genesis.go b/core/genesis.go
index cf3cb950d6..f50601f750 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -316,7 +316,8 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *trie.Database, gen
 		// overwrite triedb IsUsingZktrie config to be safe
 		triedb.SetIsUsingZktrie(storedcfg.Scroll.ZktrieEnabled())
 	}
-	if header.Root != types.EmptyRootHash && !triedb.Initialized(header.Root) {
+	// if header.Root != types.EmptyRootHash && !triedb.Initialized(header.Hash()) {
+	if _, err := state.New(header.Root, state.NewDatabaseWithNodeDB(db, triedb), nil); err != nil {
 		if genesis == nil {
 			genesis = DefaultGenesisBlock()
 		}
@@ -420,6 +421,12 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
 		return params.SepoliaChainConfig
 	case ghash == params.GoerliGenesisHash:
 		return params.GoerliChainConfig
+	case ghash == params.ScrollAlphaGenesisHash:
+		return params.ScrollAlphaChainConfig
+	case ghash == params.ScrollSepoliaGenesisHash:
+		return params.ScrollSepoliaChainConfig
+	case ghash == params.ScrollMainnetGenesisHash:
+		return params.ScrollMainnetChainConfig
 	default:
 		return params.AllEthashProtocolChanges
 	}