op-node/derive: Gate BPO activation per L2 chain#417
Merged
piersy merged 5 commits intopiersy/celo-rebase-16from Feb 17, 2026
Merged
op-node/derive: Gate BPO activation per L2 chain#417piersy merged 5 commits intopiersy/celo-rebase-16from
piersy merged 5 commits intopiersy/celo-rebase-16from
Conversation
Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior).
|
Seems to be the same as #414 |
Author
Yep, the early application of the BPO config was causing the snap sync to re-org to before the pivot block, which resulted in the missing trie error, which then caused the sync to fail. So hopefully this is the final fix required to get syncing back on track. |
Ah, that makes sense! Nice find! |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## piersy/celo-rebase-16 #417 +/- ##
======================================================
Coverage 66.42% 66.42%
======================================================
Files 55 55
Lines 4030 4030
======================================================
Hits 2677 2677
Misses 1209 1209
Partials 144 144
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
Updates op-geth to a version that specifies CeloChaosChainID
9dea987 to
c36ceb1
Compare
…ader data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports
The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage)
karlb
approved these changes
Feb 17, 2026
karlb
left a comment
There was a problem hiding this comment.
Looks good! I added two commits to make the CI pass. Please have a quick look at them before merging.
piersy
added a commit
that referenced
this pull request
Feb 18, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co>
karlb
pushed a commit
that referenced
this pull request
Mar 3, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
karlb
pushed a commit
that referenced
this pull request
Mar 4, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
karlb
pushed a commit
that referenced
this pull request
Mar 6, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
karlb
pushed a commit
that referenced
this pull request
Mar 9, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
karlb
pushed a commit
that referenced
this pull request
Mar 10, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
karlb
pushed a commit
that referenced
this pull request
Mar 10, 2026
* op-node/derive: Gate BPO activation in L1InfoDeposit per L2 chain Disable BPO/Osaka blob fee formula for Celo L2 chains (mainnet, sepolia, chaos) until Jovian hardfork, matching the gating in celo-kona PR #121. For non-Celo chains, BPO remains enabled by default (preserving upstream behavior). * Update op-geth Updates op-geth to a version that specifies CeloChaosChainID * Fix TestBlobBaseFeeFromSepolia: use stripBPOActivations and inline header data The test was failing because it computed BlobBaseFee using the full SepoliaChainConfig (which includes BPO activation times), but the expected value was the Prague-era blob fee from the actual Celo Sepolia L2 block (derived before BPO was known). Fix by: - Using stripBPOActivations on the config, which is exactly what the production code does for Celo chains - Inlining the header data (ExcessBlobGas, Time) instead of making a live RPC call, so the test runs in CI's -short mode - Removing unused context and ethclient imports * ci: Skip OP mainnet upgrade tests not relevant to Celo The contracts-bedrock-tests-upgrade and coverage-upgrade tests fork OP mainnet to test OP-specific upgrade paths. These fail on the Celo fork because ForkLive.s.sol is out of sync with upstream (the DelayedWETHProxy deployment lookup fails). Since these tests are not relevant to Celo chains, skip them: - Comment out contracts-bedrock-tests-upgrade workflow jobs - Use coverage-lcov instead of coverage-lcov-all (which includes upgrade coverage) --------- Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Refactor bpo hardfork gating (#420) The previous implementation was broken since it was using block numbers to determine if jovian was active, but in fact jovian is activated by timestamp.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
L1InfoDepositper L2 chain, matching celo-kona PR #121Closes https://github.com/celo-org/celo-blockchain-planning/issues/1301
Closes https://github.com/celo-org/celo-blockchain-planning/issues/1343