op-chain-ops: Allow configurable dev accounts (#3381)

* op-chain-ops: Allow configurable dev accounts

* Set difficulty to zero

* Add tests

op-chain-ops/genesis/config.go

@@ -72,6 +72,8 @@ type DeployConfig struct {
 
 	EIP1559Elasticity  uint64 `json:"eip1559Elasticity"`
 	EIP1559Denominator uint64 `json:"eip1559Denominator"`
+
+	FundDevAccounts bool `json:"fundDevAccounts"`
 }
 
 // NewDeployConfig reads a config file given a path on the filesystem.

op-chain-ops/genesis/genesis.go

@@ -74,7 +74,7 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro
 	}
 	difficulty := config.L2GenesisBlockDifficulty
 	if difficulty == nil {
-		difficulty = newHexBig(1)
+		difficulty = newHexBig(0)
 	}
 
 	return &core.Genesis{

op-chain-ops/genesis/layer_two.go

@@ -24,7 +24,9 @@ func BuildL2DeveloperGenesis(config *DeployConfig, l1StartBlock *types.Block, l2
 
 	db := state.NewMemoryStateDB(genspec)
 
+	if config.FundDevAccounts {
 		FundDevAccounts(db)
+	}
 	SetPrecompileBalances(db)
 
 	return BuildL2Genesis(db, config, l1StartBlock, l2Addrs)

op-chain-ops/genesis/layer_two_test.go

@@ -77,9 +77,30 @@ func TestBuildL2DeveloperGenesis(t *testing.T) {
 		require.Equal(t, adminSlot, proxyAdmin.Address.Hash())
 		require.Equal(t, account.Code, depB)
 	}
+	require.Equal(t, 2337, len(gen.Alloc))
 
 	if writeFile {
 		file, _ := json.MarshalIndent(gen, "", " ")
 		_ = os.WriteFile("genesis.json", file, 0644)
 	}
 }
+
+func TestBuildL2DeveloperGenesisDevAccountsFunding(t *testing.T) {
+	config, err := genesis.NewDeployConfig("./testdata/test-deploy-config-devnet-l1.json")
+	require.Nil(t, err)
+	config.FundDevAccounts = false
+
+	backend := backends.NewSimulatedBackend(
+		core.GenesisAlloc{
+			crypto.PubkeyToAddress(testKey.PublicKey): {Balance: big.NewInt(10000000000000000)},
+		},
+		15000000,
+	)
+	block, err := backend.BlockByNumber(context.Background(), common.Big0)
+	require.NoError(t, err)
+	gen, err := genesis.BuildL2DeveloperGenesis(config, block, &genesis.L2Addresses{
+		ProxyAdmin: common.Address{},
+	})
+	require.NoError(t, err)
+	require.Equal(t, 2316, len(gen.Alloc))
+}

op-chain-ops/genesis/testdata/test-deploy-config-devnet-l1.json

@@ -23,5 +23,6 @@
   "optimismBaseFeeRecipient": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "optimismL1FeeRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
 
-  "deploymentWaitConfirmations": 1
+  "deploymentWaitConfirmations": 1,
+  "fundDevAccounts": true
 }

op-chain-ops/genesis/testdata/test-deploy-config-full.json

@@ -47,5 +47,6 @@
   "gasPriceOracleDecimals": 6,
   "deploymentWaitConfirmations": 1,
   "eip1559Denominator": 8,
-  "eip1559Elasticity": 2
+  "eip1559Elasticity": 2,
+  "fundDevAccounts": true
 }
\ No newline at end of file

packages/contracts-bedrock/deploy-config/devnetL1.json

@@ -23,5 +23,6 @@
   "optimismBaseFeeRecipient": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "optimismL1FeeRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
 
-  "deploymentWaitConfirmations": 1
+  "deploymentWaitConfirmations": 1,
+  "fundDevAccounts": true
 }