Merge branch 'upgrade/feynman' of github.com:scroll-tech/scroll into upgrade/feynman

update coordinator dockerfile
chore: auto version bump [bot]
2026-01-11 23:18:07 -05:00 · 2025-07-04 15:30:46 +08:00 · 2025-07-04 15:30:22 +08:00 · 2025-07-04 07:14:25 +00:00 · 2025-07-04 16:08:53 +09:00 · 2025-07-04 16:02:03 +09:00
14 changed files with 162 additions and 193 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8174,7 +8174,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "alloy-primitives",
 "base64 0.22.1",
@@ -8212,7 +8212,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "base64 0.22.1",
 "bincode",
@@ -8232,7 +8232,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-base"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "alloy-primitives",
 "alloy-serde 1.0.16",
@@ -8247,7 +8247,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-batch"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "alloy-primitives",
 "halo2curves-axiom",
@@ -8267,7 +8267,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-bundle"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "alloy-primitives",
 "itertools 0.14.0",
@@ -8280,7 +8280,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-types-chunk"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "alloy-primitives",
 "itertools 0.14.0",
@@ -8300,7 +8300,7 @@ dependencies = [
 [[package]]
 name = "scroll-zkvm-verifier"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/zkvm-prover?rev=2962428#29624289a052cbcf0e1c7f17e277034f6f5ad432"
+source = "git+https://github.com/scroll-tech/zkvm-prover?rev=0dd7b19#0dd7b19590b1b17c5ec5a97fc1b4f638dfd0ce8f"
 dependencies = [
 "bincode",
 "eyre",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll"
 version = "4.5.8"

 [workspace.dependencies]
-scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2962428", package = "scroll-zkvm-prover" }
-scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2962428", package = "scroll-zkvm-verifier" }
-scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2962428" }
+scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "0dd7b19", package = "scroll-zkvm-prover" }
+scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "0dd7b19", package = "scroll-zkvm-verifier" }
+scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "0dd7b19" }

 sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/upgrade", features = ["scroll"] }
 sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/upgrade" }
--- a/build/dockerfiles/coordinator-api.Dockerfile
+++ b/build/dockerfiles/coordinator-api.Dockerfile
@@ -3,7 +3,7 @@ FROM scrolltech/cuda-go-rust-builder:cuda-11.7.1-go-1.22.12-rust-nightly-2025-02
 WORKDIR app

 FROM chef as planner
-COPY ./crates ./
+COPY ./crates/ ./crates/
 COPY ./Cargo.* ./
 COPY ./rust-toolchain ./
 RUN cargo chef prepare --recipe-path recipe.json
@@ -19,7 +19,7 @@ COPY ./build/dockerfiles/coordinator-api/gitconfig /root/.gitconfig
 COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml
 RUN cargo chef cook --release --recipe-path recipe.json

-COPY ./crates ./
+COPY ./crates/ ./crates/
 COPY ./Cargo.* ./
 RUN cargo build --release -p libzkp-c

--- a/build/dockerfiles/coordinator-api/checkout_all.sh
+++ b/build/dockerfiles/coordinator-api/checkout_all.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -uex

-PLONKY3_GPU_COMMIT=261b322        # v0.2.0
-OPENVM_STARK_GPU_COMMIT=3082234   # PR#48
-OPENVM_GPU_COMMIT=8094b4f         # branch: patch-v1.2.0
+PLONKY3_GPU_COMMIT=450ec18        # feynman
+OPENVM_STARK_GPU_COMMIT=e3b2d6    # branch: sync/upstream-250702
+OPENVM_GPU_COMMIT=75df915    # branch: patch-v1.2.1-rc.1-pipe

 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)

--- a/build/dockerfiles/coordinator-api/config.toml
+++ b/build/dockerfiles/coordinator-api/config.toml
@@ -1,27 +1,53 @@
 # openvm
 # same order and features as zkvm-prover/Cargo.toml.gpu
-[patch."ssh://git@github.com/scroll-tech/openvm-gpu.git"]
-openvm = { path = "/openvm-gpu/crates/toolchain/openvm", default-features = false }
-openvm-algebra-complex-macros = { path = "/openvm-gpu/extensions/algebra/complex-macros", default-features = false }
-openvm-algebra-guest = { path = "/openvm-gpu/extensions/algebra/guest", default-features = false }
-openvm-bigint-guest = { path = "/openvm-gpu/extensions/bigint/guest", default-features = false }
+[patch."https://github.com/openvm-org/openvm.git"]
 openvm-build = { path = "/openvm-gpu/crates/toolchain/build", default-features = false }
 openvm-circuit = { path = "/openvm-gpu/crates/vm", default-features = false }
-openvm-custom-insn = { path = "/openvm-gpu/crates/toolchain/custom_insn", default-features = false }
 openvm-continuations = { path = "/openvm-gpu/crates/continuations", default-features = false }
-openvm-ecc-guest = { path = "/openvm-gpu/extensions/ecc/guest", default-features = false }
 openvm-instructions ={ path = "/openvm-gpu/crates/toolchain/instructions", default-features = false }
-openvm-keccak256-guest = { path = "/openvm-gpu/extensions/keccak256/guest", default-features = false }
 openvm-native-circuit = { path = "/openvm-gpu/extensions/native/circuit", default-features = false }
 openvm-native-compiler = { path = "/openvm-gpu/extensions/native/compiler", default-features = false }
 openvm-native-recursion = { path = "/openvm-gpu/extensions/native/recursion", default-features = false }
 openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", default-features = false }
-openvm-pairing-guest = { path = "/openvm-gpu/extensions/pairing/guest", default-features = false }
-openvm-rv32im-guest = { path = "/openvm-gpu/extensions/rv32im/guest", default-features = false }
 openvm-rv32im-transpiler = { path = "/openvm-gpu/extensions/rv32im/transpiler", default-features = false }
 openvm-sdk = { path = "/openvm-gpu/crates/sdk", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
-openvm-sha256-guest = { path = "/openvm-gpu/extensions/sha256/guest", default-features = false }
 openvm-transpiler = { path = "/openvm-gpu/crates/toolchain/transpiler", default-features = false }
+# implicit dep
+openvm = { path = "/openvm-gpu/crates/toolchain/openvm", default-features = false }
+openvm-algebra-complex-macros = { path = "/openvm-gpu/extensions/algebra/complex-macros", default-features = false }
+openvm-algebra-guest = { path = "/openvm-gpu/extensions/algebra/guest", default-features = false }
+openvm-bigint-guest = { path = "/openvm-gpu/extensions/bigint/guest", default-features = false }
+openvm-custom-insn = { path = "/openvm-gpu/crates/toolchain/custom_insn", default-features = false }
+openvm-ecc-guest = { path = "/openvm-gpu/extensions/ecc/guest", default-features = false }
+openvm-keccak256-guest = { path = "/openvm-gpu/extensions/keccak256/guest", default-features = false }
+openvm-pairing-guest = { path = "/openvm-gpu/extensions/pairing/guest", default-features = false }
+openvm-rv32im-guest = { path = "/openvm-gpu/extensions/rv32im/guest", default-features = false }
+openvm-sha256-guest = { path = "/openvm-gpu/extensions/sha256/guest", default-features = false }
+
+[patch."ssh://git@github.com/scroll-tech/openvm-gpu.git"]
+openvm-build = { path = "/openvm-gpu/crates/toolchain/build", default-features = false }
+openvm-circuit = { path = "/openvm-gpu/crates/vm", default-features = false }
+openvm-continuations = { path = "/openvm-gpu/crates/continuations", default-features = false }
+openvm-instructions ={ path = "/openvm-gpu/crates/toolchain/instructions", default-features = false }
+openvm-native-circuit = { path = "/openvm-gpu/extensions/native/circuit", default-features = false }
+openvm-native-compiler = { path = "/openvm-gpu/extensions/native/compiler", default-features = false }
+openvm-native-recursion = { path = "/openvm-gpu/extensions/native/recursion", default-features = false }
+openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", default-features = false }
+openvm-rv32im-transpiler = { path = "/openvm-gpu/extensions/rv32im/transpiler", default-features = false }
+openvm-sdk = { path = "/openvm-gpu/crates/sdk", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
+openvm-transpiler = { path = "/openvm-gpu/crates/toolchain/transpiler", default-features = false }
+# implicit dep
+openvm = { path = "/openvm-gpu/crates/toolchain/openvm", default-features = false }
+openvm-algebra-complex-macros = { path = "/openvm-gpu/extensions/algebra/complex-macros", default-features = false }
+openvm-algebra-guest = { path = "/openvm-gpu/extensions/algebra/guest", default-features = false }
+openvm-bigint-guest = { path = "/openvm-gpu/extensions/bigint/guest", default-features = false }
+openvm-custom-insn = { path = "/openvm-gpu/crates/toolchain/custom_insn", default-features = false }
+openvm-ecc-guest = { path = "/openvm-gpu/extensions/ecc/guest", default-features = false }
+openvm-keccak256-guest = { path = "/openvm-gpu/extensions/keccak256/guest", default-features = false }
+openvm-pairing-guest = { path = "/openvm-gpu/extensions/pairing/guest", default-features = false }
+openvm-rv32im-guest = { path = "/openvm-gpu/extensions/rv32im/guest", default-features = false }
+openvm-sha256-guest = { path = "/openvm-gpu/extensions/sha256/guest", default-features = false }
+

 # stark-backend
 [patch."https://github.com/openvm-org/stark-backend.git"]
@@ -38,7 +64,9 @@ p3-air = { path = "/plonky3-gpu/air" }
 p3-field = { path = "/plonky3-gpu/field" }
 p3-commit = { path = "/plonky3-gpu/commit" }
 p3-matrix = { path = "/plonky3-gpu/matrix" }
-p3-baby-bear = { path = "/plonky3-gpu/baby-bear" }
+p3-baby-bear = { path = "/plonky3-gpu/baby-bear", features = [
+    "nightly-features",
+]}
 p3-koala-bear = { path = "/plonky3-gpu/koala-bear" }
 p3-util = { path = "/plonky3-gpu/util" }
 p3-challenger = { path = "/plonky3-gpu/challenger" }
@@ -49,8 +77,8 @@ p3-keccak = { path = "/plonky3-gpu/keccak" }
 p3-keccak-air = { path = "/plonky3-gpu/keccak-air" }
 p3-blake3 = { path = "/plonky3-gpu/blake3" }
 p3-mds = { path = "/plonky3-gpu/mds" }
-p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
 p3-merkle-tree = { path = "/plonky3-gpu/merkle-tree" }
+p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
 p3-poseidon = { path = "/plonky3-gpu/poseidon" }
 p3-poseidon2 = { path = "/plonky3-gpu/poseidon2" }
 p3-poseidon2-air = { path = "/plonky3-gpu/poseidon2-air" }
@@ -58,19 +86,22 @@ p3-symmetric = { path = "/plonky3-gpu/symmetric" }
 p3-uni-stark = { path = "/plonky3-gpu/uni-stark" }
 p3-maybe-rayon = { path = "/plonky3-gpu/maybe-rayon" }
 p3-bn254-fr = { path = "/plonky3-gpu/bn254-fr" }
-
-# gpu crates
-[patch."ssh://git@github.com/scroll-tech/plonky3-gpu.git"]
+# scroll gpu
+p3-gpu-backend = { path = "/plonky3-gpu/gpu-backend" }
 p3-gpu-base = { path = "/plonky3-gpu/gpu-base" }
 p3-gpu-build = { path = "/plonky3-gpu/gpu-build" }
 p3-gpu-field = { path = "/plonky3-gpu/gpu-field" }
-p3-gpu-backend = { path = "/plonky3-gpu/gpu-backend" }
 p3-gpu-module = { path = "/plonky3-gpu/gpu-module" }
+
+# gpu crates
+[patch."ssh://git@github.com/scroll-tech/plonky3-gpu.git"]
 p3-air = { path = "/plonky3-gpu/air" }
 p3-field = { path = "/plonky3-gpu/field" }
 p3-commit = { path = "/plonky3-gpu/commit" }
 p3-matrix = { path = "/plonky3-gpu/matrix" }
-p3-baby-bear = { path = "/plonky3-gpu/baby-bear" }
+p3-baby-bear = { path = "/plonky3-gpu/baby-bear", features = [
+    "nightly-features",
+]}
 p3-koala-bear = { path = "/plonky3-gpu/koala-bear" }
 p3-util = { path = "/plonky3-gpu/util" }
 p3-challenger = { path = "/plonky3-gpu/challenger" }
@@ -81,8 +112,8 @@ p3-keccak = { path = "/plonky3-gpu/keccak" }
 p3-keccak-air = { path = "/plonky3-gpu/keccak-air" }
 p3-blake3 = { path = "/plonky3-gpu/blake3" }
 p3-mds = { path = "/plonky3-gpu/mds" }
-p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
 p3-merkle-tree = { path = "/plonky3-gpu/merkle-tree" }
+p3-monty-31 = { path = "/plonky3-gpu/monty-31" }
 p3-poseidon = { path = "/plonky3-gpu/poseidon" }
 p3-poseidon2 = { path = "/plonky3-gpu/poseidon2" }
 p3-poseidon2-air = { path = "/plonky3-gpu/poseidon2-air" }
@@ -90,3 +121,9 @@ p3-symmetric = { path = "/plonky3-gpu/symmetric" }
 p3-uni-stark = { path = "/plonky3-gpu/uni-stark" }
 p3-maybe-rayon = { path = "/plonky3-gpu/maybe-rayon" }
 p3-bn254-fr = { path = "/plonky3-gpu/bn254-fr" }
+# scroll gpu
+p3-gpu-backend = { path = "/plonky3-gpu/gpu-backend" }
+p3-gpu-base = { path = "/plonky3-gpu/gpu-base" }
+p3-gpu-build = { path = "/plonky3-gpu/gpu-build" }
+p3-gpu-field = { path = "/plonky3-gpu/gpu-field" }
+p3-gpu-module = { path = "/plonky3-gpu/gpu-module" }
--- a/common/version/version.go
+++ b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )

-var tag = "v4.5.26"
+var tag = "v4.5.27"

 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
--- a/crates/gpu_override/.cargo/config.toml
+++ b/crates/gpu_override/.cargo/config.toml
@@ -0,0 +1,45 @@
+
+[patch."https://github.com/openvm-org/openvm.git"]
+openvm-build = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-circuit = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-continuations = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-instructions ={ git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-native-circuit = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-native-compiler = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-native-recursion = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-native-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-rv32im-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+openvm-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] }
+openvm-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-gpu.git", branch = "patch-v1.2.1-rc.1-pipe", default-features = false }
+
+[patch."https://github.com/openvm-org/stark-backend.git"]
+openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "sync/upstream-250702", features = ["gpu"] }
+openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "sync/upstream-250702", features = ["gpu"] }
+
+[patch."https://github.com/Plonky3/Plonky3.git"]
+p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", features = [
+    "nightly-features",
+], rev = "450ec18" }
+p3-koala-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
+p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking
+p3-bn254-fr = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", rev = "450ec18" }
--- a/crates/prover-bin/.cargo/config.toml
+++ b/crates/prover-bin/.cargo/config.toml
@@ -1,32 +0,0 @@
-
-[patch."https://github.com/openvm-org/stark-backend.git"]
-openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] }
-openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] }
-
-[patch."https://github.com/Plonky3/Plonky3.git"]
-p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", features = [
-    "nightly-features",
-], tag = "v0.2.0" }
-p3-koala-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
-p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking
-p3-bn254-fr = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.2.0" }
--- a/zkvm-prover/.work/.gitignore
+++ b/zkvm-prover/.work/.gitignore
@@ -1,7 +1,9 @@
 *.vmexe
+openvm.toml
 *.bin
 *.sol
 cache
 db
 *.json
-?
+?
+root-verifier*
--- a/zkvm-prover/.work/batch/openvm.toml
+++ b/zkvm-prover/.work/batch/openvm.toml
@@ -1,35 +0,0 @@
-[app_fri_params.fri_params]
-log_blowup = 1
-log_final_poly_len = 0
-num_queries = 100
-proof_of_work_bits = 16
-
-[app_vm_config.rv32i]
-
-[app_vm_config.rv32m]
-
-[app_vm_config.io]
-
-[app_vm_config.keccak]
-
-[app_vm_config.castf]
-
-[app_vm_config.modular]
-supported_moduli = [
-    "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787",
-    "52435875175126190479447740508185965837690552500527637822603658699938581184513",
-]
-[app_vm_config.native]
-[app_vm_config.pairing]
-supported_curves = ["Bls12_381"]
-[app_vm_config.sha256]
-[app_vm_config.fp2]
-supported_moduli = [
-    ["Bls12_381Fp2","4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787"]
-]
-[[app_vm_config.ecc.supported_curves]]
-struct_name = "Bls12_381G1Affine"
-modulus = "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787"
-scalar = "52435875175126190479447740508185965837690552500527637822603658699938581184513"
-a = "0"
-b = "4"
--- a/zkvm-prover/.work/bundle/openvm.toml
+++ b/zkvm-prover/.work/bundle/openvm.toml
@@ -1,17 +0,0 @@
-[app_fri_params.fri_params]
-log_blowup = 1
-log_final_poly_len = 0
-num_queries = 100
-proof_of_work_bits = 16
-
-[app_vm_config.rv32i]
-
-[app_vm_config.rv32m]
-
-[app_vm_config.io]
-
-[app_vm_config.keccak]
-
-[app_vm_config.castf]
-
-[app_vm_config.native]
--- a/zkvm-prover/.work/chunk/openvm.toml
+++ b/zkvm-prover/.work/chunk/openvm.toml
@@ -1,58 +0,0 @@
-[app_fri_params.fri_params]
-log_blowup = 1
-log_final_poly_len = 0
-num_queries = 100
-proof_of_work_bits = 16
-
-[app_vm_config.rv32i]
-
-[app_vm_config.io]
-
-[app_vm_config.keccak]
-
-[app_vm_config.rv32m]
-range_tuple_checker_sizes = [256, 8192]
-
-[app_vm_config.bigint]
-range_tuple_checker_sizes = [256, 8192]
-
-[app_vm_config.modular]
-supported_moduli = [
-    "21888242871839275222246405745257275088696311157297823662689037894645226208583", 
-    "21888242871839275222246405745257275088548364400416034343698204186575808495617", 
-    "115792089237316195423570985008687907853269984665640564039457584007908834671663", 
-    "115792089237316195423570985008687907852837564279074904382605163141518161494337",
-    "115792089210356248762697446949407573530086143415290314195533631308867097853951",
-    "115792089210356248762697446949407573529996955224135760342422259061068512044369"
-]
-
-[app_vm_config.fp2]
-supported_moduli = [
-    ["Bn254Fp2","21888242871839275222246405745257275088696311157297823662689037894645226208583"]
-]
-
-[app_vm_config.pairing]
-supported_curves = ["Bn254"]
-
-[app_vm_config.sha256]
-
-[[app_vm_config.ecc.supported_curves]]
-struct_name = "Secp256k1Point"
-modulus = "115792089237316195423570985008687907853269984665640564039457584007908834671663"
-scalar = "115792089237316195423570985008687907852837564279074904382605163141518161494337"
-a = "0"
-b = "7"
-
-[[app_vm_config.ecc.supported_curves]]
-struct_name = "P256Point"
-modulus = "115792089210356248762697446949407573530086143415290314195533631308867097853951"
-scalar = "115792089210356248762697446949407573529996955224135760342422259061068512044369"
-a = "115792089210356248762697446949407573530086143415290314195533631308867097853948"
-b = "41058363725152142129326129780047268409114441015993725554835256314039467401291"
-
-[[app_vm_config.ecc.supported_curves]]
-struct_name = "Bn254G1Affine"
-modulus = "21888242871839275222246405745257275088696311157297823662689037894645226208583"
-scalar = "21888242871839275222246405745257275088548364400416034343698204186575808495617"
-a = "0"
-b = "3"
--- a/zkvm-prover/Makefile
+++ b/zkvm-prover/Makefile
@@ -21,7 +21,7 @@ endif
 ZKVM_COMMIT=$(shell echo ${ZKVM_VERSION} | cut -d " " -f2)
 $(info ZKVM_COMMIT is ${ZKVM_COMMIT})

-PLONKY3_GPU_VERSION=$(shell ./print_plonky3gpu_version.sh | sed -n '2p')
+#PLONKY3_GPU_VERSION=$(shell ./print_plonky3gpu_version.sh | sed -n '2p')

 GIT_REV=$(shell git rev-parse --short HEAD)
 GO_TAG=$(shell grep "var tag = " ../common/version/version.go | cut -d "\"" -f2)
@@ -32,16 +32,27 @@ else
    $(info GO_TAG is ${GO_TAG})
 endif

-ifeq (${PLONKY3_GPU_VERSION},)
-	# use plonky3 with CPU
-    ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_VERSION}
-else
-	# use halo2_gpu
-    ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_GPU_VERSION}
-endif
+ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_VERSION}
+#ifeq (${PLONKY3_GPU_VERSION},)
+#	# use plonky3 with CPU
+#    ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_VERSION}
+#else
+#	# use gpu
+#    ZK_VERSION=${ZKVM_COMMIT}-${PLONKY3_GPU_VERSION}
+#endif
+
+prover_gpu:
+	cd ../crates/gpu_override && cargo tree >/dev/null
+	$(eval PLONKY3_GPU_VERSION:=$(shell ./print_plonky3gpu_version.sh | sed -n '2p'))
+	$(eval ZK_VERSION:=${ZKVM_COMMIT}-${PLONKY3_GPU_VERSION})
+	@echo "Updated ZK_VERSION to ${ZK_VERSION} after prover_gpu"
+
+prover: prover_gpu
+	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cd ../crates/gpu_override && cargo build --release -p prover
+
+prover_cpu:
+	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cargo build --release -p prover

-prover:
-	GO_TAG=${GO_TAG} GIT_REV=${GIT_REV} ZK_VERSION=${ZK_VERSION} cd ../crates/prover-bin && cargo build --release

 tests_binary:
 	cargo clean && cargo test --release --no-run
--- a/zkvm-prover/download-release.sh
+++ b/zkvm-prover/download-release.sh
@@ -1,20 +1,36 @@
 #!/bin/bash

+# Define version mapping
+declare -A VERSION_MAP
+VERSION_MAP["euclid"]="0.4.3"
+VERSION_MAP["feynman"]="0.5.0rc0"
+
 # release version
 if [ -z "${SCROLL_ZKVM_VERSION}" ]; then
-    SCROLL_ZKVM_VERSION=$($SHELL ./print_high_zkvm_version.sh | cut -d' ' -f1|cut -c2-)
+    
+    # Check if first argument is provided and matches a known version name
+    if [ -n "$1" ] && [ -n "${VERSION_MAP[$1]}" ]; then
+        SCROLL_ZKVM_VERSION=${VERSION_MAP[$1]}
+        echo "Setting SCROLL_ZKVM_VERSION to ${SCROLL_ZKVM_VERSION} based on '$1' argument"
+    else
+        # Default version if no argument or not recognized
+        SCROLL_ZKVM_VERSION=0.5.0rc0
+    fi
 fi

 echo $SCROLL_ZKVM_VERSION

+mkdir -p .work/chunk
+mkdir -p .work/batch
+mkdir -p .work/bundle
+
 # chunk-circuit exe
 wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/chunk/app.vmexe -O .work/chunk/app.vmexe
-
+wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/chunk/openvm.toml -O .work/chunk/openvm.toml
 # batch-circuit exe
 wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/batch/app.vmexe -O .work/batch/app.vmexe
-
+wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/batch/openvm.toml -O .work/batch/openvm.toml
 # bundle-circuit exe
 wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/bundle/app.vmexe -O .work/bundle/app.vmexe
+wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/bundle/openvm.toml -O .work/bundle/openvm.toml

-# bundle-circuit exe, legacy version, may not exist
-wget https://circuit-release.s3.us-west-2.amazonaws.com/scroll-zkvm/releases/$SCROLL_ZKVM_VERSION/bundle/app_euclidv1.vmexe -O .work/bundle/app_euclidv1.vmexe || echo "legacy app not exist for $SCROLL_ZKVM_VERSION"
Author	SHA1	Message	Date
georgehao	bffaf279e1	Merge branch 'upgrade/feynman' of github.com:scroll-tech/scroll into upgrade/feynman	2025-07-04 15:30:46 +08:00
georgehao	0d64958159	update coordinator dockerfile	2025-07-04 15:30:22 +08:00
georgehao	72ead7e108	chore: auto version bump [bot]	2025-07-04 07:14:25 +00:00
Ho	8f6cbc49ec	resume openvm gpu dep (implicit)	2025-07-04 16:08:53 +09:00
Ho	e92a15080a	more gpu dep for docker build	2025-07-04 16:02:03 +09:00
Ho	654cd42852	update gpu dep	2025-07-04 15:55:35 +09:00
Ho	0e1d3e4760	revert dockerfile	2025-07-04 14:01:02 +09:00
Ho	5d8705a720	update docker file	2025-07-04 13:41:09 +09:00
Ho	b6087286b4	move gpu override, update scripts	2025-07-04 13:15:53 +09:00
Ho	0382099409	more convenient for download release	2025-07-04 12:12:57 +09:00
Ho	e53d4311f9	upgrade gpu dep	2025-07-04 12:05:51 +09:00
Ho	824b2e9c78	upgrade dep	2025-07-04 12:00:19 +09:00
Ho	b036d76fca	Merge remote-tracking branch 'origin/develop' into upgrade/feynman	2025-07-04 11:58:13 +09:00
Ho	f6345c83c8	remove openvm.toml (download directly)	2025-07-04 09:19:25 +09:00