From fd01a41e973737ae37a746d5fe763bdbd1475862 Mon Sep 17 00:00:00 2001
From: Kelvin Fichter <kelvinfichter@gmail.com>
Date: Mon, 3 Nov 2025 15:07:37 -0500
Subject: [PATCH 1/2] feat(ci): run upgrade tests with dev flags

Updates CI to run upgrade tests with dev flags enabled. Only OP
will run with dev flags enabled for now, this should be sufficient
and will avoid dramatically increasing CI impact.
---
 .circleci/config.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb9fa51236324..c08ea0f326a25 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1146,6 +1146,10 @@ jobs:
       fork_base_rpc:
         description: Fork Base RPC
         type: string
+      dev_features:
+        description: Comma-separated list of dev features to enable (e.g., "OPTIMISM_PORTAL_INTEROP,ANOTHER_FEATURE")
+        type: string
+        default: ""
     docker:
       - image: <<pipeline.parameters.default_docker_image>>
     resource_class: xlarge
@@ -1176,6 +1180,8 @@ jobs:
       - restore_cache:
           name: Restore forked state
           key: forked-state-contracts-bedrock-tests-upgrade-<<parameters.fork_op_chain>>-<<parameters.fork_base_chain>>-{{ checksum "packages/contracts-bedrock/pinnedBlockNumber.txt" }}
+      - setup-dev-features:
+          dev_features: <<parameters.dev_features>>
       - run:
           name: Run tests
           command: just test-upgrade
@@ -2453,6 +2459,19 @@ workflows:
             - circleci-repo-readonly-authenticated-github-token
           requires:
             - initialize
+      - contracts-bedrock-tests-upgrade:
+          name: contracts-bedrock-tests-upgrade op-mainnet <<matrix.dev_features>>
+          fork_op_chain: op
+          fork_base_chain: mainnet
+          fork_base_rpc: https://ci-mainnet-l1-archive.optimism.io
+          dev_features: <<matrix.dev_features>>
+          matrix:
+            parameters:
+              dev_features: *dev_features_matrix
+          context:
+            - circleci-repo-readonly-authenticated-github-token
+          requires:
+            - initialize
       - contracts-bedrock-tests-upgrade:
           name: contracts-bedrock-tests-upgrade <<matrix.fork_op_chain>>-mainnet
           fork_op_chain: <<matrix.fork_op_chain>>
@@ -2460,7 +2479,7 @@ workflows:
           fork_base_rpc: https://ci-mainnet-l1-archive.optimism.io
           matrix:
             parameters:
-              fork_op_chain: ["op", "base", "ink", "unichain"]
+              fork_op_chain: ["base", "ink", "unichain"]
           context:
             - circleci-repo-readonly-authenticated-github-token
           requires:

From a549721c4a9adbbe8d71fdb39e402e6f543d7a6c Mon Sep 17 00:00:00 2001
From: Kelvin Fichter <kelvinfichter@gmail.com>
Date: Mon, 3 Nov 2025 15:34:55 -0500
Subject: [PATCH 2/2] fix: correct cannon kona prestate in validator tests

---
 .../test/L1/OPContractsManagerStandardValidator.t.sol           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol
index 5fb4992f42fc3..a99a358ea198a 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol
@@ -95,7 +95,7 @@ abstract contract OPContractsManagerStandardValidator_TestInit is CommonTest, Di
     Claim cannonPrestate;
 
     /// @notice The CannonKona absolute prestate.
-    Claim cannonKonaPrestate = Claim.wrap(bytes32(keccak256("cannonKona")));
+    Claim cannonKonaPrestate = Claim.wrap(bytes32(keccak256("cannonKonaPrestate")));
 
     /// @notice The proposer role set on the PermissionedDisputeGame instance.
     address proposer;