Skip to content
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.

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

feat(op-reth): Canyon transition create2Deployer force deployment #5527

Merged
merged 18 commits into from
Nov 27, 2023

Conversation

clabby
Copy link
Collaborator

@clabby clabby commented Nov 22, 2023

Overview

Note: This is the fourth PR in the Canyon HF stack. Precedence:
#5527
-> #5526
--> #5504
---> #5503
----> main

Adds a force deployment of the create2deployer contract in the superchain registry upon the Canyon transition.

Reference: https://github.com/ethereum-optimism/op-geth/blob/cf19c1e39c326a806df1096c45e3f2fbcd5ca00c/consensus/misc/create2deployer.go

@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch 4 times, most recently from 0535c78 to a77682d Compare November 22, 2023 03:04
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 467b722 to 1f8252d Compare November 23, 2023 02:25
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from a77682d to 1797497 Compare November 23, 2023 02:25
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 1f8252d to 4149bb2 Compare November 23, 2023 02:26
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 1797497 to 062e6dc Compare November 23, 2023 02:26
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 4149bb2 to 13b7346 Compare November 23, 2023 16:00
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 062e6dc to bc8ecc9 Compare November 23, 2023 16:01
@clabby clabby added the A-op-reth Related to Optimism and op-reth label Nov 23, 2023
crates/revm/src/optimism/mod.rs Outdated Show resolved Hide resolved
Comment on lines +72 to +77
super::ensure_create2_deployer(self.chain_spec().clone(), block.timestamp, self.db_mut())
.map_err(|_| BlockExecutionError::ProviderError)?;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the fork block ends up being empty, than the create2 deployer will never be committed because of an early return few lines above

Copy link
Collaborator Author

@clabby clabby Nov 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thankfully this should never be possible :)

Optimism blocks will always have at least one transaction, which is the L1 info transaction sent by the system. Added a clarifying comment.

@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from bc8ecc9 to fd40cc7 Compare November 23, 2023 23:34
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch 2 times, most recently from 21cf8be to f8ba976 Compare November 23, 2023 23:44
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from fd40cc7 to 2967963 Compare November 23, 2023 23:44
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from f8ba976 to 8efaf95 Compare November 24, 2023 00:24
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 2967963 to 9c4f473 Compare November 24, 2023 00:25
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 8efaf95 to 1ace0ff Compare November 24, 2023 00:49
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 9c4f473 to 430a6e4 Compare November 24, 2023 00:49
@clabby clabby marked this pull request as ready for review November 24, 2023 00:55
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 1ace0ff to 0b88100 Compare November 24, 2023 01:01
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 430a6e4 to dbcc15c Compare November 24, 2023 01:01
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from c92ad68 to 7c53455 Compare November 24, 2023 15:49
@clabby clabby force-pushed the cl/op/canyon-hf-receipts-version branch from 26a7455 to 7cef5ee Compare November 26, 2023 18:55
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 7c53455 to 8c30c41 Compare November 26, 2023 18:55
@clabby clabby force-pushed the cl/op/canyon-hf-create2-deployer branch from 8c30c41 to 99aadf1 Compare November 27, 2023 16:40
Base automatically changed from cl/op/canyon-hf-receipts-version to main November 27, 2023 17:07
@mattsse mattsse merged commit cda471c into main Nov 27, 2023
23 checks passed
@mattsse mattsse deleted the cl/op/canyon-hf-create2-deployer branch November 27, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-op-reth Related to Optimism and op-reth
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants