From 56553b0468074d506cbc65d79137269ce9e01822 Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Thu, 14 May 2026 08:29:08 -0700
Subject: [PATCH] fix: use base/base main branch for base-reth-node builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert base_reth_node_version from short commit SHA (1e4a8a7) back to
'main'. GitHub does not allow fetching arbitrary commit SHAs as refs,
so `git fetch origin 1e4a8a7` fails during CI.

Also simplify the checkout logic in build-base-reth-node.sh to match
build-reth.sh — a direct `git checkout -f` is sufficient for both
branch names and commit SHAs present in the cloned history.
---
 .github/workflows/_build-binaries.yaml | 2 +-
 clients/build-base-reth-node.sh        | 3 +--
 clients/versions.env                   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/_build-binaries.yaml b/.github/workflows/_build-binaries.yaml
index ce237a96..89fb73dd 100644
--- a/.github/workflows/_build-binaries.yaml
+++ b/.github/workflows/_build-binaries.yaml
@@ -19,7 +19,7 @@ on:
         description: "Base Reth Node version to build"
         required: false
         type: string
-        default: "1e4a8a7"
+        default: "main"
 
 # Set minimal permissions for all jobs by default
 permissions:
diff --git a/clients/build-base-reth-node.sh b/clients/build-base-reth-node.sh
index 7341be5f..60fd89ce 100755
--- a/clients/build-base-reth-node.sh
+++ b/clients/build-base-reth-node.sh
@@ -40,8 +40,7 @@ fi
 
 # Checkout specified version/commit
 echo "Checking out version: $BASE_RETH_NODE_VERSION"
-git fetch origin "$BASE_RETH_NODE_VERSION" || true
-git checkout -f "$BASE_RETH_NODE_VERSION" || git checkout -f "origin/$BASE_RETH_NODE_VERSION"
+git checkout -f "$BASE_RETH_NODE_VERSION"
 
 # Build the binaries using cargo
 echo "Building base-reth-node, base-builder, and base-load-test with cargo..."
diff --git a/clients/versions.env b/clients/versions.env
index 4c12809e..536ac9a8 100644
--- a/clients/versions.env
+++ b/clients/versions.env
@@ -12,7 +12,7 @@ GETH_VERSION="v1.101604.0"
 
 # Base Reth Node Configuration
 BASE_RETH_NODE_REPO="https://github.com/base/base"
-BASE_RETH_NODE_VERSION="1e4a8a7"
+BASE_RETH_NODE_VERSION="main"
 
 # Build Configuration
 # BUILD_DIR="./build"