Merge branch 'jt/permissionless-batches-recovery' of github.com:scroll-tech/scroll into jt/permissionless-batches-recovery

Author: jonastheis

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.5.29"
+var tag = "v4.5.30"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

permissionless-batches/Makefile

@@ -1,16 +1,13 @@
-.PHONY: batch-production-submission launch_local_prover launch_cloud_prover psql check_proving_status
+.PHONY: batch_production_submission launch_prover psql check_proving_status
 
-export SCROLL_ZKVM_VERSION=0.3.0
+export SCROLL_ZKVM_VERSION=0.4.2
 PG_URL=postgres://postgres@localhost:5432/scroll
 
 batch_production_submission:
 	docker compose --profile batch-production-submission up
 
-local_prover:
-	docker compose --profile local-prover up -d
-
-cloud_prover:
-	docker compose --profile cloud-prover up
+launch_prover:
+	docker compose up -d
 
 psql:
 	psql 'postgres://postgres@localhost:5432/scroll'

permissionless-batches/README.md

@@ -19,7 +19,7 @@ The batch production toolkit is a set of tools that allow anyone to submit a bat
 - Docker
 - [l2geth](https://github.com/scroll-tech/go-ethereum/) or [Docker image](https://hub.docker.com/r/scrolltech/l2geth) of corresponding version [TODO link list with versions](#batch-production-toolkit).
 - access to an Ethereum L1 RPC node (beacon node and execution client)
-- ability to run a prover or access to a proving service (e.g. Sindri)
+- ability to run a prover
 - L1 account with funds to pay for the batch submission
 
 ### 1. l2geth state recovery from L1
@@ -74,7 +74,6 @@ Running l2geth in block production mode requires following configuration:
 --da.sync=true --da.recovery --da.recovery.produceblocks \
 --miner.gaslimit 1 --miner.gasprice 1 --miner.maxaccountsnum 100 --rpc.gascap 0 --gpo.ignoreprice 1 \
 --miner.etherbase '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' --mine \
---ccc \
 --verbosity 3
 ```
 
@@ -95,28 +94,16 @@ This will produce chunks, a batch and bundle which will be proven in the next st
 `Success! You're ready to generate proofs!` indicates that everything is working correctly and the batch is ready to be proven.
 
 #### Proving a batch
-To prove the chunk, batch and bundle you just generated you need to run the `local-prover` or `cloud-prover` profile in `docker-compose.yml`.
+To prove the chunk, batch and bundle you just generated you need to run the `prover` profile in `docker-compose.yml`.
 
 Local Proving:
 
-1. Hardware spec for local prover: CPU: 36+ core, 128G memory GPU: 24G memory (eg. Rtx 3090/3090Ti/4090/A10/L4)
-2. Make sure `verifier` `low_version_circuit` and `high_version_circuit` in `conf/coordinator/config.json` are correct for the latest fork: [TODO link list with versions](#batch-production-toolkit)
+1. Hardware spec for local prover: CPU: 36+ core, 128G memory GPU: 24G memory (e.g. Rtx 3090/3090Ti/4090/A10/L4)
+2. Make sure `verifier` and `high_version_circuit` in `conf/coordinator/config.json` are correct for the latest fork: [TODO link list with versions](#batch-production-toolkit)
 2. Set the `SCROLL_ZKVM_VERSION` environment variable on `Makefile` to the correct version. [TODO link list with versions](#batch-production-toolkit)
-4. Fill in the required fields in `conf/proving-service/local-prover/config.json`
+4. Fill in the required fields in `conf/proving-service/config.json`
 
-Run with `make local_prover`.
-
-Cloud Proving(not supported yet):
-
-1. Make sure `verifier` `low_version_circuit` and `high_version_circuit` in `conf/coordinator/config.json` are correct for the latest fork: [TODO link list with versions](#batch-production-toolkit)
-2. Set the `SCROLL_ZKVM_VERSION` environment variable on `Makefile` to the correct version. [TODO link list with versions](#batch-production-toolkit)
-3. Fill in the required fields in `conf/proving-service/cloud-prover/config.json`. It is recommended to use Sindri. You'll need to obtain credits and an API key from their [website](https://sindri.app/).
-
-Run with `make cloud_prover`.
-
-This will prove chunks, the batch and bundle.
-Run `make check_proving_status`
-`Success! You're ready to submit permissionless batch and proof!` indicates that everything is working correctly and the batch is ready to be submit.
+Run with `make launch_prover`.
 
 
 #### Batch submission

permissionless-batches/conf/coordinator/config.json

@@ -6,13 +6,6 @@
     "batch_collection_time_sec": 2700,
     "bundle_collection_time_sec": 2700,
     "verifier": {
-      "mock_mode": false,
-      "low_version_circuit" : {
-        "fork_name": "darwinV2",
-        "params_path": "/verifier/params",
-        "assets_path": "/verifier/assets",
-        "min_prover_version": "v4.4.56"
-      },
       "high_version_circuit" : {
         "fork_name": "euclid",
         "assets_path": "/verifier/openvm/verifier",

permissionless-batches/conf/coordinator/coordinator_run.sh

@@ -35,69 +35,18 @@ BASE_DOWNLOAD_DIR="/verifier"
 mkdir -p "$BASE_DOWNLOAD_DIR"
 
 # Set subdirectories
-ASSETS_DIR="$BASE_DOWNLOAD_DIR/assets"
 OPENVM_DIR="$BASE_DOWNLOAD_DIR/openvm"
 
 # Create necessary directories
-mkdir -p "$ASSETS_DIR"
 mkdir -p "$OPENVM_DIR/verifier"
 
-# Define URLs for asset files
-ASSETS_CHECKSUM_URL="https://circuit-release.s3.us-west-2.amazonaws.com/release-v0.13.1/sha256sum"
-ASSETS_CHECKSUM_FILE="$ASSETS_DIR/sha256sum"
-
-ASSETS_URLS=(
-  "https://circuit-release.s3.us-west-2.amazonaws.com/release-v0.13.1/vk_batch.vkey"
-  "https://circuit-release.s3.us-west-2.amazonaws.com/release-v0.13.1/vk_bundle.vkey"
-  "https://circuit-release.s3.us-west-2.amazonaws.com/release-v0.13.1/vk_chunk.vkey"
-)
-
 # Define URLs for OpenVM files (No checksum verification)
 OPENVM_URLS=(
   "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/verifier/verifier.bin"
   "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/verifier/root-verifier-vm-config"
   "https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/verifier/root-verifier-committed-exe"
 )
 
-# Function to download and verify files (skips existing valid files)
-download_and_verify() {
-  local url="$1"
-  local dest_dir="$2"
-  local checksum_file="$3"
-
-  local filename=$(basename "$url")
-  local filepath="$dest_dir/$filename"
-
-  if [[ -f "$filepath" ]]; then
-    echo "Checking existing file: $filename..."
-    if grep "$filename" "$checksum_file" | sed "s|$filename|$filepath|" | sha256sum --check --status; then
-      echo "File is already present and valid ✅ - Skipping download."
-      return
-    else
-      echo "File exists but checksum mismatch ❌ - Re-downloading."
-      rm -f "$filepath"
-    fi
-  fi
-
-  echo "Downloading $filename..."
-  curl -o "$filepath" -L "$url"
-
-  if [[ ! -f "$filepath" ]]; then
-    echo "Download failed for $filename ❌"
-    exit 1
-  fi
-
-  echo "Verifying checksum for $filename..."
-  grep "$filename" "$checksum_file" | sed "s|$filename|$filepath|" | sha256sum --check --status || exit 1
-  echo "Checksum verification passed for $filename ✅"
-}
-
-# Download and verify asset files
-curl -o "$ASSETS_CHECKSUM_FILE" -L "$ASSETS_CHECKSUM_URL"
-for url in "${ASSETS_URLS[@]}"; do
-  download_and_verify "$url" "$ASSETS_DIR" "$ASSETS_CHECKSUM_FILE"
-done
-
 # Download OpenVM files (No checksum verification, but skips if file exists)
 for url in "${OPENVM_URLS[@]}"; do
   dest_subdir="$OPENVM_DIR/$(basename $(dirname "$url"))"

permissionless-batches/conf/proving-service/cloud-prover/.gitkeep

@@ -52,4 +52,3 @@ chmod +x /usr/local/bin/solc
 mkdir -p /openvm/cache
 
 RUST_MIN_STACK=16777216 RUST_BACKTRACE=1 exec /prover/prover --config /prover/conf/config.json
-

permissionless-batches/conf/proving-service/cloud-prover/config.json

@@ -34,7 +34,7 @@ services:
       - "5432:5432"
 
   coordinator-api:
-    image: scrolltech/coordinator-api:v4.5.7
+    image: scrolltech/coordinator-api:v4.5.19
     volumes:
       - ./conf/coordinator/config.json:/coordinator/config.json:ro
       - ./conf/genesis.json:/coordinator/genesis.json:ro
@@ -74,39 +74,22 @@ services:
         condition: service_healthy
 
   local-prover:
-    image: scrolltech/cuda-prover:v4.5.7-a18fe064-fcc09d1-9174aff
+    image: scrolltech/cuda-prover:v4.5.12-97de9882-6ad5d8c-261b322
     network_mode: host
     platform: linux/amd64
     runtime: nvidia
     entrypoint: /bin/prover_run.sh
-    profiles:
-      - local-prover
     environment:
       - SCROLL_ZKVM_VERSION=${SCROLL_ZKVM_VERSION}
       - LD_LIBRARY_PATH=/prover:/usr/local/cuda/lib64
       - RUST_MIN_STACK=16777216
       - RUST_BACKTRACE=1
       - RUST_LOG=info
     volumes:
-      - ./conf/proving-service/local-prover/config.json:/prover/conf/config.json:ro
-      - ./conf/proving-service/local-prover/prover_run.sh:/bin/prover_run.sh
-      - ./conf/proving-service/local-prover/db:/db
-      - ./conf/proving-service/local-prover/keys:/keys
-    depends_on:
-      coordinator-api:
-        condition: service_healthy
-
-  cloud-prover:
-    image: scrolltech/sdk-cloud-prover:sindri-v0.0.5
-    platform: linux/amd64
-    command: "--config /app/config.json"
-    profiles:
-      - cloud-prover
-    environment:
-      -  N_WORKERS=1
-    volumes:
-      - ./conf/proving-service/chunk/:/app/
-      - ./conf/proving-service/config.json:/app/config.json
+      - ./conf/proving-service/config.json:/prover/conf/config.json:ro
+      - ./conf/proving-service/prover_run.sh:/bin/prover_run.sh
+      - ./conf/proving-service/db:/db
+      - ./conf/proving-service/keys:/keys
     depends_on:
       coordinator-api:
         condition: service_healthy