ethereum-optimism · ajsutton · Jan 30, 2026 · Jan 20, 2026 · Jan 20, 2026 · Jan 20, 2026
@@ -984,7 +984,7 @@ jobs:
           command: |
             CANNON_TAG="$(cat .config/cannon_tag)"
             cd docker/fpvm-prestates
-            just "<<parameters.kind>>" "<<parameters.version>>" "<< pipeline.git.branch >>" "$CANNON_TAG"
+            just "<<parameters.kind>>" "<<parameters.version>>" "$CANNON_TAG"
       - run:
           name: Upload prestates to GCS
           command: |

@@ -1174,7 +1174,6 @@ jobs:
             fi
 
             # Let them cook!
-            KONA_VERSION=$(jq -r .version kona/version.json) \
             docker buildx bake \
               --progress plain \
               --builder=buildx-build \
@@ -2494,20 +2493,20 @@ jobs:
           enable-mise-cache: true
       - restore_cache:
           name: Restore kona cache
-          key: kona-prestate-{{ checksum "./kona/justfile" }}-{{ checksum "./kona/version.json" }}
+          key: kona-prestate-{{ checksum "./kona/justfile" }}-{{ checksum "./kona/.config/cannon_tag" }}
       - run:
           name: Build kona prestates
           command: just build-prestates
           working_directory: kona
       - save_cache:
-          key: kona-prestate-{{ checksum "./kona/justfile" }}-{{ checksum "./kona/version.json" }}
+          key: kona-prestate-{{ checksum "./kona/justfile" }}-{{ checksum "./kona/.config/cannon_tag" }}
           name: Save Kona to cache
           paths:
-            - "kona/prestates/"
+            - "kona/prestate-artifacts-*/"
       - persist_to_workspace:
           root: .
           paths:
-            - "kona/prestates/*"
+            - "kona/prestate-artifacts-*/*"
 
 
   # Aggregator job - allows downstream jobs to depend on a single job instead of listing all build jobs.

@@ -1,13 +1,10 @@
 name: 'Docker Build Prep'
-description: 'Prepare environment for docker builds (checkout, kona version, git versions)'
+description: 'Prepare environment for docker builds (checkout, git versions)'
 
 outputs:
   versions:
     description: 'JSON object mapping image names to their GIT_VERSION'
     value: ${{ steps.compute_versions.outputs.versions }}
-  kona_version:
-    description: 'KONA_VERSION from kona/version.json'
-    value: ${{ steps.kona.outputs.version }}
   date:
     description: 'Current date in YYYYMMDD format'
     value: ${{ steps.date.outputs.date }}
@@ -22,14 +19,6 @@ runs:
         DATE=$(date +%Y%m%d)
         echo "date=$DATE" >> $GITHUB_OUTPUT
 
-    - name: Read KONA_VERSION from kona/version.json
-      id: kona
-      shell: bash
-      run: |
-        KONA_VERSION=$(jq -r .version kona/version.json)
-        echo "version=$KONA_VERSION" >> $GITHUB_OUTPUT
-        echo "KONA_VERSION: $KONA_VERSION"
-
     - name: Compute GIT_VERSION for all images
       id: compute_versions
       shell: bash

@@ -25,7 +25,6 @@ jobs:
       contents: read
     outputs:
       versions: ${{ steps.prep.outputs.versions }}
-      kona_version: ${{ steps.prep.outputs.kona_version }}
       date: ${{ steps.prep.outputs.date }}
     steps:
       - name: Harden the runner
@@ -73,7 +72,6 @@ jobs:
       registry: us-docker.pkg.dev/oplabs-tools-artifacts/images
       env: |
         GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[matrix.image_name] }}
-        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
       set: |
         *.args.GIT_COMMIT=${{ github.sha }}
         *.args.GIT_DATE=${{ needs.prep.outputs.date }}
@@ -115,7 +113,6 @@ jobs:
       registry: ttl.sh/${{ github.sha }}
       env: |
         GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[matrix.image_name] }}
-        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
       set: |
         *.args.GIT_COMMIT=${{ github.sha }}
         *.args.GIT_DATE=${{ needs.prep.outputs.date }}

@@ -14,7 +14,6 @@ jobs:
       image_name: ${{ steps.parse-tag.outputs.image_name }}
       version: ${{ steps.parse-tag.outputs.version }}
       versions: ${{ steps.prep.outputs.versions }}
-      kona_version: ${{ steps.prep.outputs.kona_version }}
     steps:
       - name: Harden the runner
         uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2
@@ -43,7 +42,6 @@ jobs:
       registry: us-docker.pkg.dev/oplabs-tools-artifacts/images
       env: |
         GIT_VERSION=${{ fromJson(needs.prep.outputs.versions)[needs.prep.outputs.image_name] }}
-        KONA_VERSION=${{ needs.prep.outputs.kona_version }}
       set: |
         *.args.GIT_COMMIT=${{ github.sha }}
         *.args.GIT_DATE=${{ github.event.head_commit.timestamp }}

@@ -42,7 +42,6 @@ golang-docker: ## Builds Docker images for Go components using buildx
 	GIT_COMMIT=$$(git rev-parse HEAD) \
 	GIT_DATE=$$(git show -s --format='%ct') \
 	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
-	KONA_VERSION=$$(jq -r .version kona/version.json) \
 	docker buildx bake \
 			--progress plain \
 			--load \
@@ -148,8 +147,11 @@ cannon:  ## Builds cannon binary
 	make -C ./cannon cannon
 .PHONY: cannon
 
-reproducible-prestate:   ## Builds reproducible-prestate binary
-	make -C ./op-program reproducible-prestate
+reproducible-prestate:   ## Builds reproducible prestates for op-program and kona
+	make -C ./op-program build-reproducible-prestate
+	cd kona && just build-reproducible-prestate
+	make -C ./op-program output-prestate-hash
+	cd kona && just output-prestate-hash
 .PHONY: reproducible-prestate
 
 cannon-prestates: cannon op-program

@@ -6,10 +6,6 @@ variable "REPOSITORY" {
   default = "oplabs-tools-artifacts/images"
 }
 
-variable "KONA_VERSION" {
-  default = "none"
-}
-
 variable "GIT_COMMIT" {
   default = "dev"
 }
@@ -148,7 +144,6 @@ target "op-challenger" {
     GIT_COMMIT = "${GIT_COMMIT}"
     GIT_DATE = "${GIT_DATE}"
     OP_CHALLENGER_VERSION = "${OP_CHALLENGER_VERSION}"
-    KONA_VERSION="${KONA_VERSION}"
   }
   target = "op-challenger-target"
   platforms = split(",", PLATFORMS)

@@ -79,15 +79,6 @@ target "generic" {
 //                        Proof Images                        //
 ////////////////////////////////////////////////////////////////
 
-variable "ASTERISC_TAG" {
-  // The tag of `asterisc` to use in the `kona-asterisc-prestate` target.
-  //
-  // You can override this if you'd like to use a different tag to generate the prestate.
-  // https://github.com/ethereum-optimism/asterisc/releases
-  default = "v1.3.0"
-  description = "The tag of asterisc to use in the kona-asterisc-prestate target."
-}
-
 variable "CANNON_TAG" {
   // The tag of `cannon` to use in the `kona-cannon-prestate` target.
   //
@@ -98,7 +89,7 @@ variable "CANNON_TAG" {
 }
 
 variable "CLIENT_BIN" {
-  // The `kona-client` binary to use in the `kona-{asterisc/cannon}-prestate` targets.
+  // The `kona-client` binary to use in the `kona-cannon-prestate` target.
   //
   // You can override this if you'd like to use a different `kona-client` binary to generate
   // the prestate.
@@ -107,7 +98,7 @@ variable "CLIENT_BIN" {
   // - `kona` (single-chain)
   // - `kona-int` (interop)
   default = "kona"
-  description = "The kona-client binary to use in the proof prestate targets. Valid options: kona, kona-int"
+  description = "The kona-client binary to use in the proof prestate target. Valid options: kona, kona-int"
 }
 
 variable "KONA_CUSTOM_CONFIGS" {
@@ -123,14 +114,6 @@ variable "CUSTOM_CONFIGS_CONTEXT" {
 }
 
 
-target "asterisc-builder" {
-  description = "Rust build environment for bare-metal RISC-V 64-bit IMA (Asterisc FPVM ISA)"
-  inherits = ["docker-metadata-action"]
-  context = "docker/asterisc"
-  dockerfile = "asterisc.dockerfile"
-  platforms = split(",", PLATFORMS)
-}
-
 target "cannon-builder" {
   description = "Rust build environment for bare-metal MIPS64r1 (Cannon FPVM ISA)"
   inherits = ["docker-metadata-action"]
@@ -143,20 +126,6 @@ target "cannon-builder" {
   platforms = split(",", PLATFORMS)
 }
 
-target "kona-asterisc-prestate" {
-  description = "Prestate builder for kona-client with Asterisc FPVM"
-  inherits = ["docker-metadata-action"]
-  context = "."
-  dockerfile = "docker/fpvm-prestates/asterisc-repro.dockerfile"
-  args = {
-    CLIENT_BIN = "${CLIENT_BIN}"
-    CLIENT_TAG = "${GIT_REF_NAME}"
-    ASTERISC_TAG = "${ASTERISC_TAG}"
-  }
-  # Only build on linux/amd64 for reproducibility.
-  platforms = ["linux/amd64"]
-}
-
 target "kona-cannon-prestate" {
   description = "Prestate builder for kona-client with Cannon FPVM"
   inherits = ["docker-metadata-action"]
@@ -167,7 +136,6 @@ target "kona-cannon-prestate" {
   }
   args = {
     CLIENT_BIN = "${CLIENT_BIN}"
-    CLIENT_TAG = "${GIT_REF_NAME}"
     CANNON_TAG = "${CANNON_TAG}"
     KONA_CUSTOM_CONFIGS = "${KONA_CUSTOM_CONFIGS}"
   }

@@ -27,30 +27,25 @@ RUN git clone https://github.com/ethereum-optimism/optimism && \
   cp bin/cannon /cannon-bin
 
 ################################################################
-#               Build kona-client @ `CLIENT_TAG`               #
+#            Build kona-client from local source               #
 ################################################################
 
 FROM ghcr.io/op-rs/kona/cannon-builder:0.3.0 AS client-build
 SHELL ["/bin/bash", "-c"]
 
 ARG CLIENT_BIN
-ARG CLIENT_TAG
 ARG KONA_CUSTOM_CONFIGS
 
 COPY --from=custom_configs / /usr/local/kona-custom-configs
 
-# Install deps
-RUN apt-get update && apt-get install -y --no-install-recommends git
-
-# Clone kona at the specified tag
-RUN git clone https://github.com/op-rs/kona
+# Copy kona source from build context
+COPY . /kona
 
 ENV KONA_CUSTOM_CONFIGS=$KONA_CUSTOM_CONFIGS
 ENV KONA_CUSTOM_CONFIGS_DIR=/usr/local/kona-custom-configs
 
-# Build kona-client on the selected tag
+# Build kona-client
 RUN cd kona && \
-  git checkout $CLIENT_TAG && \
   cargo build -Zbuild-std=core,alloc -p kona-client --bin $CLIENT_BIN --locked --profile release-client-lto && \
   mv ./target/mips64-unknown-none/release-client-lto/$CLIENT_BIN /kona-client-elf