Skip to content

Make OuputOracle upgradeable#2826

Merged
mergify[bot] merged 11 commits intodevelopfrom
m/oracle-upgradeable
Jun 23, 2022
Merged

Make OuputOracle upgradeable#2826
mergify[bot] merged 11 commits intodevelopfrom
m/oracle-upgradeable

Conversation

@maurelian
Copy link
Copy Markdown
Contributor

@maurelian maurelian commented Jun 20, 2022

Description

This PR is being opened as a draft, mostly because it builds on #2810.

It applies to the Oracle the same upgradability approach as #2825.

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 20, 2022 •
edited
Loading

🦋 Changeset detected

Latest commit: c328952

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@eth-optimism/contracts-bedrock Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@maurelian maurelian force-pushed the m/oracle-upgradeable branch 3 times, most recently from 412bbd8 to f005bdd Compare June 22, 2022 20:40
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 22, 2022

Hey @maurelian! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the conflict label Jun 22, 2022
@tynes
Copy link
Copy Markdown
Contributor

tynes commented Jun 22, 2022

This is going to need a rebase now

@maurelian maurelian force-pushed the m/oracle-upgradeable branch from f005bdd to ee6cf84 Compare June 22, 2022 22:18
@mergify mergify bot removed the conflict label Jun 22, 2022
@maurelian maurelian marked this pull request as ready for review June 22, 2022 22:40
tynes
tynes reviewed Jun 22, 2022
View reviewed changes
@tynes
Copy link
Copy Markdown
Contributor

tynes commented Jun 22, 2022

CI is being weird and not running again, has been happening a lot today

@tynes
Copy link
Copy Markdown
Contributor

tynes commented Jun 23, 2022

Its expected that the bedrock tests fail as the storage layout changes

@tynes
Copy link
Copy Markdown
Contributor

tynes commented Jun 23, 2022 •
edited
Loading

This can be done in a follow up PR, but this will need to be updated to use upgradeToAndCall with a call to initialize:

optimism/packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts

Line 49 in 700dcbb

const tx = await Proxy.upgradeTo(oracle.address)

example:

optimism/packages/contracts-bedrock/deploy/003-L1StandardBridge.ts

Lines 37 to 42 in 700dcbb

const upgradeTx = await Proxy.upgradeToAndCall(
bridge.address,
L1StandardBridge.interface.encodeFunctionData('initialize(address)', [
messenger.address,
])
)

@tynes tynes force-pushed the m/oracle-upgradeable branch from 3c78003 to af7b76b Compare June 23, 2022 02:07
@maurelian maurelian force-pushed the m/oracle-upgradeable branch 2 times, most recently from c08c4d4 to 9906da0 Compare June 23, 2022 02:22
@maurelian maurelian force-pushed the m/oracle-upgradeable branch from 9906da0 to af7b76b Compare June 23, 2022 02:31
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 23, 2022

This PR has been added to the merge queue, and will be merged soon.

@mergify mergify bot merged commit ddf515c into develop Jun 23, 2022
@mergify mergify bot deleted the m/oracle-upgradeable branch June 23, 2022 03:37
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 23, 2022

This PR is next in line to be merged, and will be merged as soon as checks pass.

@mergify mergify bot removed the on-merge-train label Jun 23, 2022
theochap pushed a commit that referenced this pull request Dec 10, 2025
@dhyaniarun1993
chore(ci): fix supervisor sysgo test path (#2826)
0ff8bf9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tynes tynes tynes approved these changes

+1 more reviewer

@mslipper mslipper mslipper approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@maurelian @tynes @mslipper