From f6345c83c8bc243922ffa88ca04ae9c7ad6c9e9f Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 09:19:25 +0900 Subject: [PATCH 01/16] remove openvm.toml (download directly) --- zkvm-prover/.work/.gitignore | 1 + zkvm-prover/.work/batch/openvm.toml | 35 ----------------- zkvm-prover/.work/bundle/openvm.toml | 17 -------- zkvm-prover/.work/chunk/openvm.toml | 58 ---------------------------- 4 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 zkvm-prover/.work/batch/openvm.toml delete mode 100644 zkvm-prover/.work/bundle/openvm.toml delete mode 100644 zkvm-prover/.work/chunk/openvm.toml diff --git a/zkvm-prover/.work/.gitignore b/zkvm-prover/.work/.gitignore index b928870525..f0cc013a97 100644 --- a/zkvm-prover/.work/.gitignore +++ b/zkvm-prover/.work/.gitignore @@ -1,4 +1,5 @@ *.vmexe +openvm.toml *.bin *.sol cache diff --git a/zkvm-prover/.work/batch/openvm.toml b/zkvm-prover/.work/batch/openvm.toml deleted file mode 100644 index 3222ad82df..0000000000 --- a/zkvm-prover/.work/batch/openvm.toml +++ /dev/null @@ -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" diff --git a/zkvm-prover/.work/bundle/openvm.toml b/zkvm-prover/.work/bundle/openvm.toml deleted file mode 100644 index 9b9590e638..0000000000 --- a/zkvm-prover/.work/bundle/openvm.toml +++ /dev/null @@ -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] \ No newline at end of file diff --git a/zkvm-prover/.work/chunk/openvm.toml b/zkvm-prover/.work/chunk/openvm.toml deleted file mode 100644 index 4e99c1cbc8..0000000000 --- a/zkvm-prover/.work/chunk/openvm.toml +++ /dev/null @@ -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" From 824b2e9c787022e70178d6d6212cf830c4079ac0 Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 12:00:19 +0900 Subject: [PATCH 02/16] upgrade dep --- Cargo.lock | 14 +++++++------- Cargo.toml | 6 +++--- zkvm-prover/.work/.gitignore | 3 ++- zkvm-prover/download-release.sh | 15 ++++++++++----- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82adefa8f5..fb42386547 100644 --- 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", diff --git a/Cargo.toml b/Cargo.toml index f7c5e8daeb..f02a3ebdba 100644 --- 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" } diff --git a/zkvm-prover/.work/.gitignore b/zkvm-prover/.work/.gitignore index f0cc013a97..ca77ed9a98 100644 --- a/zkvm-prover/.work/.gitignore +++ b/zkvm-prover/.work/.gitignore @@ -5,4 +5,5 @@ openvm.toml cache db *.json -? \ No newline at end of file +? +root-verifier* \ No newline at end of file diff --git a/zkvm-prover/download-release.sh b/zkvm-prover/download-release.sh index ce17d95795..5f14ce1b10 100644 --- a/zkvm-prover/download-release.sh +++ b/zkvm-prover/download-release.sh @@ -2,19 +2,24 @@ # release version if [ -z "${SCROLL_ZKVM_VERSION}" ]; then - SCROLL_ZKVM_VERSION=$($SHELL ./print_high_zkvm_version.sh | cut -d' ' -f1|cut -c2-) +# before we use version tag for zkvm, we can not acquire the correct version of zkvm from script +# SCROLL_ZKVM_VERSION=$($SHELL ./print_high_zkvm_version.sh | cut -d' ' -f1|cut -c2-) + SCROLL_ZKVM_VERSION=0.5.0rc0 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" From e53d4311f955ff2adee6860c1d75435aa731356a Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 12:05:51 +0900 Subject: [PATCH 03/16] upgrade gpu dep --- crates/prover-bin/.cargo/config.toml | 65 +++++++++++++++++----------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/crates/prover-bin/.cargo/config.toml b/crates/prover-bin/.cargo/config.toml index 95319ace8f..278fc3928f 100644 --- a/crates/prover-bin/.cargo/config.toml +++ b/crates/prover-bin/.cargo/config.toml @@ -1,32 +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 = "main", features = ["gpu"] } -openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "main", features = ["gpu"] } +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", 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-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", -], 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" } \ No newline at end of file +], 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" } \ No newline at end of file From 03820994092a4fe7cf0efc69d95f7417b518369f Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 12:12:57 +0900 Subject: [PATCH 04/16] more convenient for download release --- zkvm-prover/download-release.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/zkvm-prover/download-release.sh b/zkvm-prover/download-release.sh index 5f14ce1b10..5a76dedd44 100644 --- a/zkvm-prover/download-release.sh +++ b/zkvm-prover/download-release.sh @@ -1,10 +1,21 @@ #!/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 -# before we use version tag for zkvm, we can not acquire the correct version of zkvm from script -# SCROLL_ZKVM_VERSION=$($SHELL ./print_high_zkvm_version.sh | cut -d' ' -f1|cut -c2-) - SCROLL_ZKVM_VERSION=0.5.0rc0 + + # 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 From b6087286b45813141a94d3131ecb8958c3da843f Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 13:15:53 +0900 Subject: [PATCH 05/16] move gpu override, update scripts --- .../.cargo/config.toml | 0 zkvm-prover/Makefile | 31 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) rename crates/{prover-bin => gpu_override}/.cargo/config.toml (100%) diff --git a/crates/prover-bin/.cargo/config.toml b/crates/gpu_override/.cargo/config.toml similarity index 100% rename from crates/prover-bin/.cargo/config.toml rename to crates/gpu_override/.cargo/config.toml diff --git a/zkvm-prover/Makefile b/zkvm-prover/Makefile index bc3eaeb895..a2bbd33ab9 100644 --- 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 From 5d8705a720bb5980155d0d5333f82c447bfd36a0 Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 13:41:09 +0900 Subject: [PATCH 06/16] update docker file --- build/dockerfiles/coordinator-api.Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 7d208c229c..a7b8a56577 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -3,20 +3,21 @@ 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 ./ +COPY ./crates/gpu_override ./ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json # run scripts to get openvm-gpu -COPY ./build/dockerfiles/coordinator-api/plonky3-gpu /plonky3-gpu -COPY ./build/dockerfiles/coordinator-api/openvm-stark-gpu /openvm-stark-gpu -COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu +# COPY ./build/dockerfiles/coordinator-api/plonky3-gpu /plonky3-gpu +# COPY ./build/dockerfiles/coordinator-api/openvm-stark-gpu /openvm-stark-gpu +# COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu COPY ./build/dockerfiles/coordinator-api/gitconfig /root/.gitconfig -COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml +# COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml RUN cargo chef cook --release --recipe-path recipe.json COPY ./crates ./ From 0e1d3e47607abd865573b9f978bb2bb17345f42a Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 14:01:02 +0900 Subject: [PATCH 07/16] revert dockerfile --- build/dockerfiles/coordinator-api.Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index a7b8a56577..7d208c229c 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -3,21 +3,20 @@ 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 ./crates +COPY ./crates ./ COPY ./Cargo.* ./ COPY ./rust-toolchain ./ -COPY ./crates/gpu_override ./ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json # run scripts to get openvm-gpu -# COPY ./build/dockerfiles/coordinator-api/plonky3-gpu /plonky3-gpu -# COPY ./build/dockerfiles/coordinator-api/openvm-stark-gpu /openvm-stark-gpu -# COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu +COPY ./build/dockerfiles/coordinator-api/plonky3-gpu /plonky3-gpu +COPY ./build/dockerfiles/coordinator-api/openvm-stark-gpu /openvm-stark-gpu +COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu COPY ./build/dockerfiles/coordinator-api/gitconfig /root/.gitconfig -# COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml +COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml RUN cargo chef cook --release --recipe-path recipe.json COPY ./crates ./ From 654cd428522501e17a4a5c11c54c2a85e459bf77 Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 15:55:35 +0900 Subject: [PATCH 08/16] update gpu dep --- .../coordinator-api/checkout_all.sh | 6 +-- build/dockerfiles/coordinator-api/config.toml | 41 ++++++++++--------- crates/gpu_override/.cargo/config.toml | 24 +++++------ 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/build/dockerfiles/coordinator-api/checkout_all.sh b/build/dockerfiles/coordinator-api/checkout_all.sh index 251bd5a896..88a0000203 100755 --- 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) diff --git a/build/dockerfiles/coordinator-api/config.toml b/build/dockerfiles/coordinator-api/config.toml index 29dc4cfef6..158af24b6b 100644 --- a/build/dockerfiles/coordinator-api/config.toml +++ b/build/dockerfiles/coordinator-api/config.toml @@ -1,26 +1,29 @@ # openvm # same order and features as zkvm-prover/Cargo.toml.gpu +[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-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 } + [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 } 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 } # stark-backend @@ -38,7 +41,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 +54,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" } @@ -61,16 +66,13 @@ p3-bn254-fr = { path = "/plonky3-gpu/bn254-fr" } # gpu crates [patch."ssh://git@github.com/scroll-tech/plonky3-gpu.git"] -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" } 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 +83,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 +92,4 @@ 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" } + diff --git a/crates/gpu_override/.cargo/config.toml b/crates/gpu_override/.cargo/config.toml index 278fc3928f..713c0757c7 100644 --- a/crates/gpu_override/.cargo/config.toml +++ b/crates/gpu_override/.cargo/config.toml @@ -1,16 +1,16 @@ -# [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/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"] } From e92a15080a830294802219f9729f2facc02e2647 Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 16:02:03 +0900 Subject: [PATCH 09/16] more gpu dep for docker build --- build/dockerfiles/coordinator-api/config.toml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/build/dockerfiles/coordinator-api/config.toml b/build/dockerfiles/coordinator-api/config.toml index 158af24b6b..5495a774db 100644 --- a/build/dockerfiles/coordinator-api/config.toml +++ b/build/dockerfiles/coordinator-api/config.toml @@ -63,6 +63,12 @@ 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" } # gpu crates [patch."ssh://git@github.com/scroll-tech/plonky3-gpu.git"] @@ -92,4 +98,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" } From 8f6cbc49ec07ea7e3aeb6f6594e12157288069fc Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 16:08:53 +0900 Subject: [PATCH 10/16] resume openvm gpu dep (implicit) --- build/dockerfiles/coordinator-api/config.toml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/build/dockerfiles/coordinator-api/config.toml b/build/dockerfiles/coordinator-api/config.toml index 5495a774db..f3df5ee902 100644 --- a/build/dockerfiles/coordinator-api/config.toml +++ b/build/dockerfiles/coordinator-api/config.toml @@ -12,6 +12,17 @@ openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", 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 } [patch."ssh://git@github.com/scroll-tech/openvm-gpu.git"] openvm-build = { path = "/openvm-gpu/crates/toolchain/build", default-features = false } @@ -25,6 +36,18 @@ openvm-native-transpiler = { path = "/openvm-gpu/extensions/native/transpiler", 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"] From 72ead7e108b353a96481b5873845d97b56ca157b Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 4 Jul 2025 07:14:25 +0000 Subject: [PATCH 11/16] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[b?= =?UTF-8?q?ot]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index 7dd2dfea5c..db128cc5e8 100644 --- 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 { From 0d64958159baf0641d12a708d2269735af4e221e Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 4 Jul 2025 15:30:22 +0800 Subject: [PATCH 12/16] update coordinator dockerfile --- build/dockerfiles/coordinator-api.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 7d208c229c..3e948d0067 100644 --- 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 From 5667d0b154a19719455f0750efa5a776d41f0ebe Mon Sep 17 00:00:00 2001 From: Ho Date: Fri, 4 Jul 2025 16:47:10 +0900 Subject: [PATCH 13/16] update dockerfile --- build/dockerfiles/coordinator-api.Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 3e948d0067..5e9bac8fd9 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -11,16 +11,10 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json -# run scripts to get openvm-gpu -COPY ./build/dockerfiles/coordinator-api/plonky3-gpu /plonky3-gpu -COPY ./build/dockerfiles/coordinator-api/openvm-stark-gpu /openvm-stark-gpu -COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu -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/ ./crates/ COPY ./Cargo.* ./ +COPY .git .git RUN cargo build --release -p libzkp-c From 8b62b67d80d4abe810c92da45845bd985086d459 Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 4 Jul 2025 16:28:57 +0800 Subject: [PATCH 14/16] update coordinator image --- .github/workflows/docker.yml | 42 ------ build/dockerfiles/coordinator-api.Dockerfile | 6 +- .../coordinator-api/checkout_all.sh | 17 --- .../coordinator-api/clone_openvm_gpu.sh | 10 -- .../coordinator-api/clone_openvm_stark_gpu.sh | 10 -- .../coordinator-api/clone_plonky3_gpu.sh | 10 -- build/dockerfiles/coordinator-api/config.toml | 129 ------------------ build/dockerfiles/coordinator-api/gitconfig | 2 - 8 files changed, 3 insertions(+), 223 deletions(-) delete mode 100755 build/dockerfiles/coordinator-api/checkout_all.sh delete mode 100755 build/dockerfiles/coordinator-api/clone_openvm_gpu.sh delete mode 100755 build/dockerfiles/coordinator-api/clone_openvm_stark_gpu.sh delete mode 100755 build/dockerfiles/coordinator-api/clone_plonky3_gpu.sh delete mode 100644 build/dockerfiles/coordinator-api/config.toml delete mode 100644 build/dockerfiles/coordinator-api/gitconfig diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b42071a911..eefec43b8c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -352,48 +352,6 @@ jobs: REPOSITORY: coordinator-api run: | aws --region ${{ env.AWS_REGION }} ecr describe-repositories --repository-names ${{ env.REPOSITORY }} && : || aws --region ${{ env.AWS_REGION }} ecr create-repository --repository-name ${{ env.REPOSITORY }} - - name: Setup SSH for repositories and clone them - run: | - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - # Setup for plonky3-gpu - echo "${{ secrets.PLONKY3_GPU_SSH_PRIVATE_KEY }}" > ~/.ssh/plonky3_gpu_key - chmod 600 ~/.ssh/plonky3_gpu_key - eval "$(ssh-agent -s)" > /dev/null - ssh-add ~/.ssh/plonky3_gpu_key 2>/dev/null - ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts 2>/dev/null - echo "Loaded plonky3-gpu key" - - # Clone plonky3-gpu repository - ./build/dockerfiles/coordinator-api/clone_plonky3_gpu.sh - - # Setup for openvm-stark-gpu - echo "${{ secrets.OPENVM_STARK_GPU_SSH_PRIVATE_KEY }}" > ~/.ssh/openvm_stark_gpu_key - chmod 600 ~/.ssh/openvm_stark_gpu_key - eval "$(ssh-agent -s)" > /dev/null - ssh-add ~/.ssh/openvm_stark_gpu_key 2>/dev/null - echo "Loaded openvm-stark-gpu key" - - # Clone openvm-stark-gpu repository - ./build/dockerfiles/coordinator-api/clone_openvm_stark_gpu.sh - - # Setup for openvm-gpu - echo "${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}" > ~/.ssh/openvm_gpu_key - chmod 600 ~/.ssh/openvm_gpu_key - eval "$(ssh-agent -s)" > /dev/null - ssh-add ~/.ssh/openvm_gpu_key 2>/dev/null - echo "Loaded openvm-gpu key" - - # Clone openvm-gpu repository - ./build/dockerfiles/coordinator-api/clone_openvm_gpu.sh - - # Show number of loaded keys - echo "Number of loaded keys: $(ssh-add -l | wc -l)" - - - name: Checkout specific commits - run: | - ./build/dockerfiles/coordinator-api/checkout_all.sh - name: Build and push uses: docker/build-push-action@v3 env: diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 5e9bac8fd9..6440c678f5 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -1,5 +1,5 @@ # Build libzkp dependency -FROM scrolltech/cuda-go-rust-builder:cuda-11.7.1-go-1.22.12-rust-nightly-2025-02-14 as chef +FROM scrolltech/go-1.22.12-rust-nightly-2025-02-14 as chef WORKDIR app FROM chef as planner @@ -19,7 +19,7 @@ RUN cargo build --release -p libzkp-c # Download Go dependencies -FROM scrolltech/cuda-go-rust-builder:cuda-11.7.1-go-1.22.12-rust-nightly-2025-02-14 as base +FROM scrolltech/go-1.22.12-rust-nightly-2025-02-14 as base WORKDIR /src COPY go.work* ./ COPY ./rollup/go.* ./rollup/ @@ -39,7 +39,7 @@ RUN cd ./coordinator && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" make coordinator_a RUN mv coordinator/internal/logic/libzkp/lib /bin/ # Pull coordinator into a second stage deploy ubuntu container -FROM nvidia/cuda:11.7.1-runtime-ubuntu22.04 +FROM ubuntu:20.04 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/coordinator/internal/logic/verifier/lib ENV CGO_LDFLAGS="-Wl,--no-as-needed -ldl" # ENV CHAIN_ID=534353 diff --git a/build/dockerfiles/coordinator-api/checkout_all.sh b/build/dockerfiles/coordinator-api/checkout_all.sh deleted file mode 100755 index 88a0000203..0000000000 --- a/build/dockerfiles/coordinator-api/checkout_all.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -uex - -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) - -# checkout plonky3-gpu -cd $DIR/plonky3-gpu && git checkout ${PLONKY3_GPU_COMMIT} - -# checkout openvm-stark-gpu -cd $DIR/openvm-stark-gpu && git checkout ${OPENVM_STARK_GPU_COMMIT} - -# checkout openvm-gpu -cd $DIR/openvm-gpu && git checkout ${OPENVM_GPU_COMMIT} diff --git a/build/dockerfiles/coordinator-api/clone_openvm_gpu.sh b/build/dockerfiles/coordinator-api/clone_openvm_gpu.sh deleted file mode 100755 index b33117f572..0000000000 --- a/build/dockerfiles/coordinator-api/clone_openvm_gpu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -uex - -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd) - -# clone openvm-gpu if not exists -if [ ! -d $DIR/openvm-gpu ]; then - git clone git@github.com:scroll-tech/openvm-gpu.git $DIR/openvm-gpu -fi -cd $DIR/openvm-gpu && git fetch --all --force diff --git a/build/dockerfiles/coordinator-api/clone_openvm_stark_gpu.sh b/build/dockerfiles/coordinator-api/clone_openvm_stark_gpu.sh deleted file mode 100755 index f848895309..0000000000 --- a/build/dockerfiles/coordinator-api/clone_openvm_stark_gpu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -uex - -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd) - -# clone openvm-stark-gpu if not exists -if [ ! -d $DIR/openvm-stark-gpu ]; then - git clone git@github.com:scroll-tech/openvm-stark-gpu.git $DIR/openvm-stark-gpu -fi -cd $DIR/openvm-stark-gpu && git fetch --all --force diff --git a/build/dockerfiles/coordinator-api/clone_plonky3_gpu.sh b/build/dockerfiles/coordinator-api/clone_plonky3_gpu.sh deleted file mode 100755 index 94bc92a537..0000000000 --- a/build/dockerfiles/coordinator-api/clone_plonky3_gpu.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -uex - -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd) - -# clone plonky3-gpu if not exists -if [ ! -d $DIR/plonky3-gpu ]; then - git clone git@github.com:scroll-tech/plonky3-gpu.git $DIR/plonky3-gpu -fi -cd $DIR/plonky3-gpu && git fetch --all --force diff --git a/build/dockerfiles/coordinator-api/config.toml b/build/dockerfiles/coordinator-api/config.toml deleted file mode 100644 index f3df5ee902..0000000000 --- a/build/dockerfiles/coordinator-api/config.toml +++ /dev/null @@ -1,129 +0,0 @@ -# openvm -# same order and features as zkvm-prover/Cargo.toml.gpu -[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-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 } - -[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"] -openvm-stark-backend = { path = "/openvm-stark-gpu/crates/stark-backend", features = ["gpu"] } -openvm-stark-sdk = { path = "/openvm-stark-gpu/crates/stark-sdk", features = ["gpu"] } - -[patch."ssh://git@github.com/scroll-tech/openvm-stark-gpu.git"] -openvm-stark-backend = { path = "/openvm-stark-gpu/crates/stark-backend", features = ["gpu"] } -openvm-stark-sdk = { path = "/openvm-stark-gpu/crates/stark-sdk", features = ["gpu"] } - -# plonky3 -[patch."https://github.com/Plonky3/Plonky3.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", features = [ - "nightly-features", -]} -p3-koala-bear = { path = "/plonky3-gpu/koala-bear" } -p3-util = { path = "/plonky3-gpu/util" } -p3-challenger = { path = "/plonky3-gpu/challenger" } -p3-dft = { path = "/plonky3-gpu/dft" } -p3-fri = { path = "/plonky3-gpu/fri" } -p3-goldilocks = { path = "/plonky3-gpu/goldilocks" } -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-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" } -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" } - -# 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", features = [ - "nightly-features", -]} -p3-koala-bear = { path = "/plonky3-gpu/koala-bear" } -p3-util = { path = "/plonky3-gpu/util" } -p3-challenger = { path = "/plonky3-gpu/challenger" } -p3-dft = { path = "/plonky3-gpu/dft" } -p3-fri = { path = "/plonky3-gpu/fri" } -p3-goldilocks = { path = "/plonky3-gpu/goldilocks" } -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-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" } -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" } diff --git a/build/dockerfiles/coordinator-api/gitconfig b/build/dockerfiles/coordinator-api/gitconfig deleted file mode 100644 index 1b697d8cac..0000000000 --- a/build/dockerfiles/coordinator-api/gitconfig +++ /dev/null @@ -1,2 +0,0 @@ -[url "https://github.com/"] - insteadOf = ssh://git@github.com/ From c8712d1ed790e1395077800633c3e84d0b1186f1 Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 4 Jul 2025 16:33:52 +0800 Subject: [PATCH 15/16] fix image error --- build/dockerfiles/coordinator-api.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 6440c678f5..d1f9d60448 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -1,5 +1,5 @@ # Build libzkp dependency -FROM scrolltech/go-1.22.12-rust-nightly-2025-02-14 as chef +FROM scrolltech/go-rust-builder:go-1.22.12-rust-nightly-2025-02-14 as chef WORKDIR app FROM chef as planner @@ -19,7 +19,7 @@ RUN cargo build --release -p libzkp-c # Download Go dependencies -FROM scrolltech/go-1.22.12-rust-nightly-2025-02-14 as base +FROM scrolltech/go-rust-builder:go-1.22.12-rust-nightly-2025-02-14 as base WORKDIR /src COPY go.work* ./ COPY ./rollup/go.* ./rollup/ From 6fa16256b9c17f9d880956f6aa6d962ee8a9434c Mon Sep 17 00:00:00 2001 From: georgehao Date: Fri, 4 Jul 2025 16:56:59 +0800 Subject: [PATCH 16/16] update runs on --- .github/workflows/docker.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eefec43b8c..10140b64d5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,8 @@ env: jobs: gas_oracle: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -55,7 +56,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest rollup_relayer: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -100,7 +102,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest blob_uploader: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -145,7 +148,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest rollup-db-cli: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -190,7 +194,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest bridgehistoryapi-fetcher: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -235,7 +240,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest bridgehistoryapi-api: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -280,7 +286,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest bridgehistoryapi-db-cli: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -325,7 +332,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest coordinator-api: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4 @@ -369,7 +377,8 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:latest coordinator-cron: - runs-on: ubuntu-latest + runs-on: + group: scroll-reth-runner-group steps: - name: Checkout code uses: actions/checkout@v4