Merge branch 'develop' into refcell/fix/channelo

.changeset/clever-jokes-notice.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Reduce the time that the system dictator deploy scripts wait before checking the chain state.

packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts

@@ -109,7 +109,7 @@ const deployFn: DeployFunction = async (hre) => {
         const owner = await AddressManager.owner()
         return owner === SystemDictator.address
       },
-      30000,
+      5000,
       1000
     )
   } else {
@@ -149,7 +149,7 @@ const deployFn: DeployFunction = async (hre) => {
         })
         return owner === SystemDictator.address
       },
-      30000,
+      5000,
       1000
     )
   } else {
@@ -187,7 +187,7 @@ const deployFn: DeployFunction = async (hre) => {
         })
         return owner === SystemDictator.address
       },
-      30000,
+      5000,
       1000
     )
   } else {

packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts

@@ -203,7 +203,7 @@ const deployFn: DeployFunction = async (hre) => {
       async () => {
         return SystemDictator.dynamicConfigSet()
       },
-      30000,
+      5000,
       1000
     )
   }
@@ -316,7 +316,7 @@ const deployFn: DeployFunction = async (hre) => {
         const paused = await OptimismPortal.paused()
         return !paused
       },
-      30000,
+      5000,
       1000
     )
 
@@ -345,7 +345,7 @@ const deployFn: DeployFunction = async (hre) => {
       async () => {
         return SystemDictator.finalized()
       },
-      30000,
+      5000,
       1000
     )