Commit e9a85759 authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub

Merge branch 'develop' into aj/report-hive-tests

parents a1371125 865a7ab0
...@@ -409,7 +409,7 @@ export class CrossChainMessenger { ...@@ -409,7 +409,7 @@ export class CrossChainMessenger {
updated.message updated.message
) )
// EVERYTHING following here is basically repeating the logic from getMessagesByTransaction // EVERYTHING following here is basically repeating the logic from getMessagesByTransaction
// consider cleaning this up // consider cleaning this up
// We need to figure out the final withdrawal data that was used to compute the withdrawal hash // We need to figure out the final withdrawal data that was used to compute the withdrawal hash
// inside the L2ToL1Message passer contract. Exact mechanism here depends on whether or not // inside the L2ToL1Message passer contract. Exact mechanism here depends on whether or not
...@@ -1100,13 +1100,13 @@ export class CrossChainMessenger { ...@@ -1100,13 +1100,13 @@ export class CrossChainMessenger {
const challengePeriod = const challengePeriod =
oracleVersion === '1.0.0' oracleVersion === '1.0.0'
? // The ABI in the SDK does not contain FINALIZATION_PERIOD_SECONDS ? // The ABI in the SDK does not contain FINALIZATION_PERIOD_SECONDS
// in OptimismPortal, so making an explicit call instead. // in OptimismPortal, so making an explicit call instead.
BigNumber.from( BigNumber.from(
await this.contracts.l1.OptimismPortal.provider.call({ await this.contracts.l1.OptimismPortal.provider.call({
to: this.contracts.l1.OptimismPortal.address, to: this.contracts.l1.OptimismPortal.address,
data: '0xf4daa291', // FINALIZATION_PERIOD_SECONDS data: '0xf4daa291', // FINALIZATION_PERIOD_SECONDS
}) })
) )
: await this.contracts.l1.L2OutputOracle.FINALIZATION_PERIOD_SECONDS() : await this.contracts.l1.L2OutputOracle.FINALIZATION_PERIOD_SECONDS()
return challengePeriod.toNumber() return challengePeriod.toNumber()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment