Skip to content

Use OptimismPortal.FINALIZATION_PERIOD_SECONDS if L2OutputOracle.version is '1.0.0'. #5277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 7 commits into from
Mar 28, 2023
Merged

Use OptimismPortal.FINALIZATION_PERIOD_SECONDS if L2OutputOracle.version is '1.0.0'. #5277

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb6d28b
Merge pull request #5174 from ethereum-optimism/develop
mslipper Mar 16, 2023
9ebc06b
Use OptimismPortal.FINALIZATION_PERIOD_SECONDS if L2OutputOracle.vers…
zchn Mar 28, 2023
5b3494a
Clean up comments in getChallengePeriodSeconds.
zchn Mar 28, 2023
4e78460
Remove a TODO as it is obvious.
zchn Mar 28, 2023
77e331e
Use camelCase for variables and add more comments.
zchn Mar 28, 2023
6dce5b4
Fix typo in comments.
zchn Mar 28, 2023
f434f6e
Merge branch 'develop' into k0328/sec-42-dynamic-abi
mergify[bot] Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/sdk/src/cross-chain-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down