From 4438a7db0398cccd059595a733d783420b17acc9 Mon Sep 17 00:00:00 2001
From: JosepBove <josep@oplabs.co>
Date: Tue, 23 Sep 2025 15:26:56 +0200
Subject: [PATCH 1/5] start

---
 .circleci/config.yml                | 2 ++
 packages/contracts-bedrock/justfile | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b94de858edb..17b584edd86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1007,6 +1007,8 @@ jobs:
           command: validate-spacers-no-build
       - run-contracts-check:
           command: opcm-upgrade-checks-no-build
+      - run-contracts-check:
+          command: update-selectors
 
   todo-issues:
     parameters:
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 2012a4a470c..b75db3979fa 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -268,6 +268,10 @@ lint-forge-tests-check: build lint-forge-tests-check-no-build
 lint-check:
   forge fmt --check
 
+# Updates the selectors for the contracts
+update-selectors:
+  forge selectors up --all
+
 # Checks for unused imports in Solidity contracts. Does not build contracts.
 unused-imports-check-no-build:
   go run ./scripts/checks/unused-imports
@@ -352,6 +356,8 @@ pre-pr *ARGS:
   just lint
   just build-source
   just check
+  just update-selectors
+
 
   # Restore build artifacts after running checks.
   if [ -d "$TEMP_BUILD_DIR" ]; then

From a42ae768397133fdc4894b978ab28bbb8d9b2c1c Mon Sep 17 00:00:00 2001
From: JosepBove <josep@oplabs.co>
Date: Tue, 23 Sep 2025 23:32:45 +0200
Subject: [PATCH 2/5] add upload to ci

---
 .circleci/config.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 17b584edd86..c8056aa0222 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -968,6 +968,18 @@ jobs:
           when: on_fail
       - notify-failures-on-develop
 
+  contracts-bedrock-upload:
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
+    steps:
+      - checkout-from-workspace
+      - check-changed:
+          patterns: contracts-bedrock
+      - get-target-branch
+      - run:
+          name: upload selectors
+          command: update-selectors
+
   contracts-bedrock-checks:
     machine: true
     resource_class: ethereum-optimism/latitude-1
@@ -1007,8 +1019,6 @@ jobs:
           command: validate-spacers-no-build
       - run-contracts-check:
           command: opcm-upgrade-checks-no-build
-      - run-contracts-check:
-          command: update-selectors
 
   todo-issues:
     parameters:
@@ -2023,6 +2033,11 @@ workflows:
             - contracts-bedrock-build
           context:
             - circleci-repo-readonly-authenticated-github-token
+      - contracts-bedrock-upload:
+          requires:
+            - contracts-bedrock-build
+          context:
+            - circleci-repo-readonly-authenticated-github-token
       - diff-fetcher-forge-artifacts:
           context:
             - circleci-repo-readonly-authenticated-github-token

From f29e0b0875b2ecea13b762346ef46b5473319f59 Mon Sep 17 00:00:00 2001
From: JosepBove <josep@oplabs.co>
Date: Tue, 23 Sep 2025 23:41:55 +0200
Subject: [PATCH 3/5] fix: update CI

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c8056aa0222..6391d7cee59 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -978,7 +978,8 @@ jobs:
       - get-target-branch
       - run:
           name: upload selectors
-          command: update-selectors
+          command: just update-selectors
+          working_directory: packages/contracts-bedrock
 
   contracts-bedrock-checks:
     machine: true

From 68c5dcf41399c6071039f03bc2e22c15278be4f3 Mon Sep 17 00:00:00 2001
From: JosepBove <josep@oplabs.co>
Date: Mon, 1 Dec 2025 10:21:17 -0300
Subject: [PATCH 4/5] feat: rm update-selectors from pre-pr

---
 packages/contracts-bedrock/justfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index b75db3979fa..51c30d0f5f0 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -356,7 +356,6 @@ pre-pr *ARGS:
   just lint
   just build-source
   just check
-  just update-selectors
 
 
   # Restore build artifacts after running checks.

From 56545bf65a95caa892f01ba952e1d528aa183a74 Mon Sep 17 00:00:00 2001
From: JosepBove <josep@oplabs.co>
Date: Mon, 1 Dec 2025 12:01:39 -0300
Subject: [PATCH 5/5] fix: rm checkout from workspace

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4d410f58b12..496cfe87dec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1261,7 +1261,6 @@ jobs:
     machine: true
     resource_class: ethereum-optimism/latitude-1
     steps:
-      - checkout-from-workspace
       - check-changed:
           patterns: contracts-bedrock
       - get-target-branch