From 791f30bcc7caadca0e1983da2937cc16a80949b8 Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu, 18 Aug 2022 17:05:40 -0700
Subject: [PATCH] contracts-bedrock: migrate deploy config to json

Migrates the deploy config from typescript to json
so that it can be read into a go program.
---
 .changeset/curvy-chefs-relax.md               |  5 +++
 .../deploy-config/devnetL1.json               | 29 +++++++++++++++
 .../deploy-config/devnetL1.ts                 | 37 -------------------
 .../deploy-config/goerli.json                 | 26 +++++++++++++
 .../contracts-bedrock/deploy-config/goerli.ts | 36 ------------------
 .../deploy-config/hardhat.json                | 24 ++++++++++++
 .../deploy-config/hardhat.ts                  | 33 -----------------
 7 files changed, 84 insertions(+), 106 deletions(-)
 create mode 100644 .changeset/curvy-chefs-relax.md
 create mode 100644 packages/contracts-bedrock/deploy-config/devnetL1.json
 delete mode 100644 packages/contracts-bedrock/deploy-config/devnetL1.ts
 create mode 100644 packages/contracts-bedrock/deploy-config/goerli.json
 delete mode 100644 packages/contracts-bedrock/deploy-config/goerli.ts
 create mode 100644 packages/contracts-bedrock/deploy-config/hardhat.json
 delete mode 100644 packages/contracts-bedrock/deploy-config/hardhat.ts

diff --git a/.changeset/curvy-chefs-relax.md b/.changeset/curvy-chefs-relax.md
new file mode 100644
index 000000000..482331261
--- /dev/null
+++ b/.changeset/curvy-chefs-relax.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Migrate deploy config to json from ts
diff --git a/packages/contracts-bedrock/deploy-config/devnetL1.json b/packages/contracts-bedrock/deploy-config/devnetL1.json
new file mode 100644
index 000000000..262f4b409
--- /dev/null
+++ b/packages/contracts-bedrock/deploy-config/devnetL1.json
@@ -0,0 +1,29 @@
+{
+  "l1StartingBlockTag": "earliest",
+  "l1ChainID": 900,
+  "l2ChainID": 901,
+  "l2BlockTime": 2,
+
+  "maxSequencerDrift": 100,
+  "sequencerWindowSize": 4,
+  "channelTimeout": 40,
+  "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "optimismL2FeeRecipient": "0xd9c09e21b57c98e58a80552c170989b426766aa7",
+  "batchInboxAddress": "0xff00000000000000000000000000000000000000",
+  "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
+
+  "l2OutputOracleSubmissionInterval": 20,
+  "l2OutputOracleStartingTimestamp": -1,
+  "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+  "l2OutputOracleOwner": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+
+  "l1BlockTime": 15,
+  "cliqueSignerAddress": "0xca062b0fd91172d89bcd4bb084ac4e21972cc467",
+
+  "optimismBaseFeeRecipient": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
+  "optimismL1FeeRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
+  "proxyAdmin": "0x829BD824B016326A401d083B33D092293333A830",
+  "fundDevAccounts": true,
+
+  "deploymentWaitConfirmations": 1
+}
diff --git a/packages/contracts-bedrock/deploy-config/devnetL1.ts b/packages/contracts-bedrock/deploy-config/devnetL1.ts
deleted file mode 100644
index 5c114838a..000000000
--- a/packages/contracts-bedrock/deploy-config/devnetL1.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-const config = {
-  // general
-  l1StartingBlockTag: 'earliest',
-  l1ChainID: 900,
-  l2ChainID: 901,
-  l2BlockTime: 2,
-
-  // rollup
-  maxSequencerDrift: 100,
-  sequencerWindowSize: 4,
-  channelTimeout: 40,
-  p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
-  optimismL2FeeRecipient: '0xd9c09e21b57c98e58a80552c170989b426766aa7',
-  batchInboxAddress: '0xff00000000000000000000000000000000000000',
-  batchSenderAddress: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
-
-  // output oracle
-  l2OutputOracleSubmissionInterval: 20,
-  l2OutputOracleStartingTimestamp: -1, // based on L1 starting tag instead
-  l2OutputOracleProposer: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
-  l2OutputOracleOwner: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
-
-  // l1
-  l1BlockTime: 15,
-  cliqueSignerAddress: '0xca062b0fd91172d89bcd4bb084ac4e21972cc467',
-
-  // l2
-  optimismBaseFeeRecipient: '0xBcd4042DE499D14e55001CcbB24a551F3b954096',
-  optimismL1FeeRecipient: '0x71bE63f3384f5fb98995898A86B02Fb2426c5788',
-  proxyAdmin: '0x829BD824B016326A401d083B33D092293333A830',
-  fundDevAccounts: true,
-
-  // deploying
-  deploymentWaitConfirmations: 1,
-}
-
-export default config
diff --git a/packages/contracts-bedrock/deploy-config/goerli.json b/packages/contracts-bedrock/deploy-config/goerli.json
new file mode 100644
index 000000000..6e9c95202
--- /dev/null
+++ b/packages/contracts-bedrock/deploy-config/goerli.json
@@ -0,0 +1,26 @@
+{
+  "l1StartingBlockTag": "0xafce66a0a2446856112e4069b275ad32b1f4a607888f9c4c59eddf9be81f8670",
+  "l1ChainID": 5,
+  "l2ChainID": 111,
+  "l2BlockTime": 2,
+
+  "maxSequencerDrift": 1000,
+  "sequencerWindowSize": 120,
+  "channelTimeout": 120,
+  "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "optimismL2FeeRecipient": "0x26862c200bd48c19f39d9e1cd88a3b439611d911",
+  "batchInboxAddress": "0xff00000000000000000000000000000000000002",
+  "batchSenderAddress": "0xa11d2b908470e17923fff184d48269bebbd9b2a5",
+
+  "l2OutputOracleSubmissionInterval": 6,
+  "l2OutputOracleStartingTimestamp": -1,
+  "l2OutputOracleProposer": "0x6c23a0dcdfc44b7a57bed148de598895e398d984",
+  "l2OutputOracleOwner": "0x6925b8704ff96dee942623d6fb5e946ef5884b63",
+
+  "optimismBaseFeeRecipient": "0xf116a24056b647e3211d095c667e951536cdebaa",
+  "optimismL1FeeRecipient": "0xc731837b696ca3d9720d23336925368ceaa58f83",
+  "proxyAdmin": "0xe584e1b833ca80020130b1b69f84f90479076168",
+  "fundDevAccounts": true,
+
+  "deploymentWaitConfirmations": 1
+}
diff --git a/packages/contracts-bedrock/deploy-config/goerli.ts b/packages/contracts-bedrock/deploy-config/goerli.ts
deleted file mode 100644
index d2b1102f3..000000000
--- a/packages/contracts-bedrock/deploy-config/goerli.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-const l1StartingBlockTag =
-  '0xafce66a0a2446856112e4069b275ad32b1f4a607888f9c4c59eddf9be81f8670'
-
-const config = {
-  // general
-  l1StartingBlockTag,
-  l1ChainID: 5,
-  l2ChainID: 111,
-  l2BlockTime: 2,
-
-  // rollup
-  maxSequencerDrift: 1000,
-  sequencerWindowSize: 120,
-  channelTimeout: 120,
-  p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
-  optimismL2FeeRecipient: '0x26862c200bd48c19f39d9e1cd88a3b439611d911',
-  batchInboxAddress: '0xff00000000000000000000000000000000000002',
-  batchSenderAddress: '0xa11d2b908470e17923fff184d48269bebbd9b2a5',
-
-  // output oracle
-  l2OutputOracleSubmissionInterval: 6,
-  l2OutputOracleStartingTimestamp: -1, // based on L1 starting tag instead
-  l2OutputOracleProposer: '0x6c23a0dcdfc44b7a57bed148de598895e398d984',
-  l2OutputOracleOwner: '0x6925b8704ff96dee942623d6fb5e946ef5884b63',
-
-  // l2
-  optimismBaseFeeRecipient: '0xf116a24056b647e3211d095c667e951536cdebaa',
-  optimismL1FeeRecipient: '0xc731837b696ca3d9720d23336925368ceaa58f83',
-  proxyAdmin: '0xe584e1b833ca80020130b1b69f84f90479076168',
-  fundDevAccounts: true,
-
-  // deploying
-  deploymentWaitConfirmations: 1,
-}
-
-export default config
diff --git a/packages/contracts-bedrock/deploy-config/hardhat.json b/packages/contracts-bedrock/deploy-config/hardhat.json
new file mode 100644
index 000000000..2a575a1b1
--- /dev/null
+++ b/packages/contracts-bedrock/deploy-config/hardhat.json
@@ -0,0 +1,24 @@
+{
+  "l1StartingBlockTag": "earliest",
+  "l1ChainID": 900,
+  "l2ChainID": 901,
+  "l2BlockTime": 2,
+
+  "maxSequencerDrift": 10,
+  "sequencerWindowSize": 4,
+  "channelTimeout": 40,
+  "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "optimismL2FeeRecipient": "0xd9c09e21b57c98e58a80552c170989b426766aa7",
+  "batchInboxAddress": "0xff00000000000000000000000000000000000000",
+  "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
+
+  "l2OutputOracleSubmissionInterval": 6,
+  "l2OutputOracleStartingTimestamp": -1,
+  "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+  "l2OutputOracleOwner": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+
+  "proxyAdmin": "0x0000000000000000000000000000000000000000",
+  "fundDevAccounts": true,
+
+  "deploymentWaitConfirmations": 1
+}
diff --git a/packages/contracts-bedrock/deploy-config/hardhat.ts b/packages/contracts-bedrock/deploy-config/hardhat.ts
deleted file mode 100644
index c8ae381bc..000000000
--- a/packages/contracts-bedrock/deploy-config/hardhat.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-const config = {
-  // general
-  l1StartingBlockTag: 'earliest',
-  l1ChainID: 900,
-  l2ChainID: 901,
-  l2BlockTime: 2,
-
-  // rollup
-  maxSequencerDrift: 10,
-  sequencerWindowSize: 4,
-  channelTimeout: 40,
-  p2pSequencerAddress: '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
-  optimismL2FeeRecipient: '0xd9c09e21b57c98e58a80552c170989b426766aa7',
-  batchInboxAddress: '0xff00000000000000000000000000000000000000',
-  batchSenderAddress: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
-
-  // output oracle
-  l2OutputOracleSubmissionInterval: 6,
-  l2OutputOracleStartingTimestamp: -1, // based on L1 starting tag instead
-  l2OutputOracleProposer: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
-  l2OutputOracleOwner: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
-
-  // l1: all defaults
-
-  // l2
-  proxyAdmin: 0x0000000000000000000000000000000000000000,
-  fundDevAccounts: true,
-
-  // deploying
-  deploymentWaitConfirmations: 1,
-}
-
-export default config
-- 
2.23.0