Preview celo rebase 16 #411

piersy · 2026-02-10T18:41:08Z

This is a preview of the optimism rebase.

The memory-all ci workflow still has some failing tests: https://github.com/celo-org/celo-blockchain-planning/issues/1339

Adding funding.json file required to apply for retropgf

github: use step-security replacement for tj-actions/changed-files

@sha256

* Add script to update `celo-org/op-geth` dependencies Signed-off-by: Maximilian Langenfeld <[email protected]> * Add github action for update-geth script Signed-off-by: Maximilian Langenfeld <[email protected]> * Use inline geth base-ref Signed-off-by: Maximilian Langenfeld <[email protected]> * Discard automatic fields Signed-off-by: Maximilian Langenfeld <[email protected]> * token perms Signed-off-by: Maximilian Langenfeld <[email protected]> * Use read-only GCP SA Signed-off-by: Maximilian Langenfeld <[email protected]> * Better parameter handling in update-geth action Signed-off-by: Maximilian Langenfeld <[email protected]> * Remove `update-celo-geth` cmd from justfile --------- Signed-off-by: Maximilian Langenfeld <[email protected]> Co-authored-by: alvarof2 <[email protected]> github: improve update-geth.sh * mark it as executable * allow running on both MacOS and linux (GNU vs BSD tool differences) * terminate on errors * less strict go.mod matching to allow applying it directly to upstream github: Fix update-geth.sh (#304) The script was not substituting the go.mod file and the Dockerfile since the regexes were not matching. The regex for the Dockerfile contained '@sha256:' which perl was interpreting as a global symbol, in order to interpret it literally we needed to escape the '@'. The regex for the go.mod file contained an extra space before the arrow 'go-ethereum .* => ', in a tidied go.mod file there is one space between the package name and the arrow '=>'. Also adds failure output so that it's easier to debug where this is going wrong. --------- Co-authored-by: Karl Bartel <[email protected]> Co-authored-by: Paul Lange <[email protected]> github: The substitution was failing in the docker file since (#309) The substitution \1 and the beginning of the image hash together created \150 which perl interprets as the octal character code for h. To prevent this we need to use the \${1} notation to reference captured groups. github: Change base-branch for update-geth workflow github: Add `celo-org/op-geth` dependencies update script and gh-action (#263) * Add script to update `celo-org/op-geth` dependencies Signed-off-by: Maximilian Langenfeld <[email protected]> * Add github action for update-geth script Signed-off-by: Maximilian Langenfeld <[email protected]> * Use inline geth base-ref Signed-off-by: Maximilian Langenfeld <[email protected]> * Discard automatic fields Signed-off-by: Maximilian Langenfeld <[email protected]> * token perms Signed-off-by: Maximilian Langenfeld <[email protected]> * Use read-only GCP SA Signed-off-by: Maximilian Langenfeld <[email protected]> * Better parameter handling in update-geth action Signed-off-by: Maximilian Langenfeld <[email protected]> * Remove `update-celo-geth` cmd from justfile --------- Signed-off-by: Maximilian Langenfeld <[email protected]> Co-authored-by: alvarof2 <[email protected]> github: Update update geth approach (#319) Removed the old script because it referenced ops-bedrock which has been removed. Added a copy of the op-geth provided update script, decided on a copy to avoid conflicts. Updated the update-geth workflow to reference the new script github: Change update-geth base-branch to 'celo-rebase-13' (#382) github: Change update-geth base-branch to 'celo-rebase-14'

Setting `open-pull-requests-limit: 0` prevent version updates but should keep the security scans and updates according to https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#overriding-the-default-behavior-with-a-configuration-file > If you only require security updates and want to exclude version > updates, you can set open-pull-requests-limit to 0 in order to prevent > version updates for a given package-ecosystem.

…ckchain-public registry (#395) * Build op-node using docker-bake and push to devopsre/celo-blockchain-public registry * Set-Tags

We have to do this because the orb used by optimsim is not public. I published an orb by fetching the project https://github.com/ethereum-optimism/circleci-utils setting up the circleci command-line utility and following the instructions from the readme (also shown below) to publish an orb. Note that the namespace for this orb is just piersy, not piersy/circleci-utils. To publish production versions (e.g., `1.2.3`): - **Required role:** GitHub organization **Owner/Admin** - **What you can do:** - `circleci namespace create` - `circleci orb create` - `circleci orb publish` (production version)

The op config set this to a private URL that we couldn't access, instead we now set this to now be the MAINNET_RPC_URL which is defined as a project env var.

Currently we set this to celo-rebase-15-upstream, but once we've constructed celo-rebase-15 we will want to set the base branch to that.

This cheatcode is used to store the Celo L2 predeploy addresses in a JSON file when run with forge. Inside TestEndToEndApply/initial_chain , the same code is called but we don't care for the generated JSON file. So just returning `nil` makes the test work without any disadvantages.

Remove common/interfaces/IExchange.sol (duplicate) We keep the one in the `mento` directory. Remove common/libraries/ReentrancyGuard.sol (duplicate) Directly use the original from OpenZeppelin. contracts: Skip Celo contracts in test_cannotReinitialize_succeeds

Add console2 import in L2Genesis.s.sol

Until we fix the errors caused by enabling it.

This makes it possible to modify the FeeCurrencyDirectory entries in devnet.

contracts: Revert to upstream L2Genesis.s.sol

…ithMedian (#277) * Ignore AddressSortedLinkedList and AddressSortedLinkedListWithMedian as targets in fuzzing test of SafeCall_Test * Format test/libraries/SafeCall.t.sol

Those have warnings with `scripts/checks/interfaces`. Ignore those warnings for now. contracts: Add Celo contracts in exclusions for interface check contracts: disable interface check for IERC20Upgradeable I don't think we broke anything, so let's make the upstream versions pass the check by adding them to the ignore list.

…ode startup (#367) * Set L1 safe and finalized head at startup of op-node * Wrap initialization of L1 safe & finalized head in SyncStatus with if block * Fix comment * Fix commen * Fix comment * Fix codes based on feedback * Fix comment * Swap the order of fetching finalized and safe L1 block references * Move L1 safe and finalized head fetching to the beginning of OpNode::Start * Remove unnecessary empty line * Add log in finalized

) #274

* feat(batcher): multi-frame altda channels * docs(batcher): add documentation for DaType and txData.daType * docs: fix NextTxData comment --------- Co-authored-by: Samuel Laferriere <[email protected]>

* test(altda): add test for altda->ethda failover * feat(batcher): altda->ethda failover when altda is down * chore: fix typos * fix(fakeDAServer): handlePut was still handling put when in failover mode * Fix logs --------- Co-authored-by: Samuel Laferriere <[email protected]>

* Add Prometheus metrics for AltDA failover in Batcher * Fix calls of RecordBatchDaType * Revert deleted comment * Add metrics for total stored batch size * Fix condition for RecordBatchDaType and RecordBatchDataSizeBytes * Add missing namespace to prometheus definition * Fix the amount of batch sizes recorded for DA * Unify recordings of size of batch to be stored * Improve Prometheus help text

* test(altda): add a test to make sure altda node keeps finalizing even after failover to ethda Currently it does not, as shown by the test TestAltDA_FinalizationAfterEthDAFailover failing * fix(damgr): ethda failover finalization stall bug Weiwei from Polymer found this bug. He proposed a solution. This is an alternative solution which seems simpler, but not 100% of its soundness. * fix: damgr_test doesn't compile * chore: add more logs to damgr and altda_data_source * docs(altda_test): fix typo --------- Co-authored-by: Samuel Laferriere <[email protected]>

… holocene order (#379) * fix(batcher): altda parallel submitted blobs respect strict holocene order (#21) test(e2e): new altda e2e test for concurrent blob submissions to maintain new holocene strict ordering rules test(batcher): add altda unit tests for unhappy failure cases (except channel timeout) test(batcher): fix flaky driver tests + speed them up test(batcher): robustify batcher driver altda tests fix(batcher): altda concurrent blob responses are reordered to respect holocene strict ordering rules docs: fix typos and add documentation comments for some batcher public methods test(op-alt-da): fix MockDAClient.DeleteData decrement semantic chore(batcher): move channel failover behavior from TxFailed to AltDASubmissionFailed The failover logic in the failover feature commits was aded on TxFailed, as the separate function AltDASubmissionFailed didn't exist yet. This change makes it much cleaner as a tx having failed cannot lead to a failover given... since that would come from an ethereum issue. fix(batcher): bug in sendTransaction chore(test-logger): fix test logger.Crit which wasn't getting flushed test(batcher): fix altDASetup w new channel config DaType was added, so needed to change config to use DaTypeAltDA style: wrap errors style(damock): dont explicitly initialize to 0 We make use default values instead docs(batcher-test): document why channel timeout test is left unimplemented docs(batcher): fix todos in batcher readme chore: make lint-go-fix docs(batcher): fix readme typo * Change test to write a log instead of stdout --------- Co-authored-by: Samuel Laferriere <[email protected]>

Add default to switch for lint Allow to override with flags the celo forks 22nd Jan 2026: Noted that we didn't need to set the PectraBlobScheduleTime flag, but now we do need to keep it as removing it would be a hardfork.

* isthmus: Update L1Block contract bytecode --------- Co-authored-by: Gastón Ponti <[email protected]> Co-authored-by: Gaston Ponti <[email protected]>

based on celo-org/op-geth#21

It is also prepared for using the bridged WETH as fee currency, but we are currently lacking a simple way to send fee currency txs, so I left the final tx out.

This uses the default fee-currency-directory address from op-geth. It will fix the issue that the EVM calls into the directoy will fail when executed on the local devnet. e2e: use `--broadcast` with `forge create` (#281) Forge started to require the `--broadcast` flag for actually deploying a contract. Otherwise it will only do a dry-run. We should really pin our foundry version. But let's wait until we rebase to the latest upstream, since there have been changes to the overall setup. Closes #278

These tests perform a check at the end to ensure that the total funds after a test match the total funds before the test. We had modified the state transition function to direct baseFee payments to the fee handler instead of optimism's OperatorFeeVault when in a cel2 context. This caused the tests to fail because the tests were not including the balance of the fee handler. This change ensures that we do consider the fee handler balance when calculating the total.

The test was configured with MaxFrameSize: 150 which was too small for the compressed block data (~291 bytes), causing 2 frames per block instead of 1. This doubled the AltDA Store count from the expected 5 to 10. Fixed by increasing MaxFrameSize to 400 to ensure each block fits in a single frame as the test intended.

Update the test to deploy a 65KB contract that exceeds Celo's increased 64KB MaxCodeSize limit. The previous 25KB test contract no longer triggers the max code size check. Changes: - Use PUSH3 (0x62) instead of PUSH2 to push the 3-byte size value - Update runtime size from 25KB to 65KB - Update init code offset from 0x0c to 0x10 (16 bytes)

setup_remote_docker configures the job to be able to build docker images, however this only works with circleci runners.

The issue was using opcm.opcmStandardValidator() directly, which fails when the OPCM_V2 feature is enabled (the validator should come from opcmV2).

The previous snapshot update was generated without Celo forge-artifacts, which caused all Celo snapshot files to be deleted. Rebuild and regenerate to restore them and update the semver-lock initCodeHashes.

It needs a kona version and I'm not clear what this is, but we don't actually use op-challenger so simply disabling it seems to be a good solution.

Celo does not use cannon, so we can safely skip these tests.

karlb

Looks good, just some questions and nitpicks!

karlb · 2026-02-11T09:11:53Z

fork.yaml

+base:
+  name: OP
+  url: https://github.com/celo-org/optimism
+  ref: refs/remotes/origin/celo-rebase-14-upstream


This ref needs to be updated.

Does anyone use the forkdiff? If not, we should consider removing it.

I've not used it personally, it seems it was originally added by you, so if you don't think it's worth keeping, then I agree.

@palango occasionally uses the one for op-geth, but not this one. So we can remove it.

karlb · 2026-02-11T09:14:31Z

.circleci/config.yml


  contracts-bedrock-tests:
-    circleci_ip_ranges: true
+    # circleci_ip_ranges: true


Which IPs outside of CircleCI do we access that OP doesn't?

This feature routes outbound traffic from jobs through a known fixed ip range. I guess it serves to help lock down access to networked dependencies used by jobs. We don't need the feature though and it costs credits to use it, hence the disabling.

karlb · 2026-02-11T09:17:28Z

.circleci/config.yml

-          requires:
-            - contracts-bedrock-build
-            - cannon-prestate-quick
+  # scheduled-kurtosis-acceptance-tests:


I wonder if we should use a different way to disable workflows, since this is likely to create merge conflicts on every rebase. Maybe a

when: condition: false

?

Sounds good, I will see if that can work.

karlb · 2026-02-11T09:18:32Z

cannon/mipsevm/testutil/evm.go

 	if err != nil {
 		t.Fatalf("failed to create memory state db: %v", err)
 	}
+


Unnecessary diff.

karlb · 2026-02-11T09:22:15Z

op-node/flags/flags.go

+func init() {
+	DeprecatedFlags = append(DeprecatedFlags, deprecatedP2PFlags(EnvVarPrefix)...)
+	optionalFlags = append(optionalFlags, P2PFlags(EnvVarPrefix)...)
+	optionalFlags = append(optionalFlags, oplog.CLIFlagsWithCategory(EnvVarPrefix, OperationsCategory)...)
+	optionalFlags = append(optionalFlags, oppprof.CLIFlagsWithCategory(EnvVarPrefix, OperationsCategory)...)
+	optionalFlags = append(optionalFlags, opmetrics.CLIFlagsWithCategory(EnvVarPrefix, OperationsCategory)...)
+	optionalFlags = append(optionalFlags, oprpc.CLIFlagsWithCategory(EnvVarPrefix, OperationsCategory, rpcDefaults)...)
+	optionalFlags = append(optionalFlags, DeprecatedFlags...)
+	optionalFlags = append(optionalFlags, opflags.CLIFlags(EnvVarPrefix, RollupCategory)...)
+	optionalFlags = append(optionalFlags, altda.CLIFlags(EnvVarPrefix, AltDACategory)...)
+	Flags = append(requiredFlags, optionalFlags...)
+}
+


This function has been moved within the file. If there is no good reason for it, let's put if back to its original place.

karlb · 2026-02-11T09:26:53Z

Makefile

-export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io" && \
-export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io" && \
+export MAINNET_RPC_URL=$${MAINNET_RPC_URL-} && \
+export SEPOLIA_RPC_URL=$${SEPOLIA_RPC_URL-} && \


Do the new lines do anything?

They do look quite useless, apart from maybe making it explicit that those variables are required by the Makefile. They were originally added by you in 997a36a so I decided to leave them as is.

marekolszewski and others added 30 commits January 19, 2026 18:00

Create funding.json

370967c

Adding funding.json file required to apply for retropgf

github: Add forkdiff comparison to optimism

9f12c5f

github: Add docker-build-scan workflow

5520439

github: use step-security replacement for tj-actions/changed-files

github: Add docker-op-ufm-build-push workflow

6d0a7db

github: Action to deploy op-contracts to Holesky

4057399

github: Action to deploy celo4 contracts

27d7512

github: Build op-node using docker-bake and push to devopsre/celo-blo…

aa526b1

…ckchain-public registry (#395) * Build op-node using docker-bake and push to devopsre/celo-blockchain-public registry * Set-Tags

build: Allow configuring mainnet and sepolia RPCs

2a89f84

circleci: Disable workflows and jobs we don't need

f79407a

circleci: Disable matrix features we don't want

27cdff8

circleci: Use self hosted xlarge runners

f9157bf

circleci: Use self hosted 2xlarge runners

db7e06d

circleci: Don't use circleci_ip_ranges

be9a064

circleci: Ensure that ETH_RPC_URL is accessible

b908445

The op config set this to a private URL that we couldn't access, instead we now set this to now be the MAINNET_RPC_URL which is defined as a project env var.

circleci: Update base branch for semgrep-scan

c795cf3

Currently we set this to celo-rebase-15-upstream, but once we've constructed celo-rebase-15 we will want to set the base branch to that.

contracts: Add celo deployment to L2Genesis

3645036

Add console2 import in L2Genesis.s.sol

contracts: register cUSD to FeeDirectory

c8b2b7e

contracts: Disable cUSD in L2 genesis for now

cc8d05a

Until we fix the errors caused by enabling it.

contracts: Add feature flag for celo contract deployment

5c50334

contracts: Set devAccount[0] as owner of FeeCurrencyDirectory

6043917

This makes it possible to modify the FeeCurrencyDirectory entries in devnet.

contracts: Log out l2 predeploy addresses.

5d6628b

contracts: Revert to upstream L2Genesis.s.sol

1947cc7

contracts: Revert to upstream L2Genesis.s.sol

contracts: Add map script.

6b13687

contracts: Resolve fuzzing test failures for AddressSortedLinkedListW…

64f15ae

…ithMedian (#277) * Ignore AddressSortedLinkedList and AddressSortedLinkedListWithMedian as targets in fuzzing test of SafeCall_Test * Format test/libraries/SafeCall.t.sol

Kourin1996 and others added 28 commits February 5, 2026 17:11

op-batcher: CLI validation to prevent submitting Blobs into Alt DA (#274

c0c0996

) #274

op-batcher: multi-frame altda channels (#310)

be0f99d

* feat(batcher): multi-frame altda channels * docs(batcher): add documentation for DaType and txData.daType * docs: fix NextTxData comment --------- Co-authored-by: Samuel Laferriere <[email protected]>

isthmus: Add hardfork timestamps

e165c35

Add default to switch for lint Allow to override with flags the celo forks 22nd Jan 2026: Noted that we didn't need to set the PectraBlobScheduleTime flag, but now we do need to keep it as removing it would be a hardfork.

isthmus: Update L1Block contract bytecode (#390)

5c608f8

* isthmus: Update L1Block contract bytecode --------- Co-authored-by: Gastón Ponti <[email protected]> Co-authored-by: Gaston Ponti <[email protected]>

op-e2e: Add token duality e2e test

d2ed4b2

based on celo-org/op-geth#21

op-e2e: Add e2e test for bridging WETH to L2

768efff

It is also prepared for using the bridged WETH as fee currency, but we are currently lacking a simple way to send fee currency txs, so I left the final tx out.

op-e2e: Add viem E2E testsuite

953bdb6

op-e2e: Use FeeHandler in fee tests

08ff912

Fix shellcheck error in check-semver

fffc223

fixup

2c4ecb7

circleci: Use circleci runners where setup_remote_docker is used

951db91

setup_remote_docker configures the job to be able to build docker images, however this only works with circleci runners.

Add celo folders to semgrepignore

f2ff56d

contracts: Fix standardValidator access

d51f311

The issue was using opcm.opcmStandardValidator() directly, which fails when the OPCM_V2 feature is enabled (the validator should come from opcmV2).

contracts: Exclude celo solidity from strict pragma

d4e4cf4

contracts: Update snapshots & semver-lock

cf445da

Fixup

451e958

contracts: Restore Celo snapshots & update semver-lock

345c572

The previous snapshot update was generated without Celo forge-artifacts, which caused all Celo snapshot files to be deleted. Rebuild and regenerate to restore them and update the semver-lock initCodeHashes.

Remove op-challenger as it was failing the docker build

ca21654

It needs a kona version and I'm not clear what this is, but we don't actually use op-challenger so simply disabling it seems to be a good solution.

build: Skip cannon acceptance tests

dc0c39c

Celo does not use cannon, so we can safely skip these tests.

karlb reviewed Feb 11, 2026

View reviewed changes

piersy changed the title ~~Piersy/celo rebase 16~~ Preview celo rebase 16 Feb 11, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Preview celo rebase 16 #411

Preview celo rebase 16 #411

Uh oh!

piersy commented Feb 10, 2026 •

edited

Loading

Uh oh!

karlb left a comment

Uh oh!

karlb Feb 11, 2026

Uh oh!

piersy Feb 11, 2026

Uh oh!

karlb Feb 11, 2026

Uh oh!

karlb Feb 11, 2026

Uh oh!

piersy Feb 11, 2026 •

edited

Loading

Uh oh!

karlb Feb 11, 2026

Uh oh!

piersy Feb 11, 2026

Uh oh!

karlb Feb 11, 2026

Uh oh!

karlb Feb 11, 2026

Uh oh!

karlb Feb 11, 2026

Uh oh!

piersy Feb 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Preview celo rebase 16 #411

Are you sure you want to change the base?

Preview celo rebase 16 #411

Uh oh!

Conversation

piersy commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

karlb left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piersy Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

piersy commented Feb 10, 2026 •

edited

Loading

piersy Feb 11, 2026 •

edited

Loading