diff --git a/packages/contracts-bedrock/deploy-config/hardhat.json b/packages/contracts-bedrock/deploy-config/hardhat.json
index 4f28dcbcc0..30a89a4ff4 100644
--- a/packages/contracts-bedrock/deploy-config/hardhat.json
+++ b/packages/contracts-bedrock/deploy-config/hardhat.json
@@ -1,66 +1,66 @@
 {
-    "finalSystemOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "superchainConfigGuardian": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "proxyAdminOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "l1StartingBlockTag": "earliest",
-    "l1ChainID": 900,
-    "l2ChainID": 901,
-    "l2BlockTime": 2,
-    "l1BlockTime": 12,
-    "maxSequencerDrift": 300,
-    "sequencerWindowSize": 15,
-    "channelTimeout": 40,
-    "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "batchInboxAddress": "0xff00000000000000000000000000000000000000",
-    "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-    "l2OutputOracleSubmissionInterval": 6,
-    "l2OutputOracleStartingTimestamp": 1,
-    "l2OutputOracleStartingBlockNumber": 1,
-    "gasPriceOracleBaseFeeScalar": 1368,
-    "gasPriceOracleBlobBaseFeeScalar": 810949,
-    "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "l2OutputOracleChallenger": "0x6925B8704Ff96DEe942623d6FB5e946EF5884b63",
-    "l2GenesisBlockBaseFeePerGas": "0x3B9ACA00",
-    "l2GenesisBlockGasLimit": "0x17D7840",
-    "baseFeeVaultRecipient": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "l1FeeVaultRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-    "sequencerFeeVaultRecipient": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a",
-    "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "baseFeeVaultWithdrawalNetwork": 0,
-    "l1FeeVaultWithdrawalNetwork": 0,
-    "sequencerFeeVaultWithdrawalNetwork": 0,
-    "enableGovernance": true,
-    "governanceTokenName": "Optimism",
-    "governanceTokenSymbol": "OP",
-    "governanceTokenOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "finalizationPeriodSeconds": 36,
-    "eip1559Denominator": 50,
-    "eip1559DenominatorCanyon": 250,
-    "eip1559Elasticity": 10,
-    "l2GenesisRegolithTimeOffset": "0x0",
-    "systemConfigStartBlock": 0,
-    "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "faultGameMaxDepth": 8,
-    "faultGameClockExtension": 0,
-    "faultGameMaxClockDuration": 1200,
-    "faultGameGenesisBlock": 0,
-    "faultGameGenesisOutputRoot": "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
-    "faultGameSplitDepth": 4,
-    "faultGameWithdrawalDelay": 604800,
-    "preimageOracleMinProposalSize": 10000,
-    "preimageOracleChallengePeriod": 120,
-    "proofMaturityDelaySeconds": 12,
-    "disputeGameFinalityDelaySeconds": 6,
-    "respectedGameType": 0,
-    "useFaultProofs": false,
-    "fundDevAccounts": true,
-    "usePlasma": false,
-    "daChallengeWindow": 100,
-    "daResolveWindow": 100,
-    "daBondSize": 1000,
-    "daResolverRefundPercentage": 50
-  }
+  "finalSystemOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "superchainConfigGuardian": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "proxyAdminOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "l1StartingBlockTag": "earliest",
+  "l1ChainID": 900,
+  "l2ChainID": 901,
+  "l2BlockTime": 2,
+  "l1BlockTime": 12,
+  "maxSequencerDrift": 300,
+  "sequencerWindowSize": 15,
+  "channelTimeout": 40,
+  "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "batchInboxAddress": "0xff00000000000000000000000000000000000000",
+  "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
+  "l2OutputOracleSubmissionInterval": 6,
+  "l2OutputOracleStartingTimestamp": 1,
+  "l2OutputOracleStartingBlockNumber": 1,
+  "gasPriceOracleBaseFeeScalar": 1368,
+  "gasPriceOracleBlobBaseFeeScalar": 810949,
+  "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+  "l2OutputOracleChallenger": "0x6925B8704Ff96DEe942623d6FB5e946EF5884b63",
+  "l2GenesisBlockBaseFeePerGas": "0x3B9ACA00",
+  "l2GenesisBlockGasLimit": "0x17D7840",
+  "baseFeeVaultRecipient": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "l1FeeVaultRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
+  "sequencerFeeVaultRecipient": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a",
+  "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "baseFeeVaultWithdrawalNetwork": 0,
+  "l1FeeVaultWithdrawalNetwork": 0,
+  "sequencerFeeVaultWithdrawalNetwork": 0,
+  "enableGovernance": true,
+  "governanceTokenName": "Optimism",
+  "governanceTokenSymbol": "OP",
+  "governanceTokenOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "finalizationPeriodSeconds": 36,
+  "eip1559Denominator": 50,
+  "eip1559DenominatorCanyon": 250,
+  "eip1559Elasticity": 10,
+  "l2GenesisRegolithTimeOffset": "0x0",
+  "systemConfigStartBlock": 0,
+  "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "faultGameMaxDepth": 8,
+  "faultGameClockExtension": 0,
+  "faultGameMaxClockDuration": 1200,
+  "faultGameGenesisBlock": 0,
+  "faultGameGenesisOutputRoot": "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
+  "faultGameSplitDepth": 4,
+  "faultGameWithdrawalDelay": 604800,
+  "preimageOracleMinProposalSize": 10000,
+  "preimageOracleChallengePeriod": 120,
+  "proofMaturityDelaySeconds": 12,
+  "disputeGameFinalityDelaySeconds": 6,
+  "respectedGameType": 0,
+  "useFaultProofs": false,
+  "fundDevAccounts": true,
+  "usePlasma": false,
+  "daChallengeWindow": 100,
+  "daResolveWindow": 100,
+  "daBondSize": 1000,
+  "daResolverRefundPercentage": 50
+}
diff --git a/packages/contracts-bedrock/deploy-config/mainnet.json b/packages/contracts-bedrock/deploy-config/mainnet.json
index b403224230..7331bfce77 100644
--- a/packages/contracts-bedrock/deploy-config/mainnet.json
+++ b/packages/contracts-bedrock/deploy-config/mainnet.json
@@ -1,59 +1,59 @@
 {
-    "finalSystemOwner": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
-    "superchainConfigGuardian": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
-    "l1StartingBlockTag": "0x438335a20d98863a4c0c97999eb2481921ccd28553eac6f913af7c12aec04108",
-    "l1ChainID": 1,
-    "l2ChainID": 10,
-    "l2BlockTime": 2,
-    "l1BlockTime": 12,
-    "maxSequencerDrift": 600,
-    "sequencerWindowSize": 3600,
-    "channelTimeout": 300,
-    "p2pSequencerAddress": "0xAAAA45d9549EDA09E70937013520214382Ffc4A2",
-    "batchInboxAddress": "0xff00000000000000000000000000000000000010",
-    "batchSenderAddress": "0x6887246668a3b87F54DeB3b94Ba47a6f63F32985",
-    "l2OutputOracleSubmissionInterval": 1800,
-    "l2OutputOracleStartingTimestamp": 1686068903,
-    "l2OutputOracleStartingBlockNumber": 105235063,
-    "l2OutputOracleProposer": "0x473300df21D047806A082244b417f96b32f13A33",
-    "l2OutputOracleChallenger": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
-    "finalizationPeriodSeconds": 604800,
-    "proxyAdminOwner": "0x7871d1187A97cbbE40710aC119AA3d412944e4Fe",
-    "baseFeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
-    "l1FeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
-    "sequencerFeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
-    "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "baseFeeVaultWithdrawalNetwork": 0,
-    "l1FeeVaultWithdrawalNetwork": 0,
-    "sequencerFeeVaultWithdrawalNetwork": 0,
-    "enableGovernance": true,
-    "governanceTokenName": "Optimism",
-    "governanceTokenSymbol": "OP",
-    "governanceTokenOwner": "0x5C4e7Ba1E219E47948e6e3F55019A647bA501005",
-    "l2GenesisBlockGasLimit": "0x1c9c380",
-    "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
-    "gasPriceOracleBaseFeeScalar": 1368,
-    "gasPriceOracleBlobBaseFeeScalar": 810949,
-    "eip1559Denominator": 50,
-    "eip1559Elasticity": 6,
-    "l2GenesisRegolithTimeOffset": "0x0",
-    "systemConfigStartBlock": 17422444,
-    "requiredProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000",
-    "recommendedProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000",
-    "faultGameAbsolutePrestate": "0x03617abec0b255dc7fc7a0513a2c2220140a1dcd7a1c8eca567659bd67e05cea",
-    "faultGameMaxDepth": 73,
-    "faultGameClockExtension": 10800,
-    "faultGameMaxClockDuration": 302400,
-    "faultGameGenesisBlock": 120059863,
-    "faultGameGenesisOutputRoot": "0x2694ac14dcf54b7a77363e3f60e6462dc78da0d43d1e2f058dbb6a1488814977",
-    "faultGameSplitDepth": 30,
-    "faultGameWithdrawalDelay": 604800,
-    "preimageOracleMinProposalSize": 126000,
-    "preimageOracleChallengePeriod": 86400,
-    "proofMaturityDelaySeconds": 604800,
-    "disputeGameFinalityDelaySeconds": 302400,
-    "respectedGameType": 0,
-    "useFaultProofs": true
-  }
+  "finalSystemOwner": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
+  "superchainConfigGuardian": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
+  "l1StartingBlockTag": "0x438335a20d98863a4c0c97999eb2481921ccd28553eac6f913af7c12aec04108",
+  "l1ChainID": 1,
+  "l2ChainID": 10,
+  "l2BlockTime": 2,
+  "l1BlockTime": 12,
+  "maxSequencerDrift": 600,
+  "sequencerWindowSize": 3600,
+  "channelTimeout": 300,
+  "p2pSequencerAddress": "0xAAAA45d9549EDA09E70937013520214382Ffc4A2",
+  "batchInboxAddress": "0xff00000000000000000000000000000000000010",
+  "batchSenderAddress": "0x6887246668a3b87F54DeB3b94Ba47a6f63F32985",
+  "l2OutputOracleSubmissionInterval": 1800,
+  "l2OutputOracleStartingTimestamp": 1686068903,
+  "l2OutputOracleStartingBlockNumber": 105235063,
+  "l2OutputOracleProposer": "0x473300df21D047806A082244b417f96b32f13A33",
+  "l2OutputOracleChallenger": "0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A",
+  "finalizationPeriodSeconds": 604800,
+  "proxyAdminOwner": "0x7871d1187A97cbbE40710aC119AA3d412944e4Fe",
+  "baseFeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
+  "l1FeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
+  "sequencerFeeVaultRecipient": "0xa3d596EAfaB6B13Ab18D40FaE1A962700C84ADEa",
+  "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+  "baseFeeVaultWithdrawalNetwork": 0,
+  "l1FeeVaultWithdrawalNetwork": 0,
+  "sequencerFeeVaultWithdrawalNetwork": 0,
+  "enableGovernance": true,
+  "governanceTokenName": "Optimism",
+  "governanceTokenSymbol": "OP",
+  "governanceTokenOwner": "0x5C4e7Ba1E219E47948e6e3F55019A647bA501005",
+  "l2GenesisBlockGasLimit": "0x1c9c380",
+  "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
+  "gasPriceOracleBaseFeeScalar": 1368,
+  "gasPriceOracleBlobBaseFeeScalar": 810949,
+  "eip1559Denominator": 50,
+  "eip1559Elasticity": 6,
+  "l2GenesisRegolithTimeOffset": "0x0",
+  "systemConfigStartBlock": 17422444,
+  "requiredProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000",
+  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000",
+  "faultGameAbsolutePrestate": "0x03617abec0b255dc7fc7a0513a2c2220140a1dcd7a1c8eca567659bd67e05cea",
+  "faultGameMaxDepth": 73,
+  "faultGameClockExtension": 10800,
+  "faultGameMaxClockDuration": 302400,
+  "faultGameGenesisBlock": 120059863,
+  "faultGameGenesisOutputRoot": "0x2694ac14dcf54b7a77363e3f60e6462dc78da0d43d1e2f058dbb6a1488814977",
+  "faultGameSplitDepth": 30,
+  "faultGameWithdrawalDelay": 604800,
+  "preimageOracleMinProposalSize": 126000,
+  "preimageOracleChallengePeriod": 86400,
+  "proofMaturityDelaySeconds": 604800,
+  "disputeGameFinalityDelaySeconds": 302400,
+  "respectedGameType": 0,
+  "useFaultProofs": true
+}
diff --git a/packages/contracts-bedrock/deploy-config/zk-hardhat.json b/packages/contracts-bedrock/deploy-config/zk-hardhat.json
deleted file mode 100644
index e6e7b943b6..0000000000
--- a/packages/contracts-bedrock/deploy-config/zk-hardhat.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "finalSystemOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "superchainConfigGuardian": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "proxyAdminOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "l1StartingBlockTag": "earliest",
-    "l1ChainID": 900,
-    "l2ChainID": 901,
-    "l2BlockTime": 2,
-    "l1BlockTime": 12,
-    "maxSequencerDrift": 300,
-    "sequencerWindowSize": 15,
-    "channelTimeout": 40,
-    "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "batchInboxAddress": "0xff00000000000000000000000000000000000000",
-    "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-    "l2OutputOracleSubmissionInterval": 1800,
-    "l2OutputOracleStartingTimestamp": 1,
-    "l2OutputOracleStartingBlockNumber": 1,
-    "gasPriceOracleBaseFeeScalar": 1368,
-    "gasPriceOracleBlobBaseFeeScalar": 810949,
-    "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "l2OutputOracleChallenger": "0x6925B8704Ff96DEe942623d6FB5e946EF5884b63",
-    "l2GenesisBlockBaseFeePerGas": "0x3B9ACA00",
-    "l2GenesisBlockGasLimit": "0x17D7840",
-    "baseFeeVaultRecipient": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "l1FeeVaultRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-    "sequencerFeeVaultRecipient": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a",
-    "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
-    "baseFeeVaultWithdrawalNetwork": 0,
-    "l1FeeVaultWithdrawalNetwork": 0,
-    "sequencerFeeVaultWithdrawalNetwork": 0,
-    "enableGovernance": true,
-    "governanceTokenName": "Optimism",
-    "governanceTokenSymbol": "OP",
-    "governanceTokenOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "finalizationPeriodSeconds": 0,
-    "eip1559Denominator": 50,
-    "eip1559DenominatorCanyon": 250,
-    "eip1559Elasticity": 10,
-    "l2GenesisRegolithTimeOffset": "0x0",
-    "systemConfigStartBlock": 0,
-    "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "faultGameMaxDepth": 8,
-    "faultGameClockExtension": 0,
-    "faultGameMaxClockDuration": 1200,
-    "faultGameGenesisBlock": 0,
-    "faultGameGenesisOutputRoot": "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
-    "faultGameSplitDepth": 4,
-    "faultGameWithdrawalDelay": 604800,
-    "preimageOracleMinProposalSize": 10000,
-    "preimageOracleChallengePeriod": 120,
-    "proofMaturityDelaySeconds": 12,
-    "disputeGameFinalityDelaySeconds": 6,
-    "respectedGameType": 0,
-    "useFaultProofs": false,
-    "fundDevAccounts": true,
-    "usePlasma": false,
-    "daChallengeWindow": 100,
-    "daResolveWindow": 100,
-    "daBondSize": 1000,
-    "daResolverRefundPercentage": 50
-  }