Skip to content

chore: Upstream resync/merge, Apr15 #38

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

Draft
wants to merge 42 commits into
base: main
Choose a base branch
from

Conversation

mmontour1306
Copy link

This branch refactors the previous changes made on the 'main' bobanetwork branch.
Commit ethereum-optimism@0cf3f2f on this branch has identical contents to the current head of 'main', ethereum-optimism@fd51e71.

Subsequently the upstream superchain-repository was merged, including commit ethereum-optimism@9dc8a7d which corresponds to their addition of the boba-sepolia chain (upstream PR 962). Manual merging was required here.

Finally, upstream ethereum-optimism@4791054 was merged. "mainnet: Schedule Isthmus hardfork on Mainnet Superchain (ethereum-optimism#972)".

boba.toml file syntax was updated to correspond with the output of 'just apply-hardforks'.

sebastianst and others added 30 commits March 11, 2025 20:01
Co-authored-by: Wazabie <[email protected]>
Co-authored-by: Sam Stokes <[email protected]>
* feat: adding settlus sepolia details

* fix: rename to network

* fix: settlus-sepolia.toml

* sync settlus-sepolia

---------

Co-authored-by: Wazabie <[email protected]>
Co-authored-by: Yann Hodique <[email protected]>
v3.0.0 required a [backport](ethereum-optimism/optimism#14848) to include a fix for broken EIP-2935 preinstall addresses. This requires a new RC to be cut. The L1 contracts are all the same, so no new L1 deployments were performed.
* Update hardfork-activation-inheritance.md

* Update docs/hardfork-activation-inheritance.md

* Update docs/hardfork-activation-inheritance.md

* Update docs/hardfork-activation-inheritance.md
* feat: adds settlus mainnet

* Update settlus-mainnet.toml

* Run codegen

* remove accidental reference to testchain

---------

Co-authored-by: Wazabie <[email protected]>
Co-authored-by: Yann Hodique <[email protected]>
Co-authored-by: Matthew Slipper <[email protected]>
* Update base devnet pectra scheduled time

Update pectra scheduled time for base devnet

* Update date format
* [update]: lisk sepolia timestamps

* [fix]: standardize unix timestamp to human

* [update]: superchain_time

* run just codegen

* update lisk-sepolia to include Isthmus, fix codegen

---------

Co-authored-by: Sebastian Stammler <[email protected]>
adding pectra blob hardfork time

Co-authored-by: Wazabie <[email protected]>
* Add Boba Sepolia

* swap superchain level

* Just sync-staging

* add boba genesis exception

---------

Co-authored-by: cby3149 <[email protected]>
Co-authored-by: Wazabie <[email protected]>
* ops: integrate op-fetcher

* use L1ProxyAdminOwner instead of OpChainProxyAdminOwner

* use cmd/codegen to wrap fetch_onchain and codegen_syncer

* revert .gitignore change

* refactor CodegenSyncer and fix all ops tests

* fetch_onchain: remove unnecessary abstractions

* add tests for new helper functions

* circleci: add daily-codegen-sync job

* UpdateChainList handle new chain addition

* update op-fetcher import: use pointer for FaultProofsStatus

* go mod tidy

* codegen: chain-ids flag is optional comma separated list

* remove unused helper function

* circleci: update check-codegen job

* circleci: fix codegen-sync-all reference

* transform op-fetcher proofs struct to unique chainList struct

* remove 'just codegen' (needs args now)

* circleci: remove daily codegen-sync-all

* rebase and revert unnecessary changes

* simplify zero-address comparison

* pass context from cli handler instead of creating one in helpers

* use uint64 for chainId everywhere except cli handlers

* remove unused FindChainConfig. Add FindChainConfigs tests

* add FS helpers for chainList, CHAINS.md files

* remove hardcoded SuperchainIds map

* remove FindChainConfigs, add Superchain field to DiskChainConfig

* use helper to encapsulate common ChecksummedAddress Unmarshal code

* add paths.EnsureDir helper

* codegen: add optional superchains flag

* mise: add yq (for usage in ci)

* cleanup log messages
…timism#972)

* mainnet: Schedule Isthmus hardfork on Mainnet Superchain

* Fri 9 May 2025 16:00:01 UTC
* unix timestamp 1746806401

* skip superchain.toml in check-codegen cci job
Changes to be committed:
	new file:   superchain/configs/sepolia/boba.toml
	new file:   superchain/extra/genesis/sepolia/boba.json.zst
Changes to be committed:
	new file:   superchain/configs/sepolia-dev-0/boba.toml
	new file:   superchain/extra/genesis/sepolia-dev-0/boba.json.zst
Changes to be committed:
	new file:   superchain/configs/mainnet/boba.toml
	new file:   superchain/extra/genesis/mainnet/boba.json.zst
Changes to be committed:
	new file:   superchain/configs/bnb-testnet/boba.toml
	new file:   superchain/configs/bnb-testnet/superchain.toml
	new file:   superchain/extra/genesis/bnb-testnet/boba.json.zst
Changes to be committed:
	new file:   superchain/extra/bytecodes/0x0bc2e2c871fe2aa803531b38cffaa9c0823c8c279a24efa456301709b75f8c82.bin.gz
	new file:   superchain/extra/bytecodes/0x0bcdfafe860c3ec67eeb98a202f856d549d127d6c9a0fb121a9c0251690ba800.bin.gz
	new file:   superchain/extra/bytecodes/0x1811625c3aa5a72f51b726ae4b699f68af9554d291091d8a70030fd0c31bd549.bin.gz
	new file:   superchain/extra/bytecodes/0x1879aa87141f48c14a6d5007476853ba728e4faf9d93e5b7e48d1f25d00d2269.bin.gz
	new file:   superchain/extra/bytecodes/0x24892414e365e1d7f99d415564075bf2a74170174cb195c96cde5154c2a8b3b4.bin.gz
	new file:   superchain/extra/bytecodes/0x3af83daf213ec8b195ff87cef35a7ad0fe414ffba68f0fbe7da8cfdb5161fbdf.bin.gz
	new file:   superchain/extra/bytecodes/0x4e4511e530894e982004bda420255bb86a4d4cce6a3b7e27916dc3c99c88f16a.bin.gz
	new file:   superchain/extra/bytecodes/0x5b4b51d84d1f4b5bff7e20e96ed0771857d01c15aee81ff1eb34cf75c25e725e.bin.gz
	new file:   superchain/extra/bytecodes/0x610b48f562a6973aceba656fe1e6abd5c6b218a5329e355b69d7d57cb80d838a.bin.gz
	new file:   superchain/extra/bytecodes/0x66d484a78e4c0c450426528b84aef5768ad21dd955f8b158c00e7b297fba4707.bin.gz
	new file:   superchain/extra/bytecodes/0x7a2003c8feeb8c96aff7e39f26631872e873fdf95c45e9e48c07f35f3ecf816a.bin.gz
	new file:   superchain/extra/bytecodes/0x7e195c9304adbc67c8a6f06da0fb05f664ffce6b353d7a23a17593d57138eff1.bin.gz
	new file:   superchain/extra/bytecodes/0x86ca33af6d641d163bac6d1b4872f6d7cb1874c5e90771dc1ca94ce67331948c.bin.gz
	new file:   superchain/extra/bytecodes/0x8c3ec1813298e20399db171b89b881db3566110108bc2d174dbe0eb7ba5d4404.bin.gz
	new file:   superchain/extra/bytecodes/0xa5fe7f0eb09ccc0611964bf1ef0545af5159ba208edef6995be5f5c92e528847.bin.gz
	new file:   superchain/extra/bytecodes/0xa8336a38da5f9408d017f8e46bff2c7c66e3d09120641e4186f58e73e2308f61.bin.gz
	new file:   superchain/extra/bytecodes/0xb9fd81f3f74c2645278859220f986e2f144e1a2afbbed1ba8546673730040432.bin.gz
	new file:   superchain/extra/bytecodes/0xc09ec8b86e654970f4b860f99a7360cdc0cac950049b6fef5f1e061d879c7e67.bin.gz
	new file:   superchain/extra/bytecodes/0xcb43bd7fe2a042abe23add0c9f9583f377503b148f6fe104dd72367535edc471.bin.gz
	new file:   superchain/extra/bytecodes/0xdd43a4370178ca111996b24fff8f8e9190470f14cb5c898279a6848e621ce672.bin.gz
	new file:   superchain/extra/bytecodes/0xe4258d72c62a16df1ba6ce8d9601f6deaa0255d3f720beaa1d60ee772777dd70.bin.gz
	new file:   superchain/extra/bytecodes/0xe5644a33f48c649b42e1a47c61a76a83b6c55a172e1f918f7a79d32aefd2bca6.bin.gz
	new file:   superchain/extra/bytecodes/0xeae2900c19f2caa8b033d2e4296602dc54bbdb498869584fd6d8e5211fd915cb.bin.gz
	new file:   superchain/extra/bytecodes/0xebdb1d50766033cf9e1f3853f8328f2b6f982d8520de06a617b569c3d24b321c.bin.gz
	new file:   superchain/extra/bytecodes/0xec34f562e48900495d4714c9186e5c0ae122cf689395e1433fb1a3432c2183ac.bin.gz
	new file:   superchain/extra/bytecodes/0xf6306497aa772cdc53e329b14f2f72344ce61d05504a8314952811a3528ee18d.bin.gz
	new file:   superchain/extra/bytecodes/0xf702d3184d19f6f4cfb2aedbf02490ef477cbe0f36186b64ba00d8fd6acf0951.bin.gz
	new file:   superchain/extra/bytecodes/0xfa0c81fb80cadd11a6f7e444f98a9b7a3baaad03a97788cd0a75fd6b0dee56b6.bin.gz
	new file:   superchain/extra/bytecodes/0xfab90d3a32b245623bee66d280f816968575ddcdef1f69452a0beeba519b190b.bin.gz
Changes to be committed:
	new file:   superchain/extra/addresses/bnb-testnet/boba.json
	new file:   superchain/extra/addresses/mainnet/boba.json
	new file:   superchain/extra/addresses/sepolia/boba.json
	new file:   superchain/extra/genesis-system-configs/bnb-testnet/boba.json
	new file:   superchain/extra/genesis-system-configs/mainnet/boba.json
	new file:   superchain/extra/genesis-system-configs/sepolia/boba.json
Changes to be committed:
	modified:   chainList.json
	modified:   chainList.toml
	modified:   superchain/extra/addresses/addresses.json
Conflicts:
	superchain/configs/sepolia/boba.toml
	superchain/extra/addresses/addresses.json
	superchain/extra/genesis/sepolia/boba.json.zst
Schedule Isthmus hardfork on OP Mainnet Superchain (upstream ethereum-optimism#972)
Changes to be committed:
	modified:   superchain/extra/genesis/bnb-testnet/boba.json.zst
	modified:   superchain/extra/genesis/mainnet/boba.json.zst
	modified:   superchain/extra/genesis/sepolia-dev-0/boba.json.zst
	modified:   superchain/extra/genesis/sepolia/boba.json.zst
NOTE - this is only to support the Boba bnb-testnet deployment
Changes to be committed:
	modified:   superchain/configs/mainnet/boba.toml
	modified:   superchain/configs/sepolia-dev-0/boba.toml
NOTE - I have preserved the non-zero "regolith_time" fields although
this field is removed when running "just apply-hardforks".

Changes to be committed:
	modified:   superchain/configs/mainnet/boba.toml
	modified:   superchain/configs/sepolia-dev-0/boba.toml
	modified:   superchain/configs/sepolia/boba.toml
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.