chore: Update kona + asterisc in op-challenger image (#15394)

## Overview

Updates the `op-challenger` image to use the latest `kona` and `asterisc` versions. Since it was last updated, `kona-fpp-asterisc` has been deprecated in favor of a `kona-host` image that does not distribute `asterisc`.

Also removes the deprecated `proofs-tools` image + the associated docker bake target.

Author: clabby

.circleci/config.yml

@@ -1875,7 +1875,6 @@ workflows:
             - op-dispute-mon-docker-build
             - op-program-docker-build
             - op-supervisor-docker-build
-            - proofs-tools-docker-build
             - go-tests
             - sanitize-op-program
           context:
@@ -1893,7 +1892,6 @@ workflows:
                 - op-program
                 - op-proposer
                 - op-challenger
-                - proofs-tools
                 - op-dispute-mon
                 - op-conductor
                 - da-server
@@ -1974,7 +1972,7 @@ workflows:
           type: approval
           filters:
             tags:
-              only: /^(da-server|proofs-tools|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
+              only: /^(da-server|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/
             branches:
               ignore: /.*/
       # Standard (medium) cross-platform docker images go here
@@ -2041,27 +2039,6 @@ workflows:
             - op-dripper-docker-release
           context:
             - circleci-repo-readonly-authenticated-github-token
-      # Standard (xlarge) AMD-only docker images go here
-      - docker-build:
-          matrix:
-            parameters:
-              docker_name:
-                - proofs-tools
-          name: <<matrix.docker_name>>-docker-release
-          resource_class: xlarge
-          docker_tags: <<pipeline.git.revision>>
-          publish: true
-          release: true
-          filters:
-            tags:
-              only: /^<<matrix.docker_name>>\/v.*/
-            branches:
-              ignore: /.*/
-          context:
-            - oplabs-gcr-release
-            - discord
-          requires:
-            - hold
       - cannon-prestate:
           filters:
             tags:

docker-bake.hcl

@@ -7,7 +7,11 @@ variable "REPOSITORY" {
 }
 
 variable "KONA_VERSION" {
-  default = "kona-client-v0.1.0-beta.8"
+  default = "0.1.0-beta.15"
+}
+
+variable "ASTERISC_VERSION" {
+  default = "v1.2.0"
 }
 
 variable "GIT_COMMIT" {
@@ -129,6 +133,7 @@ target "op-challenger" {
     GIT_DATE = "${GIT_DATE}"
     OP_CHALLENGER_VERSION = "${OP_CHALLENGER_VERSION}"
     KONA_VERSION="${KONA_VERSION}"
+    ASTERISC_VERSION="${ASTERISC_VERSION}"
   }
   target = "op-challenger-target"
   platforms = split(",", PLATFORMS)
@@ -212,18 +217,6 @@ target "cannon" {
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/cannon:${tag}"]
 }
 
-target "proofs-tools" {
-  dockerfile = "./ops/docker/proofs-tools/Dockerfile"
-  context = "."
-  args = {
-    CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="${KONA_VERSION}"
-  }
-  target="proofs-tools"
-  platforms = split(",", PLATFORMS)
-  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/proofs-tools:${tag}"]
-}
-
 target "holocene-deployer" {
   dockerfile = "./packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile"
   context = "./packages/contracts-bedrock/scripts/upgrades/holocene"

kurtosis-devnet/justfile

@@ -57,10 +57,10 @@ _docker_build_stack TAG TARGET *ARGS: (_docker_build TAG TARGET "../" "ops/docke
 cannon-image TAG='cannon:devnet': (_docker_build_stack TAG "cannon-target")
 da-server-image TAG='da-server:devnet': (_docker_build_stack TAG "da-server-target")
 op-batcher-image TAG='op-batcher:devnet': (_docker_build_stack TAG "op-batcher-target")
-# TODO: this is a temporary hack to get the kona version right.
+# TODO: this is a temporary hack to get the kona + asterisc version right.
 # Ideally the Dockerfile should be self-sufficient (right now we depend on
 # docker-bake.hcl to do the right thing).
-op-challenger-image TAG='op-challenger:devnet': (_docker_build_stack TAG "op-challenger-target" "--build-arg" "KONA_VERSION=kona-client-v0.1.0-beta.6")
+op-challenger-image TAG='op-challenger:devnet': (_docker_build_stack TAG "op-challenger-target" "--build-arg" "KONA_VERSION=0.1.0-beta.15" "--build-arg" "ASTERISC_VERSION=v1.2.0")
 op-conductor-image TAG='op-conductor:devnet': (_docker_build_stack TAG "op-conductor-target")
 op-deployer-image TAG='op-deployer:devnet': (_docker_build_stack TAG "op-deployer-target")
 op-dispute-mon-image TAG='op-dispute-mon:devnet': (_docker_build_stack TAG "op-dispute-mon-target")

ops/docker/op-stack-go/Dockerfile

@@ -16,6 +16,10 @@ ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04
 # The only build that uses this is `op-challenger-target`.
 ARG KONA_VERSION=none
 
+# The version of asterisc to use.
+# The only build that uses this is `op-challenger-target`.
+ARG ASTERISC_VERSION=none
+
 # We may be cross-building for another platform. Specify which platform we need as builder.
 FROM --platform=$BUILDPLATFORM golang:1.22.7-alpine3.20 AS builder
 
@@ -158,8 +162,10 @@ FROM $TARGET_BASE_IMAGE AS op-node-target
 COPY --from=op-node-builder /app/op-node/bin/op-node /usr/local/bin/
 CMD ["op-node"]
 
-# Make the kona docker image published by upstream available as a source to copy kona and asterisc from.
-FROM ghcr.io/op-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
+# Make the kona docker image published by upstream available as a source to copy kona from.
+FROM ghcr.io/op-rs/kona/kona-host:$KONA_VERSION AS kona
+# Make the asterisc docker image published by upstream available as a source to copy asterisc from.
+FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/asterisc:$ASTERISC_VERSION AS asterisc
 
 # Also produce an op-challenger loaded with kona and asterisc using ubuntu
 FROM $UBUNTU_TARGET_BASE_IMAGE AS op-challenger-target
@@ -173,7 +179,7 @@ ENV OP_CHALLENGER_CANNON_BIN=/usr/local/bin/cannon
 # Copy in kona and asterisc
 COPY --from=kona /kona-host /usr/local/bin/
 ENV OP_CHALLENGER_ASTERISC_KONA_SERVER=/usr/local/bin/kona-host
-COPY --from=kona /asterisc /usr/local/bin/
+COPY --from=asterisc /usr/local/bin/asterisc /usr/local/bin/
 ENV OP_CHALLENGER_ASTERISC_BIN=/usr/local/bin/asterisc
 CMD ["op-challenger"]
 

ops/docker/proofs-tools/Dockerfile

@@ -6,7 +6,7 @@ DOCKER_REPO=$1
 GIT_TAG=$2
 GIT_SHA=$3
 
-IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(da-server|proofs-tools|holocene-deployer|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
+IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(da-server|holocene-deployer|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
 if [ -z "$IMAGE_NAME" ]; then
   echo "image name could not be parsed from git tag '$GIT_TAG'"
   exit 1