devnet: increase block times (ethereum-optimism#50)

* devnet: increase block times * proposer: bump network timeout * proposer timeout: 5 -> 5s * proposer: tweak timeout to 180s * fix: ymlup --------- Co-authored-by: joshcs.eth <[email protected]>
teddyknox · May 19, 2023 · 5b663de · 5b663de
1 parent e71c751
commit 5b663de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ops-bedrock/devnet-up.sh b/ops-bedrock/devnet-up.sh
@@ -83,7 +83,7 @@ fi
   cd ops-bedrock
   echo "Bringing up L1..."
   DOCKER_BUILDKIT=1 docker-compose -f docker-compose-devnet.yml build --progress plain
-  docker-compose -f docker-compose-devnet.ymlup -d l1
+  docker-compose -f docker-compose-devnet.yml up -d l1
   wait_up $L1_URL
 )
 

diff --git a/ops-bedrock/docker-compose-testnet.yml b/ops-bedrock/docker-compose-testnet.yml
@@ -125,6 +125,7 @@ services:
       OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
       OP_PROPOSER_NAMESPACE_ID: "e8e5f679bf7116cb"
       OP_PROPOSER_DA_RPC: http://da:26659
+      OP_PROPOSER_NETWORK_TIMEOUT: 180s
 
   op-batcher:
     depends_on:

diff --git a/packages/contracts-bedrock/deploy-config/devnetL1.json b/packages/contracts-bedrock/deploy-config/devnetL1.json
@@ -2,18 +2,18 @@
   "l1ChainID": 900,
   "l2ChainID": 901,
   "l2BlockTime": 2,
-  "maxSequencerDrift": 300,
-  "sequencerWindowSize": 200,
-  "channelTimeout": 120,
+  "maxSequencerDrift": 600,
+  "sequencerWindowSize": 3600,
+  "channelTimeout": 300,
   "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
   "batchInboxAddress": "0xff00000000000000000000000000000000000000",
   "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-  "l2OutputOracleSubmissionInterval": 20,
+  "l2OutputOracleSubmissionInterval": 120,
   "l2OutputOracleStartingTimestamp": -1,
   "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
   "l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
   "l2GenesisBlockGasLimit": "0x1c9c380",
-  "l1BlockTime": 3,
+  "l1BlockTime": 15,
   "cliqueSignerAddress": "0xca062b0fd91172d89bcd4bb084ac4e21972cc467",
   "baseFeeVaultRecipient": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "l1FeeVaultRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
@@ -22,7 +22,7 @@
   "finalSystemOwner": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "portalGuardian": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "controller": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-  "finalizationPeriodSeconds": 2,
+  "finalizationPeriodSeconds": 12,
   "deploymentWaitConfirmations": 1,
   "fundDevAccounts": true,
   "l2GenesisBlockBaseFeePerGas": "0x3B9ACA00",