Merge branch 'develop' into feat/fee-vault-withdrawal-script

packages/sdk/src/cross-chain-messenger.ts

@@ -1003,9 +1003,19 @@ export class CrossChainMessenger {
    * @returns Current challenge period in seconds.
    */
   public async getChallengePeriodSeconds(): Promise<number> {
-    const challengePeriod = this.bedrock
-      ? await this.contracts.l1.L2OutputOracle.FINALIZATION_PERIOD_SECONDS()
-      : await this.contracts.l1.StateCommitmentChain.FRAUD_PROOF_WINDOW()
+    if (!this.bedrock) {
+      return (await this.contracts.l1.StateCommitmentChain.FRAUD_PROOF_WINDOW()).toNumber()
+    }
+
+    const oracleVersion = await this.contracts.l1.L2OutputOracle.version()
+    const challengePeriod = oracleVersion === '1.0.0'
+      // The ABI in the SDK does not contain FINALIZATION_PERIOD_SECONDS
+      // in OptimismPortal, so making an explicit call instead.
+      ? BigNumber.from(await this.contracts.l1.OptimismPortal.provider.call({
+        to: this.contracts.l1.OptimismPortal.address,
+        data: '0xf4daa291' // FINALIZATION_PERIOD_SECONDS
+      }))
+      : await this.contracts.l1.L2OutputOracle.FINALIZATION_PERIOD_SECONDS()
     return challengePeriod.toNumber()
   }