devnet: Get devnet running (#2914)

- Deploys to Goerli
- Adds a Hardhat script to generate testnet sequencer keys from a mnemonic
- Minor updates to the batch submitter to get better output
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

op-batcher/batch_submitter.go

@@ -119,11 +119,17 @@ func NewBatchSubmitter(cfg Config, l log.Logger) (*BatchSubmitter, error) {
 		return nil, err
 	}
 
-	sequencerPrivKey, err := wallet.PrivateKey(accounts.Account{
+	acc := accounts.Account{
 		URL: accounts.URL{
 			Path: cfg.SequencerHDPath,
 		},
-	})
+	}
+	addr, err := wallet.Address(acc)
+	if err != nil {
+		return nil, err
+	}
+
+	sequencerPrivKey, err := wallet.PrivateKey(acc)
 	if err != nil {
 		return nil, err
 	}
@@ -155,6 +161,13 @@ func NewBatchSubmitter(cfg Config, l log.Logger) (*BatchSubmitter, error) {
 		return nil, err
 	}
 
+	sequencerBalance, err := l1Client.BalanceAt(ctx, addr, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Info("starting batch submitter", "submitter_addr", addr, "submitter_bal", sequencerBalance)
+
 	txManagerConfig := txmgr.Config{
 		Log:                       l,
 		Name:                      "Batch Submitter",

packages/contracts-bedrock/README.md

@@ -67,28 +67,30 @@ has a key for each property in the `deployConfigSpec`.
 
 We use [Seaport](https://github.com/ProjectOpenSea/seaport/blob/main/contracts/Seaport.sol)-style comments with some minor modifications.
 Some basic rules:
-* Always use `@notice` since it has the same general effect as `@dev` but avoids confusion about when to use one over the other.
-* Include a newline between `@notice` and the first `@param`.
-* Include a newline between `@param` and the first `@return`.
-* Use a line-length of 100 characters.
+
+- Always use `@notice` since it has the same general effect as `@dev` but avoids confusion about when to use one over the other.
+- Include a newline between `@notice` and the first `@param`.
+- Include a newline between `@param` and the first `@return`.
+- Use a line-length of 100 characters.
 
 We also have the following custom tags:
-* `@custom:proxied`: Add to a contract whenever it's meant to live behind a proxy.
-* `@custom:legacy`: Add to an event or function when it only exists for legacy support.
+
+- `@custom:proxied`: Add to a contract whenever it's meant to live behind a proxy.
+- `@custom:legacy`: Add to an event or function when it only exists for legacy support.
 
 #### Errors
 
-* Use `require` statements when making simple assertions.
-* Use `revert` if throwing an error where an assertion is not being made (no custom errors). See [here](https://github.com/ethereum-optimism/optimism/blob/861ae315a6db698a8c0adb1f8eab8311fd96be4c/packages/contracts-bedrock/contracts/L2/OVM_ETH.sol#L31) for an example of this in practice.
-* Error strings MUST have the format `"{ContractName}: {message}"` where `message` is a lower case string.
+- Use `require` statements when making simple assertions.
+- Use `revert` if throwing an error where an assertion is not being made (no custom errors). See [here](https://github.com/ethereum-optimism/optimism/blob/861ae315a6db698a8c0adb1f8eab8311fd96be4c/packages/contracts-bedrock/contracts/L2/OVM_ETH.sol#L31) for an example of this in practice.
+- Error strings MUST have the format `"{ContractName}: {message}"` where `message` is a lower case string.
 
 #### Function Parameters
 
-* Function parameters should be prefixed with an underscore.
+- Function parameters should be prefixed with an underscore.
 
 #### Event Parameters
 
-* Event parameters should NOT be prefixed with an underscore.
+- Event parameters should NOT be prefixed with an underscore.
 
 ### Proxy by Default
 
@@ -97,7 +99,8 @@ This means that new contracts MUST be built under the assumption of upgradeabili
 We use a minimal [`Proxy`](./contracts/universal/Proxy.sol) contract designed to be owned by a corresponding [`ProxyAdmin`](./contracts/universal/ProxyAdmin.sol) which follow the interfaces of OpenZeppelin's `Proxy` and `ProxyAdmin` contracts, respectively.
 
 Unless explicitly discussed otherwise, you MUST include the following basic upgradeability pattern for each new implementation contract:
+
 1. Extend OpenZeppelin's `Initializable` base contract.
 2. Include a `uint8 public constant VERSION = X` at the TOP of your contract.
 3. Include a function `initialize` with the modifier `reinitializer(VERSION)`.
-3. In the `constructor`, set any `immutable` variables and call the `initialize` function for setting mutables.
+4. In the `constructor`, set any `immutable` variables and call the `initialize` function for setting mutables.

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

@@ -48,7 +48,7 @@ const config = {
   sequencerWindowSize: 4,
   channelTimeout: 40,
 
-  ownerAddress: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+  outputOracleOwner: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
 }
 
 export default config

packages/contracts-bedrock/deploy-config/goerli.ts

 import { ethers } from 'ethers'
 
+const sequencerAddress = '0x5743191a8a1ffcedfc24f5b7219cb6714df0e5bb'
+const startingTimestamp = 1656654016
+
 const config = {
   submissionInterval: 6,
-  l2BlockTime: 2,
   genesisOutput: ethers.constants.HashZero,
   historicalBlocks: 0,
-  startingTimestamp: 1652907966,
-  sequencerAddress: '0x7431310e026B69BFC676C0013E12A1A11411EEc9',
+  startingBlockNumber: 0,
+  l2BlockTime: 2,
+  startingTimestamp,
+  sequencerAddress,
+
+  l2CrossDomainMessengerOwner: ethers.constants.AddressZero,
+  gasPriceOracleOwner: ethers.constants.AddressZero,
+  gasPriceOracleOverhead: 2100,
+  gasPriceOracleScalar: 1000000,
+  gasPriceOracleDecimals: 6,
+
+  l1BlockInitialNumber: 0,
+  l1BlockInitialTimestamp: 0,
+  l1BlockInitialBasefee: 10,
+  l1BlockInitialHash: ethers.constants.HashZero,
+  l1BlockInitialSequenceNumber: 0,
+
+  genesisBlockExtradata: ethers.utils.hexConcat([
+    ethers.constants.HashZero,
+    sequencerAddress,
+    ethers.utils.hexZeroPad('0x', 65),
+  ]),
+  genesisBlockGasLimit: ethers.BigNumber.from(15000000).toHexString(),
+
+  genesisBlockChainid: 111,
+  fundDevAccounts: true,
+  p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
+
+  deploymentWaitConfirmations: 1,
+
+  maxSequencerDrift: 1000,
+  sequencerWindowSize: 120,
+  channelTimeout: 120,
+
+  proxyAdmin: '0x863516d59eefd135485669e14cff3a8fb3836e74',
+  optimismBaseFeeRecipient: '0xf3841b313eb0da41d6dd47d82c149dcfa89aafbf',
+  optimismL1FeeRecipient: '0xce80bf47c3cc7cf824e917c7b6ff24513b09eba2',
+  optimismL2FeeRecipient: '0xd9c09e21b57c98e58a80552c170989b426766aa7',
+  outputOracleOwner: '0x7edca314d8e7f3bd7748c2c65f1de12d1a03b780',
+  batchSenderAddress: '0x6ec80601358a8297249f20ecf9248a6b16da1aaa',
 }
 
 export default config

packages/contracts-bedrock/deploy-config/hardhat.ts

@@ -18,7 +18,7 @@ const config = {
   maxSequencerDrift: 10,
   sequencerWindowSize: 4,
   channelTimeout: 40,
-  ownerAddress: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+  outputOracleOwner: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
   fundDevAccounts: true,
 }
 

packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts

@@ -37,7 +37,7 @@ const deployFn: DeployFunction = async (hre) => {
       deployConfig.startingTimestamp,
       deployConfig.l2BlockTime,
       deployConfig.sequencerAddress,
-      deployConfig.ownerAddress,
+      deployConfig.outputOracleOwner,
     ],
     log: true,
     waitConfirmations: deployConfig.deploymentWaitConfirmations,
@@ -60,7 +60,7 @@ const deployFn: DeployFunction = async (hre) => {
         deployConfig.genesisOutput,
         deployConfig.startingBlockNumber,
         deployConfig.sequencerAddress,
-        deployConfig.ownerAddress,
+        deployConfig.outputOracleOwner,
       ]
     )
   )

packages/contracts-bedrock/deployments/goerli/.chainId

-5
\ No newline at end of file

packages/contracts-bedrock/hardhat.config.ts

@@ -13,6 +13,7 @@ import '@eth-optimism/hardhat-deploy-config'
 import './tasks/genesis-l1'
 import './tasks/genesis-l2'
 import './tasks/deposits'
+import './tasks/rekey'
 import './tasks/rollup-config'
 
 subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(
@@ -85,7 +86,7 @@ const config: HardhatUserConfig = {
     sequencerAddress: {
       type: 'address',
     },
-    ownerAddress: {
+    outputOracleOwner: {
       type: 'address',
     },
   },

packages/contracts-bedrock/package.json

@@ -37,7 +37,9 @@
     "@openzeppelin/contracts": "^4.5.0",
     "@openzeppelin/contracts-upgradeable": "^4.5.2",
     "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
+    "bip39": "^3.0.4",
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
+    "ethereumjs-wallet": "^1.0.2",
     "ethers": "^5.6.8",
     "excessively-safe-call": "https://github.com/nomad-xyz/ExcessivelySafeCall.git#4fcdfd3593d21381f696c790fa6180b8ef559c1e",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#564510058ab3db01577b772c275e081e678373f2",

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

@@ -284,7 +284,7 @@ task('genesis-l2', 'create a genesis config')
       extraData: deployConfig.genesisBlockExtradata,
       optimism: {
         enabled: true,
-        baseFeeRecipient: deployConfig.optimsismBaseFeeRecipient,
+        baseFeeRecipient: deployConfig.optimismBaseFeeRecipient,
         l1FeeRecipient: deployConfig.optimismL1FeeRecipient,
       },
       alloc,

packages/contracts-bedrock/tasks/rekey.ts

+import { task } from 'hardhat/config'
+import { hdkey } from 'ethereumjs-wallet'
+import * as bip39 from 'bip39'
+
+task('rekey', 'Generates a new set of keys for a test network').setAction(
+  async () => {
+    const mnemonic = bip39.generateMnemonic()
+    const pathPrefix = "m/44'/60'/0'/0"
+    const labels = [
+      'sequencerAddress',
+      'proxyAdmin',
+      'optimismBaseFeeRecipient',
+      'optimismL1FeeRecipient',
+      'optimismL2FeeRecipient',
+      'p2pSequencerAddress',
+      'outputOracleOwner',
+      'batchSenderAddress',
+    ]
+
+    const hdwallet = hdkey.fromMasterSeed(await bip39.mnemonicToSeed(mnemonic))
+    let i = 0
+    const out = {}
+    console.log(`Mnemonic: ${mnemonic}`)
+    for (const label of labels) {
+      const wallet = hdwallet.derivePath(`${pathPrefix}/${i}`).getWallet()
+      out[label] = `0x${wallet.getAddress().toString('hex')}`
+      i++
+    }
+    console.log(JSON.stringify(out, null, '  '))
+  }
+)

packages/contracts-bedrock/tasks/rollup-config.ts

@@ -18,7 +18,6 @@ task('rollup-config', 'create a genesis config')
     const l1 = new ethers.providers.StaticJsonRpcProvider(args.l1RpcUrl)
     const l2 = new ethers.providers.StaticJsonRpcProvider(args.l2RpcUrl)
 
-    const l1Genesis = await l1.getBlock('earliest')
     const l2Genesis = await l2.getBlock('earliest')
 
     const portal = await hre.deployments.get('OptimismPortalProxy')
@@ -26,8 +25,8 @@ task('rollup-config', 'create a genesis config')
     const config: OpNodeConfig = {
       genesis: {
         l1: {
-          hash: l1Genesis.hash,
-          number: 0,
+          hash: portal.receipt.blockHash,
+          number: portal.receipt.blockNumber,
         },
         l2: {
           hash: l2Genesis.hash,
@@ -43,10 +42,10 @@ task('rollup-config', 'create a genesis config')
       l1_chain_id: await getChainId(l1),
       l2_chain_id: await getChainId(l2),
 
-      p2p_sequencer_address: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
-      fee_recipient_address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
+      p2p_sequencer_address: deployConfig.p2pSequencerAddress,
+      fee_recipient_address: deployConfig.optimismL2FeeRecipient,
       batch_inbox_address: '0xff00000000000000000000000000000000000002',
-      batch_sender_address: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
+      batch_sender_address: deployConfig.batchSenderAddress,
       deposit_contract_address: portal.address,
     }
 

yarn.lock

@@ -3404,6 +3404,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0"
   integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==
 
+"@types/node@11.11.6":
+  version "11.11.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a"
+  integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
+
 "@types/node@^10.0.3":
   version "10.17.60"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
@@ -4005,7 +4010,7 @@ aes-js@3.0.0:
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
   integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=
 
-aes-js@^3.1.1:
+aes-js@^3.1.1, aes-js@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
   integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==
@@ -5153,6 +5158,16 @@ bip39@2.5.0:
     safe-buffer "^5.0.1"
     unorm "^1.3.3"
 
+bip39@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
+  integrity sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==
+  dependencies:
+    "@types/node" "11.11.6"
+    create-hash "^1.1.0"
+    pbkdf2 "^3.0.9"
+    randombytes "^2.0.1"
+
 bip66@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -8260,6 +8275,17 @@ ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.4:
     ethereum-cryptography "^0.1.3"
     rlp "^2.2.4"
 
+ethereumjs-util@^7.1.2:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181"
+  integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==
+  dependencies:
+    "@types/bn.js" "^5.1.0"
+    bn.js "^5.1.2"
+    create-hash "^1.1.2"
+    ethereum-cryptography "^0.1.3"
+    rlp "^2.2.4"
+
 ethereumjs-vm@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz#e885e861424e373dbc556278f7259ff3fca5edab"
@@ -8313,6 +8339,20 @@ ethereumjs-wallet@0.6.5:
     utf8 "^3.0.0"
     uuid "^3.3.2"
 
+ethereumjs-wallet@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-1.0.2.tgz#2c000504b4c71e8f3782dabe1113d192522e99b6"
+  integrity sha512-CCWV4RESJgRdHIvFciVQFnCHfqyhXWchTPlkfp28Qc53ufs+doi5I/cV2+xeK9+qEo25XCWfP9MiL+WEPAZfdA==
+  dependencies:
+    aes-js "^3.1.2"
+    bs58check "^2.1.2"
+    ethereum-cryptography "^0.1.3"
+    ethereumjs-util "^7.1.2"
+    randombytes "^2.1.0"
+    scrypt-js "^3.0.1"
+    utf8 "^3.0.0"
+    uuid "^8.3.2"
+
 ethers@^4.0.32, ethers@^4.0.40:
   version "4.0.49"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894"