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

[Isthmus] Add missing Isthmus activation time updates #13549

Closed
wants to merge 1 commit into from

Conversation

mdehoog
Copy link
Contributor

@mdehoog mdehoog commented Jan 2, 2025

Description

As I was implementing #13539, I came across a bunch of what appears to be missing Isthmus updates. This PR adds:

  • Some missing L2GenesisIsthmusTimeOffset / IsthmusTime sets
  • Copies the new WithdrawalsRoot engine API value
  • Generalizes the DeployConfig => genesis SystemConfig conversion (there were two duplicate implementations).

Tests

No new tests added. Adding the Isthmus activation before the Interop activation means the Isthmus code is now being tested by the interop tests (which is what showed up the missing WithdrawalsRoot sets).

We may want to add OP_E2E_USE_ISTHMUS to the E2E environmment?

Copy link

codecov bot commented Jan 2, 2025

Codecov Report

Attention: Patch coverage is 57.81250% with 27 lines in your changes missing coverage. Please review.

Project coverage is 47.13%. Comparing base (2fb8c66) to head (72a0379).
Report is 183 commits behind head on develop.

Files with missing lines Patch % Lines
op-service/eth/types.go 0.00% 17 Missing ⚠️
op-chain-ops/genesis/config.go 0.00% 9 Missing ⚠️
op-node/rollup/superchain.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #13549      +/-   ##
===========================================
- Coverage    47.25%   47.13%   -0.13%     
===========================================
  Files          958      958              
  Lines        80075    80082       +7     
  Branches       773      773              
===========================================
- Hits         37836    37743      -93     
- Misses       39335    39449     +114     
+ Partials      2904     2890      -14     
Flag Coverage Δ
cannon-go-tests-32 62.26% <ø> (-1.98%) ⬇️
cannon-go-tests-64 57.35% <ø> (-1.62%) ⬇️
contracts-bedrock-tests 90.57% <ø> (-0.20%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
op-chain-ops/interopgen/recipe.go 74.80% <100.00%> (+0.10%) ⬆️
op-program/client/l2/engineapi/l2_engine_api.go 33.69% <100.00%> (+0.18%) ⬆️
op-service/sources/types.go 66.25% <100.00%> (+0.21%) ⬆️
op-node/rollup/superchain.go 0.00% <0.00%> (ø)
op-chain-ops/genesis/config.go 32.77% <0.00%> (-0.13%) ⬇️
op-service/eth/types.go 30.62% <0.00%> (-0.12%) ⬇️

... and 24 files with indirect coverage changes

@mdehoog mdehoog force-pushed the michael/isthmus-updates branch from dcb376f to ec0418f Compare January 2, 2025 02:18
@mdehoog mdehoog marked this pull request as ready for review January 2, 2025 02:32
@mdehoog mdehoog requested review from a team as code owners January 2, 2025 02:32
@mdehoog mdehoog changed the title [Isthmus] Add missing Isthmus activation time fixes [Isthmus] Add missing Isthmus activation time updates Jan 2, 2025
@@ -252,7 +252,7 @@ require (
rsc.io/tmplfunc v0.0.3 // indirect
)

replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.5-rc.1
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.5-rc.1.0.20241219170731-928070c7fc09
Copy link
Contributor Author

Choose a reason for hiding this comment

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

pulls in this fix: ethereum-optimism/op-geth@928070c, which is not part of a release yet

@tynes
Copy link
Contributor

tynes commented Jan 2, 2025

cc @vdamle

@vdamle
Copy link
Contributor

vdamle commented Jan 3, 2025

@mdehoog I see I missed a few of the timestamp activation fields in #12847 , thanks for adding these!

For the addition of withdrawalsRoot fields to the structs, i've got those changes in #12848 -- that PR will likely take longer to review, so I'm happy to rebase these changes assuming this one lands first.

@tynes
Copy link
Contributor

tynes commented Jan 9, 2025

Thank you for this, working towards merging this

@tynes
Copy link
Contributor

tynes commented Jan 13, 2025

Ideally we can merge ethereum-optimism/op-geth#452, cut an rc and then rebase on top of that

@tynes
Copy link
Contributor

tynes commented Jan 31, 2025

Closing this, was cherry picked into another PR

@tynes tynes closed this Jan 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants