Merge pull request OffchainLabs#3353 from OffchainLabs/arb_genesis_ParseStateScheme

In ParseStateScheme make sure to set genesis block number properly based on arb/eth chain

Author: eljobe

cmd/nitro/init_test.go

@@ -424,6 +424,7 @@ func TestOpenInitializeChainDbIncompatibleStateScheme(t *testing.T) {
 
 	nodeConfig := NodeConfigDefault
 	nodeConfig.Execution.Caching.StateScheme = rawdb.PathScheme
+	nodeConfig.Execution.RPC.StateScheme = rawdb.PathScheme
 	nodeConfig.Chain.ID = 42161
 	nodeConfig.Node = *arbnode.ConfigDefaultL2Test()
 	nodeConfig.Init.DevInit = true
@@ -469,6 +470,7 @@ func TestOpenInitializeChainDbIncompatibleStateScheme(t *testing.T) {
 
 	// opening with a different state scheme errors
 	nodeConfig.Execution.Caching.StateScheme = rawdb.HashScheme
+	nodeConfig.Execution.RPC.StateScheme = rawdb.HashScheme
 	_, _, err = openInitializeChainDb(
 		ctx,
 		stack,
@@ -690,6 +692,7 @@ func TestOpenInitializeChainDbEmptyInit(t *testing.T) {
 
 	nodeConfig := NodeConfigDefault
 	nodeConfig.Execution.Caching.StateScheme = env.GetTestStateScheme()
+	nodeConfig.Execution.RPC.StateScheme = env.GetTestStateScheme()
 	nodeConfig.Chain.ID = 42161
 	nodeConfig.Node = *arbnode.ConfigDefaultL2Test()
 	nodeConfig.Init.Empty = true

go-ethereum

@@ -40,6 +40,7 @@ func TestL3ChallengeProtocolBOLD(t *testing.T) {
 
 	// Block validation requires db hash scheme.
 	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.execConfig.RPC.StateScheme = rawdb.HashScheme
 	builder.nodeConfig.BlockValidator.Enable = true
 	builder.nodeConfig.Staker.Enable = true
 	builder.nodeConfig.Staker.Strategy = "MakeNodes"
@@ -53,6 +54,7 @@ func TestL3ChallengeProtocolBOLD(t *testing.T) {
 	defer cleanupL1AndL2()
 
 	builder.l3Config.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.l3Config.execConfig.RPC.StateScheme = rawdb.HashScheme
 	builder.l3Config.nodeConfig.Staker.Enable = true
 	builder.l3Config.nodeConfig.BlockValidator.Enable = true
 	builder.l3Config.nodeConfig.Staker.Strategy = "MakeNodes"

system_tests/bold_l3_support_test.go

@@ -212,6 +212,7 @@ var TestSequencerConfig = gethexec.SequencerConfig{
 func ExecConfigDefaultNonSequencerTest(t *testing.T, stateScheme string) *gethexec.Config {
 	config := gethexec.ConfigDefault
 	config.Caching.StateScheme = stateScheme
+	config.RPC.StateScheme = stateScheme
 	config.ParentChainReader = headerreader.TestConfig
 	config.Sequencer.Enable = false
 	config.Forwarder = DefaultTestForwarderConfig
@@ -226,6 +227,7 @@ func ExecConfigDefaultNonSequencerTest(t *testing.T, stateScheme string) *gethex
 func ExecConfigDefaultTest(t *testing.T, stateScheme string) *gethexec.Config {
 	config := gethexec.ConfigDefault
 	config.Caching.StateScheme = stateScheme
+	config.RPC.StateScheme = stateScheme
 	config.Sequencer = TestSequencerConfig
 	config.ParentChainReader = headerreader.TestConfig
 	config.ForwardingTarget = "null"
@@ -418,6 +420,7 @@ func (b *NodeBuilder) RequireScheme(t *testing.T, scheme string) *NodeBuilder {
 	}
 	if b.defaultDbScheme != scheme && b.execConfig != nil {
 		b.execConfig.Caching.StateScheme = scheme
+		b.execConfig.RPC.StateScheme = scheme
 		Require(t, b.execConfig.Validate())
 	}
 	b.defaultDbScheme = scheme