fix

Author: meyer9

.github/workflows/_build-binaries.yaml

@@ -5,11 +5,11 @@ name: Build Binaries
 on:
   workflow_call:
     inputs:
-      reth_version:
-        description: "Reth version to build"
+      optimism_version:
+        description: "Optimism version to build"
         required: false
         type: string
-        default: "564ffa586845fa4a8bb066f0c7b015ff36b26c08"
+        default: "3019251e80aa248e91743addd3e833190acb26f1"
       geth_version:
         description: "Geth version to build"
         required: false
@@ -85,25 +85,25 @@ jobs:
 
       - name: Cache reth binary
         uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3.4.3
-        id: cache-reth
+        id: cache-optimism
         with:
           path: ~/bin/reth
-          key: ${{ runner.os }}-reth-${{ inputs.reth_version }}
+          key: ${{ runner.os }}-reth-${{ inputs.optimism_version }}
 
       - name: Build reth
         if: steps.cache-reth.outputs.cache-hit != 'true'
         run: |
           unset CI
           mkdir -p ~/bin
           cd clients
-          RETH_VERSION=${{ inputs.reth_version }} OUTPUT_DIR=~/bin ./build-reth.sh
+          OPTIMISM_VERSION=${{ inputs.optimism_version }} OUTPUT_DIR=~/bin ./build-reth.sh
           # Rename op-reth to reth for consistency
           [ -f ~/bin/op-reth ] && mv ~/bin/op-reth ~/bin/reth || true
 
       - name: Upload reth artifact
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
-          name: reth
+          name: optimism
           path: ~/bin/reth
           retention-days: 1
 

.github/workflows/build.yaml

@@ -69,7 +69,7 @@ jobs:
       actions: write # Required for reusable workflow to upload artifacts
     uses: ./.github/workflows/_build-binaries.yaml
     with:
-      reth_version: 564ffa586845fa4a8bb066f0c7b015ff36b26c08
+      optimism_version: 3019251e80aa248e91743addd3e833190acb26f1
       geth_version: 6cbfcd5161083bcd4052edc3022d9f99c6fe40e0
       builder_version: 23f42c8e78ba3abb45a8840df7037a27e196e601
       base_reth_node_version: main

.github/workflows/examples.yaml

@@ -16,7 +16,7 @@ jobs:
       actions: write # Required for reusable workflow to upload artifacts
     uses: ./.github/workflows/_build-binaries.yaml
     with:
-      reth_version: 564ffa586845fa4a8bb066f0c7b015ff36b26c08
+      optimism_version: 3019251e80aa248e91743addd3e833190acb26f1
       geth_version: 6cbfcd5161083bcd4052edc3022d9f99c6fe40e0
       builder_version: 23f42c8e78ba3abb45a8840df7037a27e196e601
       base_reth_node_version: main

.github/workflows/public-benchmarks.yaml

@@ -16,7 +16,7 @@ jobs:
       actions: write # Required for reusable workflow to upload artifacts
     uses: ./.github/workflows/_build-binaries.yaml
     with:
-      reth_version: 564ffa586845fa4a8bb066f0c7b015ff36b26c08
+      optimism_version: 3019251e80aa248e91743addd3e833190acb26f1
       geth_version: 6cbfcd5161083bcd4052edc3022d9f99c6fe40e0
       builder_version: 23f42c8e78ba3abb45a8840df7037a27e196e601
 

clients/README.md

@@ -73,7 +73,7 @@ Modify the `versions.env` file to change defaults for all builds:
 
 ```bash
 # Edit versions.env to update default versions
-RETH_VERSION="v0.2.0-beta.5"
+OPTIMISM_VERSION="v0.2.0-beta.5"
 GETH_VERSION="v1.13.0"
 BUILDER_VERSION="your-commit-hash"
 ```
@@ -83,7 +83,7 @@ Override specific builds with environment variables:
 
 ```bash
 # Build reth from a specific commit
-RETH_REPO="https://github.com/paradigmxyz/reth/" RETH_VERSION="v0.1.0" ./build-reth.sh
+OPTIMISM_REPO="https://github.com/ethereum-optimism/optimism/" OPTIMISM_VERSION="v0.1.0" ./build-reth.sh
 
 # Build geth from a fork
 GETH_REPO="https://github.com/your-fork/op-geth/" GETH_VERSION="your-branch" ./build-geth.sh
@@ -95,8 +95,8 @@ BUILDER_VERSION="main" ./build-builder.sh
 ### Available Environment Variables
 
 #### For reth (build-reth.sh):
-- `RETH_REPO`: Git repository URL (default: https://github.com/paradigmxyz/reth/)
-- `RETH_VERSION`: Git branch, tag, or commit hash (default: main)
+- `OPTIMISM_REPO`: Git repository URL (default: https://github.com/ethereum-optimism/optimism/)
+- `OPTIMISM_VERSION`: Git branch, tag, or commit hash (default: develop)
 - `BUILD_DIR`: Directory for source code (default: ./build)
 - `OUTPUT_DIR`: Directory for built binaries (default: ../bin)
 

clients/build-reth.sh

@@ -8,14 +8,14 @@ if [ -f "versions.env" ]; then
 fi
 
 # Default values
-RETH_REPO="${RETH_REPO:-https://github.com/ethereum-optimism/optimism/}"
-RETH_VERSION="${RETH_VERSION:-develop}"
+OPTIMISM_REPO="${OPTIMISM_REPO:-https://github.com/ethereum-optimism/optimism/}"
+OPTIMISM_VERSION="${OPTIMISM_VERSION:-develop}"
 BUILD_DIR="${BUILD_DIR:-./build}"
 OUTPUT_DIR="${OUTPUT_DIR:-../bin}"
 
 echo "Building op-reth binary..."
-echo "Repository: $RETH_REPO"
-echo "Version/Commit: $RETH_VERSION"
+echo "Repository: $OPTIMISM_REPO"
+echo "Version/Commit: $OPTIMISM_VERSION"
 echo "Build directory: $BUILD_DIR"
 echo "Output directory: $OUTPUT_DIR"
 
@@ -30,17 +30,17 @@ if [ -d "optimism" ]; then
     git fetch origin
 
     # ensure remote matches the repository
-    git remote set-url origin "$RETH_REPO"
+    git remote set-url origin "$OPTIMISM_REPO"
     git fetch origin
 else
     echo "Cloning optimism repository..."
-    git clone "$RETH_REPO" optimism
+    git clone "$OPTIMISM_REPO" optimism
     cd optimism
 fi
 
 # Checkout specified version/commit
-echo "Checking out version: $RETH_VERSION"
-git checkout -f "$RETH_VERSION"
+echo "Checking out version: $OPTIMISM_VERSION"
+git checkout -f "$OPTIMISM_VERSION"
 
 pushd rust
 

clients/versions.env

@@ -3,8 +3,8 @@
 # Source this file in scripts to use these variables
 
 # Reth Configuration
-RETH_REPO="https://github.com/paradigmxyz/reth/"
-RETH_VERSION="v1.11.0"
+OPTIMISM_REPO="https://github.com/ethereum-optimism/optimism/"
+OPTIMISM_VERSION="3019251e80aa248e91743addd3e833190acb26f1"
 
 # Op-Geth Configuration
 GETH_REPO="https://github.com/ethereum-optimism/op-geth/"