Merge branch 'develop' into develop

packages/contracts-bedrock/tasks/genesis-l2.ts

@@ -290,9 +290,9 @@ task('genesis-l2', 'create a genesis config')
         londonBlock: 0,
         mergeNetsplitBlock: 0,
         terminalTotalDifficulty: 0,
-        clique: {
-          period: 0,
-          epoch: 30000,
+        optimism: {
+          baseFeeRecipient: deployConfig.optimismBaseFeeRecipient,
+          l1FeeRecipient: deployConfig.optimismL1FeeRecipient,
         },
       },
       nonce: '0x1234',
@@ -300,11 +300,6 @@ task('genesis-l2', 'create a genesis config')
       timestamp: ethers.BigNumber.from(l1StartingBlock.timestamp).toHexString(),
       gasLimit: deployConfig.genesisBlockGasLimit,
       extraData: deployConfig.genesisBlockExtradata,
-      optimism: {
-        enabled: true,
-        baseFeeRecipient: deployConfig.optimismBaseFeeRecipient,
-        l1FeeRecipient: deployConfig.optimismL1FeeRecipient,
-      },
       alloc,
     }
 

packages/core-utils/src/external/geth/geth-types.ts

@@ -66,15 +66,16 @@ export interface Genesis {
 /**
  * Represents the chain config for an Optimism chain
  */
-export interface OptimismChainConfig {
-  enabled: boolean
-  baseFeeRecipient: string
-  l1FeeRecipient: string
+export interface OptimismChainConfig extends ChainConfig {
+  optimism: {
+    baseFeeRecipient: string
+    l1FeeRecipient: string
+  }
 }
 
 /**
  * Represents the Genesis file format for an Optimism chain
  */
 export interface OptimismGenesis extends Genesis {
-  optimism: OptimismChainConfig
+  config: OptimismChainConfig
 }