From 9530ea0bd48cdf269e06b3e722860e9fff877321 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Fri, 18 Apr 2025 16:56:06 +0800 Subject: [PATCH 01/21] feat(coordinator and prover): support v0.3.0 --- common/libzkp/impl/Cargo.lock | 246 +++++++++++++++++----------------- common/libzkp/impl/Cargo.toml | 4 +- common/version/version.go | 2 +- zkvm-prover/Cargo.lock | 206 ++++++++++++++-------------- zkvm-prover/Cargo.toml | 2 +- 5 files changed, 230 insertions(+), 230 deletions(-) diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index 1465f17866..3070c70216 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -2852,8 +2852,8 @@ dependencies = [ [[package]] name = "openvm" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "bytemuck", "num-bigint 0.4.6", @@ -2865,8 +2865,8 @@ dependencies = [ [[package]] name = "openvm-algebra-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -2894,7 +2894,7 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -2903,8 +2903,8 @@ dependencies = [ [[package]] name = "openvm-algebra-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "halo2curves-axiom", "num-bigint 0.4.6", @@ -2916,8 +2916,8 @@ dependencies = [ [[package]] name = "openvm-algebra-moduli-macros" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -2926,8 +2926,8 @@ dependencies = [ [[package]] name = "openvm-algebra-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-algebra-guest", "openvm-instructions", @@ -2940,8 +2940,8 @@ dependencies = [ [[package]] name = "openvm-bigint-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -2962,8 +2962,8 @@ dependencies = [ [[package]] name = "openvm-bigint-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "num-bigint 0.4.6", "num-traits", @@ -2976,8 +2976,8 @@ dependencies = [ [[package]] name = "openvm-bigint-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-bigint-guest", "openvm-instructions", @@ -2991,8 +2991,8 @@ dependencies = [ [[package]] name = "openvm-build" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "cargo_metadata", "eyre", @@ -3003,8 +3003,8 @@ dependencies = [ [[package]] name = "openvm-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "cfg-if", @@ -3034,8 +3034,8 @@ dependencies = [ [[package]] name = "openvm-circuit-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "quote", @@ -3044,8 +3044,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3059,8 +3059,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "quote", @@ -3069,8 +3069,8 @@ dependencies = [ [[package]] name = "openvm-continuations" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derivative", "openvm-circuit", @@ -3085,7 +3085,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "proc-macro2", "quote", @@ -3094,8 +3094,8 @@ dependencies = [ [[package]] name = "openvm-ecc-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3125,8 +3125,8 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "ecdsa", "elliptic-curve", @@ -3150,8 +3150,8 @@ dependencies = [ [[package]] name = "openvm-ecc-sw-macros" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -3160,8 +3160,8 @@ dependencies = [ [[package]] name = "openvm-ecc-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-ecc-guest", "openvm-instructions", @@ -3174,8 +3174,8 @@ dependencies = [ [[package]] name = "openvm-instructions" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "derive-new 0.6.0", @@ -3191,8 +3191,8 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "quote", "syn 2.0.98", @@ -3200,8 +3200,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3226,8 +3226,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-platform", "tiny-keccak", @@ -3235,8 +3235,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3249,16 +3249,16 @@ dependencies = [ [[package]] name = "openvm-macros-common" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "syn 2.0.98", ] [[package]] name = "openvm-mod-circuit-builder" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -3276,8 +3276,8 @@ dependencies = [ [[package]] name = "openvm-native-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3303,8 +3303,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "itertools 0.14.0", @@ -3327,8 +3327,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "quote", "syn 2.0.98", @@ -3336,8 +3336,8 @@ dependencies = [ [[package]] name = "openvm-native-recursion" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "cfg-if", "itertools 0.14.0", @@ -3364,8 +3364,8 @@ dependencies = [ [[package]] name = "openvm-pairing-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3394,8 +3394,8 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "group 0.13.0", "halo2curves-axiom", @@ -3420,8 +3420,8 @@ dependencies = [ [[package]] name = "openvm-pairing-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3434,8 +3434,8 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "getrandom 0.2.15", "libm", @@ -3445,8 +3445,8 @@ dependencies = [ [[package]] name = "openvm-poseidon2-air" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derivative", "lazy_static", @@ -3462,8 +3462,8 @@ dependencies = [ [[package]] name = "openvm-rv32-adapters" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3482,8 +3482,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3505,8 +3505,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-custom-insn", "strum_macros 0.26.4", @@ -3514,8 +3514,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3530,8 +3530,8 @@ dependencies = [ [[package]] name = "openvm-sdk" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "async-trait", "bitcode", @@ -3577,8 +3577,8 @@ dependencies = [ [[package]] name = "openvm-sha256-air" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", @@ -3588,8 +3588,8 @@ dependencies = [ [[package]] name = "openvm-sha256-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3611,8 +3611,8 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-platform", "sha2", @@ -3620,8 +3620,8 @@ dependencies = [ [[package]] name = "openvm-sha256-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3634,8 +3634,8 @@ dependencies = [ [[package]] name = "openvm-stark-backend" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=b051e8978da9c829a76b262abf4a9736c8d1681e#b051e8978da9c829a76b262abf4a9736c8d1681e" +version = "1.0.0" +source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.0.0#884f8e6aabf72bde00dc51f1f1121277bff73b1e" dependencies = [ "bitcode", "cfg-if", @@ -3660,8 +3660,8 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=b051e8978da9c829a76b262abf4a9736c8d1681e#b051e8978da9c829a76b262abf4a9736c8d1681e" +version = "1.0.0" +source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.0.0#884f8e6aabf72bde00dc51f1f1121277bff73b1e" dependencies = [ "derivative", "derive_more 0.99.19", @@ -3695,8 +3695,8 @@ dependencies = [ [[package]] name = "openvm-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "elf", "eyre", @@ -3737,7 +3737,7 @@ dependencies = [ [[package]] name = "p3-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-field", "p3-matrix", @@ -3746,7 +3746,7 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-field", "p3-mds", @@ -3760,7 +3760,7 @@ dependencies = [ [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "blake3", "p3-symmetric", @@ -3770,7 +3770,7 @@ dependencies = [ [[package]] name = "p3-bn254-fr" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "ff 0.13.0", "halo2curves", @@ -3785,7 +3785,7 @@ dependencies = [ [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "p3-commit" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-challenger", @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-field", @@ -3824,7 +3824,7 @@ dependencies = [ [[package]] name = "p3-field" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "p3-fri" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-challenger", @@ -3860,7 +3860,7 @@ dependencies = [ [[package]] name = "p3-goldilocks" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "num-bigint 0.4.6", "p3-dft", @@ -3877,7 +3877,7 @@ dependencies = [ [[package]] name = "p3-interpolation" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-field", "p3-matrix", @@ -3888,7 +3888,7 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-field", @@ -3900,7 +3900,7 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-air", "p3-field", @@ -3914,7 +3914,7 @@ dependencies = [ [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-field", @@ -3929,7 +3929,7 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "rayon", ] @@ -3937,7 +3937,7 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-dft", @@ -3951,7 +3951,7 @@ dependencies = [ [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-commit", @@ -3968,7 +3968,7 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -3989,7 +3989,7 @@ dependencies = [ [[package]] name = "p3-poseidon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-field", "p3-mds", @@ -4000,7 +4000,7 @@ dependencies = [ [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "gcd", "p3-field", @@ -4012,7 +4012,7 @@ dependencies = [ [[package]] name = "p3-poseidon2-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "p3-air", "p3-field", @@ -4028,7 +4028,7 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4038,7 +4038,7 @@ dependencies = [ [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "itertools 0.14.0", "p3-air", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=1ba4e5c#1ba4e5c40417f4f7aae86bcca56b6484b4b2490b" dependencies = [ "serde", ] @@ -5674,7 +5674,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-circuit-input-types" version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "alloy-primitives", "alloy-serde 0.8.3", @@ -5696,8 +5696,8 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" -version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +version = "0.3.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -5732,8 +5732,8 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" -version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +version = "0.3.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "bincode", "eyre", diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index b1b6a13bb3..eee57e6193 100644 --- a/common/libzkp/impl/Cargo.toml +++ b/common/libzkp/impl/Cargo.toml @@ -14,8 +14,8 @@ ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" } tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-openvm-v1.0.0-rc.1" } [dependencies] -euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.2.0", package = "scroll-zkvm-prover" } -euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.2.0", package = "scroll-zkvm-verifier" } +euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.3.0", package = "scroll-zkvm-prover" } +euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.3.0", package = "scroll-zkvm-verifier" } base64 = "0.13.0" env_logger = "0.9.0" diff --git a/common/version/version.go b/common/version/version.go index 7eeb26db3d..0686143491 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.5" +var tag = "v4.5.6" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/zkvm-prover/Cargo.lock b/zkvm-prover/Cargo.lock index f6b89e94de..925203bf50 100644 --- a/zkvm-prover/Cargo.lock +++ b/zkvm-prover/Cargo.lock @@ -1127,7 +1127,7 @@ dependencies = [ "bitflags 2.9.0", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "regex", @@ -1549,7 +1549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2175,7 +2175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4271,8 +4271,8 @@ dependencies = [ [[package]] name = "openvm" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "bytemuck", "num-bigint 0.4.6", @@ -4284,8 +4284,8 @@ dependencies = [ [[package]] name = "openvm-algebra-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4313,7 +4313,7 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -4322,8 +4322,8 @@ dependencies = [ [[package]] name = "openvm-algebra-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "halo2curves-axiom", "num-bigint 0.4.6", @@ -4335,8 +4335,8 @@ dependencies = [ [[package]] name = "openvm-algebra-moduli-macros" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -4345,8 +4345,8 @@ dependencies = [ [[package]] name = "openvm-algebra-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-algebra-guest", "openvm-instructions", @@ -4359,8 +4359,8 @@ dependencies = [ [[package]] name = "openvm-bigint-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4381,8 +4381,8 @@ dependencies = [ [[package]] name = "openvm-bigint-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "num-bigint 0.4.6", "num-traits", @@ -4395,8 +4395,8 @@ dependencies = [ [[package]] name = "openvm-bigint-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-bigint-guest", "openvm-instructions", @@ -4410,8 +4410,8 @@ dependencies = [ [[package]] name = "openvm-build" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "cargo_metadata", "eyre", @@ -4422,8 +4422,8 @@ dependencies = [ [[package]] name = "openvm-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "cfg-if", @@ -4453,8 +4453,8 @@ dependencies = [ [[package]] name = "openvm-circuit-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "quote", @@ -4463,8 +4463,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -4478,8 +4478,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "quote", @@ -4488,8 +4488,8 @@ dependencies = [ [[package]] name = "openvm-continuations" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derivative", "openvm-circuit", @@ -4504,7 +4504,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "proc-macro2", "quote", @@ -4513,8 +4513,8 @@ dependencies = [ [[package]] name = "openvm-ecc-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4544,8 +4544,8 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "ecdsa", "elliptic-curve", @@ -4569,8 +4569,8 @@ dependencies = [ [[package]] name = "openvm-ecc-sw-macros" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-macros-common", "quote", @@ -4579,8 +4579,8 @@ dependencies = [ [[package]] name = "openvm-ecc-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-ecc-guest", "openvm-instructions", @@ -4593,8 +4593,8 @@ dependencies = [ [[package]] name = "openvm-instructions" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "derive-new 0.6.0", @@ -4610,8 +4610,8 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "quote", "syn 2.0.100", @@ -4619,8 +4619,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4645,8 +4645,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-platform", "tiny-keccak", @@ -4654,8 +4654,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4668,16 +4668,16 @@ dependencies = [ [[package]] name = "openvm-macros-common" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "syn 2.0.100", ] [[package]] name = "openvm-mod-circuit-builder" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -4695,8 +4695,8 @@ dependencies = [ [[package]] name = "openvm-native-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4722,8 +4722,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "backtrace", "itertools 0.14.0", @@ -4746,8 +4746,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "quote", "syn 2.0.100", @@ -4755,8 +4755,8 @@ dependencies = [ [[package]] name = "openvm-native-recursion" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "cfg-if", "itertools 0.14.0", @@ -4783,8 +4783,8 @@ dependencies = [ [[package]] name = "openvm-pairing-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4813,8 +4813,8 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "group 0.13.0", "halo2curves-axiom", @@ -4839,8 +4839,8 @@ dependencies = [ [[package]] name = "openvm-pairing-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4853,8 +4853,8 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "getrandom 0.2.15", "libm", @@ -4864,8 +4864,8 @@ dependencies = [ [[package]] name = "openvm-poseidon2-air" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derivative", "lazy_static", @@ -4881,8 +4881,8 @@ dependencies = [ [[package]] name = "openvm-rv32-adapters" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -4901,8 +4901,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4924,8 +4924,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-custom-insn", "strum_macros 0.26.4", @@ -4933,8 +4933,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4949,8 +4949,8 @@ dependencies = [ [[package]] name = "openvm-sdk" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "async-trait", "bitcode", @@ -4996,8 +4996,8 @@ dependencies = [ [[package]] name = "openvm-sha256-air" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", @@ -5007,8 +5007,8 @@ dependencies = [ [[package]] name = "openvm-sha256-circuit" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -5030,8 +5030,8 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-platform", "sha2", @@ -5039,8 +5039,8 @@ dependencies = [ [[package]] name = "openvm-sha256-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -5118,8 +5118,8 @@ dependencies = [ [[package]] name = "openvm-transpiler" -version = "1.0.0-rc.2" -source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-gpu.git?rev=dfa10b4#dfa10b4a06e0b2017b30c4c9dace31c4dd908df4" dependencies = [ "elf", "eyre", @@ -6085,7 +6085,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7505,7 +7505,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7518,7 +7518,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7856,7 +7856,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-circuit-input-types" version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "alloy-primitives", "alloy-serde 0.8.3", @@ -7878,8 +7878,8 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" -version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +version = "0.3.0" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -7914,8 +7914,8 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" -version = "0.2.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" +version = "0.3.0" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.3.0#fcc09d1517e9d254284820fe66b087331e4b1bf4" dependencies = [ "bincode", "eyre", @@ -8417,7 +8417,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8673,7 +8673,7 @@ dependencies = [ "getrandom 0.3.2", "once_cell", "rustix 1.0.5", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/zkvm-prover/Cargo.toml b/zkvm-prover/Cargo.toml index 22bce3ec16..3d79e755f9 100644 --- a/zkvm-prover/Cargo.toml +++ b/zkvm-prover/Cargo.toml @@ -18,7 +18,7 @@ serde = { version = "1.0.198", features = ["derive"] } serde_json = "1.0.116" futures = "0.3.30" -scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.2.0", package = "scroll-zkvm-prover" } +scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.3.0", package = "scroll-zkvm-prover" } ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", branch = "main", features = [ From bb089182d833576e91e4577357fb390df9637b55 Mon Sep 17 00:00:00 2001 From: Velaciela Date: Sat, 19 Apr 2025 00:18:07 +0800 Subject: [PATCH 02/21] upgrade gpu crates --- zkvm-prover/Cargo.lock | 66 +++++++++++++++++++++--------------------- zkvm-prover/Cargo.toml | 50 ++++++++++++++++---------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/zkvm-prover/Cargo.lock b/zkvm-prover/Cargo.lock index 925203bf50..913e40388c 100644 --- a/zkvm-prover/Cargo.lock +++ b/zkvm-prover/Cargo.lock @@ -5053,8 +5053,8 @@ dependencies = [ [[package]] name = "openvm-stark-backend" -version = "1.0.0-rc.2" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#1baaa78b1b2d707d41a55ea0920d2555222d3108" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=merge%2Fupstream-884f8e6#ba7c99ef4f54b8cf7d9a6d58b9199314579c566d" dependencies = [ "bitcode", "cfg-if", @@ -5082,8 +5082,8 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" -version = "1.0.0-rc.2" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#1baaa78b1b2d707d41a55ea0920d2555222d3108" +version = "1.0.0" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=merge%2Fupstream-884f8e6#ba7c99ef4f54b8cf7d9a6d58b9199314579c566d" dependencies = [ "derivative", "derive_more 0.99.19", @@ -5166,7 +5166,7 @@ dependencies = [ [[package]] name = "p3-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-field", "p3-matrix", @@ -5175,7 +5175,7 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-field", "p3-mds", @@ -5189,7 +5189,7 @@ dependencies = [ [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "blake3", "p3-symmetric", @@ -5199,7 +5199,7 @@ dependencies = [ [[package]] name = "p3-bn254-fr" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "ff 0.13.1", "halo2curves", @@ -5214,7 +5214,7 @@ dependencies = [ [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -5226,7 +5226,7 @@ dependencies = [ [[package]] name = "p3-commit" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "anyhow", "itertools 0.14.0", @@ -5242,7 +5242,7 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-field", @@ -5255,7 +5255,7 @@ dependencies = [ [[package]] name = "p3-field" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -5272,7 +5272,7 @@ dependencies = [ [[package]] name = "p3-fri" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "anyhow", "itertools 0.14.0", @@ -5296,7 +5296,7 @@ dependencies = [ [[package]] name = "p3-goldilocks" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "num-bigint 0.4.6", "p3-dft", @@ -5313,7 +5313,7 @@ dependencies = [ [[package]] name = "p3-gpu-backend" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "anyhow", "bytemuck", @@ -5350,7 +5350,7 @@ dependencies = [ [[package]] name = "p3-gpu-base" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "anyhow", "bytemuck", @@ -5367,7 +5367,7 @@ dependencies = [ [[package]] name = "p3-gpu-build" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "cc", "directories", @@ -5380,12 +5380,12 @@ dependencies = [ [[package]] name = "p3-gpu-field" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" [[package]] name = "p3-gpu-module" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-field", @@ -5398,7 +5398,7 @@ dependencies = [ [[package]] name = "p3-interpolation" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-field", "p3-matrix", @@ -5409,7 +5409,7 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-field", @@ -5421,7 +5421,7 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-air", "p3-field", @@ -5437,7 +5437,7 @@ dependencies = [ [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-field", @@ -5452,7 +5452,7 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "rayon", ] @@ -5460,7 +5460,7 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-dft", @@ -5474,7 +5474,7 @@ dependencies = [ [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "anyhow", "itertools 0.14.0", @@ -5493,7 +5493,7 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -5514,7 +5514,7 @@ dependencies = [ [[package]] name = "p3-poseidon" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-field", "p3-mds", @@ -5525,7 +5525,7 @@ dependencies = [ [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "gcd", "p3-field", @@ -5537,7 +5537,7 @@ dependencies = [ [[package]] name = "p3-poseidon2-air" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "p3-air", "p3-field", @@ -5553,7 +5553,7 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-field", @@ -5563,7 +5563,7 @@ dependencies = [ [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "itertools 0.14.0", "p3-air", @@ -5581,7 +5581,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.1#9174aff7c8f3f0c10dadbb83222ea9e7420ae9ad" dependencies = [ "serde", ] diff --git a/zkvm-prover/Cargo.toml b/zkvm-prover/Cargo.toml index 3d79e755f9..7f83c47b4b 100644 --- a/zkvm-prover/Cargo.toml +++ b/zkvm-prover/Cargo.toml @@ -47,32 +47,32 @@ url = "2.5.4" serde_bytes = "0.11.15" [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 = "merge/upstream-884f8e6", features = ["gpu"] } +openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "merge/upstream-884f8e6", features = ["gpu"] } [patch."https://github.com/Plonky3/Plonky3.git"] -p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } +p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", features = [ "nightly-features", -], tag = "v0.1.0" } -p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } -p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.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.1.0" } +], tag = "v0.1.1" } +p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } +p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-gpu.git", tag = "v0.1.1" } # 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.1.1" } From 093efb0ce1877372dfa608ae28db22beffe210a2 Mon Sep 17 00:00:00 2001 From: Velaciela Date: Sat, 19 Apr 2025 00:33:34 +0800 Subject: [PATCH 03/21] update openvm-stark-gpu to main branch --- zkvm-prover/Cargo.lock | 4 ++-- zkvm-prover/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zkvm-prover/Cargo.lock b/zkvm-prover/Cargo.lock index 913e40388c..f30dad6800 100644 --- a/zkvm-prover/Cargo.lock +++ b/zkvm-prover/Cargo.lock @@ -5054,7 +5054,7 @@ dependencies = [ [[package]] name = "openvm-stark-backend" version = "1.0.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=merge%2Fupstream-884f8e6#ba7c99ef4f54b8cf7d9a6d58b9199314579c566d" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#fcda680d848a3790d7da7778a10d0a2d127cbba1" dependencies = [ "bitcode", "cfg-if", @@ -5083,7 +5083,7 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" version = "1.0.0" -source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=merge%2Fupstream-884f8e6#ba7c99ef4f54b8cf7d9a6d58b9199314579c566d" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#fcda680d848a3790d7da7778a10d0a2d127cbba1" dependencies = [ "derivative", "derive_more 0.99.19", diff --git a/zkvm-prover/Cargo.toml b/zkvm-prover/Cargo.toml index 7f83c47b4b..2498b96781 100644 --- a/zkvm-prover/Cargo.toml +++ b/zkvm-prover/Cargo.toml @@ -47,8 +47,8 @@ url = "2.5.4" serde_bytes = "0.11.15" [patch."https://github.com/openvm-org/stark-backend.git"] -openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "merge/upstream-884f8e6", features = ["gpu"] } -openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-stark-gpu.git", branch = "merge/upstream-884f8e6", features = ["gpu"] } +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.1.1" } From ce897016ca80571dca99a54cc9f9dc47319d6710 Mon Sep 17 00:00:00 2001 From: Velaciela Date: Sat, 19 Apr 2025 02:32:04 +0800 Subject: [PATCH 04/21] openvm local patch for coordinator-api.Dockerfile --- build/dockerfiles/coordinator-api.Dockerfile | 6 +++++ build/dockerfiles/coordinator-api/config.toml | 24 +++++++++++++++++++ build/dockerfiles/coordinator-api/gitconfig | 2 ++ .../coordinator-api/init-openvm.sh | 12 ++++++++++ 4 files changed, 44 insertions(+) create mode 100644 build/dockerfiles/coordinator-api/config.toml create mode 100644 build/dockerfiles/coordinator-api/gitconfig create mode 100755 build/dockerfiles/coordinator-api/init-openvm.sh diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 3e501d65a0..9f728d14b4 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -11,6 +11,12 @@ COPY ./common/libzkp/impl/rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json +# local patch for openvm +# run ./coordinator-api/init-openvm.sh to get openvm-gpu +COPY coordinator-api/openvm-gpu /openvm-gpu +COPY coordinator-api/gitconfig /root/.gitconfig +COPY coordinator-api/config.toml /root/.cargo/config.toml + COPY ./common/libzkp/impl . RUN cargo build --release diff --git a/build/dockerfiles/coordinator-api/config.toml b/build/dockerfiles/coordinator-api/config.toml new file mode 100644 index 0000000000..9d96f1e8d5 --- /dev/null +++ b/build/dockerfiles/coordinator-api/config.toml @@ -0,0 +1,24 @@ +# 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 } +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"] } +openvm-sha256-guest = { path = "/openvm-gpu/extensions/sha256/guest", default-features = false } +openvm-transpiler = { path = "/openvm-gpu/crates/toolchain/transpiler", default-features = false } diff --git a/build/dockerfiles/coordinator-api/gitconfig b/build/dockerfiles/coordinator-api/gitconfig new file mode 100644 index 0000000000..1b697d8cac --- /dev/null +++ b/build/dockerfiles/coordinator-api/gitconfig @@ -0,0 +1,2 @@ +[url "https://github.com/"] + insteadOf = ssh://git@github.com/ diff --git a/build/dockerfiles/coordinator-api/init-openvm.sh b/build/dockerfiles/coordinator-api/init-openvm.sh new file mode 100755 index 0000000000..908573955f --- /dev/null +++ b/build/dockerfiles/coordinator-api/init-openvm.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -uex + +OPENVM_GPU_COMMIT=dfa10b4 # branch: v1.0.0-auipc + +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd) + +# checkout openvm-gpu +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 && git checkout ${OPENVM_GPU_COMMIT} From 5eb32165fbb728ecd38bd557799530a05d7749b8 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Sat, 19 Apr 2025 02:49:38 +0800 Subject: [PATCH 05/21] update paths --- build/dockerfiles/coordinator-api.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 9f728d14b4..8b138350a6 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -12,10 +12,10 @@ COPY --from=planner /app/recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json # local patch for openvm -# run ./coordinator-api/init-openvm.sh to get openvm-gpu -COPY coordinator-api/openvm-gpu /openvm-gpu -COPY coordinator-api/gitconfig /root/.gitconfig -COPY coordinator-api/config.toml /root/.cargo/config.toml +# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 ./common/libzkp/impl . RUN cargo build --release From fae272cd3508e18f6bee0188a6b9255bcfef2657 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Sat, 19 Apr 2025 03:05:26 +0800 Subject: [PATCH 06/21] update --- build/dockerfiles/coordinator-api.Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 8b138350a6..0924013a8d 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -9,6 +9,12 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./common/libzkp/impl/rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json + +# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 # local patch for openvm From 2136f7f64819e54da29a273aad452e9949b23a41 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Mon, 21 Apr 2025 01:32:30 +0800 Subject: [PATCH 07/21] tweak GetCommittedBatchesGEIndexGECodecVersion logic --- rollup/internal/orm/batch.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rollup/internal/orm/batch.go b/rollup/internal/orm/batch.go index 75718143f9..2d83c4791d 100644 --- a/rollup/internal/orm/batch.go +++ b/rollup/internal/orm/batch.go @@ -162,7 +162,8 @@ func (o *Batch) GetFirstUnbatchedChunkIndex(ctx context.Context) (uint64, error) return latestBatch.EndChunkIndex + 1, nil } -// GetCommittedBatchesGEIndexGECodecVersion retrieves batches that have been committed (commit_tx_hash is set) and have a batch index greater than or equal to the given index and codec version. +// GetCommittedBatchesGEIndexGECodecVersion retrieves batches that have been committed (commit_tx_hash is set) and not finalized (finalize_tx_hash is NULL). +// It returns batches that have an index greater than or equal to the given index and codec version. // The returned batches are sorted in ascending order by their index. func (o *Batch) GetCommittedBatchesGEIndexGECodecVersion(ctx context.Context, index uint64, codecv encoding.CodecVersion, limit int) ([]*Batch, error) { db := o.db.WithContext(ctx) @@ -170,6 +171,7 @@ func (o *Batch) GetCommittedBatchesGEIndexGECodecVersion(ctx context.Context, in db = db.Where("index >= ?", index) db = db.Where("codec_version >= ?", codecv) db = db.Where("commit_tx_hash IS NOT NULL") // only include committed batches + db = db.Where("finalize_tx_hash IS NULL") // exclude finalized batches db = db.Order("index ASC") if limit > 0 { From d35bd7b62b39cc058498f7e179798bd054a6cc2d Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Mon, 21 Apr 2025 16:51:27 +0800 Subject: [PATCH 08/21] update unit tests --- rollup/internal/orm/orm_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rollup/internal/orm/orm_test.go b/rollup/internal/orm/orm_test.go index 346857be80..b53299bd3b 100644 --- a/rollup/internal/orm/orm_test.go +++ b/rollup/internal/orm/orm_test.go @@ -355,10 +355,7 @@ func TestBatchOrm(t *testing.T) { batches, err = batchOrm.GetCommittedBatchesGEIndexGECodecVersion(context.Background(), 0, codecVersion, 0) assert.NoError(t, err) - assert.Equal(t, 1, len(batches)) - assert.Equal(t, batchHash1, batches[0].Hash) - assert.Equal(t, types.ProvingTaskFailed, types.ProvingStatus(batches[0].ProvingStatus)) - assert.Equal(t, types.RollupCommitFailed, types.RollupStatus(batches[0].RollupStatus)) + assert.Equal(t, 0, len(batches)) } } From ef9be097e6e2759465c2419e2c4433c27b5d87af Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:11:15 +0800 Subject: [PATCH 09/21] add secret key --- .github/workflows/docker.yml | 5 +++++ build/dockerfiles/coordinator-api.Dockerfile | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 150a6f36c1..991c559136 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -307,6 +307,11 @@ 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: Give Github Action access to openvm-gpu + uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: | + ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} - 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 0924013a8d..3e501d65a0 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -9,20 +9,8 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./common/libzkp/impl/rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json - -# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 -# local patch for openvm -# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 ./common/libzkp/impl . RUN cargo build --release From 4c04e400eacc9b84b4c8b1aa6d23e1ab0554439b Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:16:51 +0800 Subject: [PATCH 10/21] address AI's comment --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 991c559136..f42758427e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -319,6 +319,7 @@ jobs: REPOSITORY: coordinator-api IMAGE_TAG: ${{ github.ref_name }} with: + ssh: default context: . file: ./build/dockerfiles/coordinator-api.Dockerfile push: true From 3aa76a6baa92e453439eef3ceae8542592765b26 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:27:53 +0800 Subject: [PATCH 11/21] fix --- .github/workflows/docker.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f42758427e..f9629bab89 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -307,11 +307,15 @@ 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: Give Github Action access to openvm-gpu + - name: Setup SSH for private repos uses: webfactory/ssh-agent@v0.9.0 with: - ssh-private-key: | - ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} + ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} + - name: Setup Cargo config + run: | + mkdir -p ~/.cargo + echo '[net]' > ~/.cargo/config.toml + echo 'git-fetch-with-cli = true' >> ~/.cargo/config.toml - name: Build and push uses: docker/build-push-action@v3 env: @@ -319,10 +323,11 @@ jobs: REPOSITORY: coordinator-api IMAGE_TAG: ${{ github.ref_name }} with: - ssh: default context: . file: ./build/dockerfiles/coordinator-api.Dockerfile push: true + build-args: | + CARGO_NET_GIT_FETCH_WITH_CLI=true tags: | scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }} scrolltech/${{ env.REPOSITORY }}:latest From c2d54317664317b55f7293ed576659fa66e140a0 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:43:20 +0800 Subject: [PATCH 12/21] fix --- .github/workflows/docker.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f9629bab89..a82e921c8e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -311,11 +311,26 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} + - name: Setup SSH config + run: | + mkdir -p ~/.ssh + echo "Host github.com" > ~/.ssh/config + echo " User git" >> ~/.ssh/config + echo " IdentityFile ~/.ssh/id_rsa" >> ~/.ssh/config + echo " StrictHostKeyChecking no" >> ~/.ssh/config + chmod 600 ~/.ssh/config - name: Setup Cargo config run: | mkdir -p ~/.cargo echo '[net]' > ~/.cargo/config.toml echo 'git-fetch-with-cli = true' >> ~/.cargo/config.toml + - name: Debug SSH agent + run: ssh-add -l + - name: Build with cargo chef + run: cargo chef cook --release --recipe-path recipe.json + env: + CARGO_NET_GIT_FETCH_WITH_CLI: true + SSH_AUTH_SOCK: $SSH_AUTH_SOCK - name: Build and push uses: docker/build-push-action@v3 env: From f6ec1e38d3f52147f2a1fafd2d6f4521dbc43f0a Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:47:02 +0800 Subject: [PATCH 13/21] remove --- .github/workflows/docker.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a82e921c8e..a00e4afd13 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -326,11 +326,6 @@ jobs: echo 'git-fetch-with-cli = true' >> ~/.cargo/config.toml - name: Debug SSH agent run: ssh-add -l - - name: Build with cargo chef - run: cargo chef cook --release --recipe-path recipe.json - env: - CARGO_NET_GIT_FETCH_WITH_CLI: true - SSH_AUTH_SOCK: $SSH_AUTH_SOCK - name: Build and push uses: docker/build-push-action@v3 env: From 3f92adb84868b5144044db4a2fd699fbebc2cdf1 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 03:59:13 +0800 Subject: [PATCH 14/21] fix --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a00e4afd13..d4dc5aa1dd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -336,6 +336,7 @@ jobs: context: . file: ./build/dockerfiles/coordinator-api.Dockerfile push: true + ssh: default build-args: | CARGO_NET_GIT_FETCH_WITH_CLI=true tags: | From 2ab10fdcb7e9d3a5368089143fa9e8818db26cb0 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 04:07:37 +0800 Subject: [PATCH 15/21] fix --- .github/workflows/docker.yml | 18 +++--------------- build/dockerfiles/coordinator-api.Dockerfile | 9 +++++++++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d4dc5aa1dd..927b4173dc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -311,21 +311,10 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} - - name: Setup SSH config + - name: Run custom script run: | - mkdir -p ~/.ssh - echo "Host github.com" > ~/.ssh/config - echo " User git" >> ~/.ssh/config - echo " IdentityFile ~/.ssh/id_rsa" >> ~/.ssh/config - echo " StrictHostKeyChecking no" >> ~/.ssh/config - chmod 600 ~/.ssh/config - - name: Setup Cargo config - run: | - mkdir -p ~/.cargo - echo '[net]' > ~/.cargo/config.toml - echo 'git-fetch-with-cli = true' >> ~/.cargo/config.toml - - name: Debug SSH agent - run: ssh-add -l + chmod +x build/dockerfiles/coordinator-api/init-openvm.sh + build/dockerfiles/coordinator-api/init-openvm.sh - name: Build and push uses: docker/build-push-action@v3 env: @@ -336,7 +325,6 @@ jobs: context: . file: ./build/dockerfiles/coordinator-api.Dockerfile push: true - ssh: default build-args: | CARGO_NET_GIT_FETCH_WITH_CLI=true tags: | diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 3e501d65a0..c911b7720a 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -9,8 +9,17 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef as zkp-builder COPY ./common/libzkp/impl/rust-toolchain ./ COPY --from=planner /app/recipe.json recipe.json +# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 +# local patch for openvm +# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 ./common/libzkp/impl . RUN cargo build --release From 364c5aa90829d9577746086c31811cefb9835ccf Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 04:11:56 +0800 Subject: [PATCH 16/21] fix --- .github/workflows/docker.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 927b4173dc..247f9bfe7f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -325,8 +325,6 @@ jobs: context: . file: ./build/dockerfiles/coordinator-api.Dockerfile push: true - build-args: | - CARGO_NET_GIT_FETCH_WITH_CLI=true tags: | scrolltech/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }} scrolltech/${{ env.REPOSITORY }}:latest From e18f120e7e143b7c2b62b8fb6eb9c7896bd62a1d Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 04:16:00 +0800 Subject: [PATCH 17/21] remove branch name --- build/dockerfiles/coordinator-api/init-openvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/coordinator-api/init-openvm.sh b/build/dockerfiles/coordinator-api/init-openvm.sh index 908573955f..9d3f46768f 100755 --- a/build/dockerfiles/coordinator-api/init-openvm.sh +++ b/build/dockerfiles/coordinator-api/init-openvm.sh @@ -1,7 +1,7 @@ #!/bin/bash set -uex -OPENVM_GPU_COMMIT=dfa10b4 # branch: v1.0.0-auipc +OPENVM_GPU_COMMIT=dfa10b4 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd) From ba5b86b520052c490eb37b371aa640fd4eaa1a89 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 04:16:58 +0800 Subject: [PATCH 18/21] remove duplicate --- build/dockerfiles/coordinator-api.Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index c911b7720a..1d3ff32abd 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -15,11 +15,6 @@ 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 -# local patch for openvm -# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-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 ./common/libzkp/impl . RUN cargo build --release From 01c70afcf5bd4958879edb0753b79b600e62d9a4 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 12:46:09 +0000 Subject: [PATCH 19/21] =?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 0686143491..d01945d4bd 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.6" +var tag = "v4.5.7" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From cdae92bd83ca7261e25e669c021dd349c8328109 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 21:25:48 +0800 Subject: [PATCH 20/21] try fixing CI --- .github/workflows/common.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index e6bddcf726..c9f3bab262 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -42,6 +42,10 @@ jobs: uses: Swatinem/rust-cache@v2 with: workspaces: "common/libzkp/impl -> target" + - name: Setup SSH for private repos + uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} - name: Lint working-directory: 'common' run: | From 44babd32e4ab7e0d275742dcc70052ee27893a90 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 24 Apr 2025 21:33:38 +0800 Subject: [PATCH 21/21] tweaks --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 247f9bfe7f..c3df41a7ba 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -313,8 +313,7 @@ jobs: ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }} - name: Run custom script run: | - chmod +x build/dockerfiles/coordinator-api/init-openvm.sh - build/dockerfiles/coordinator-api/init-openvm.sh + ./build/dockerfiles/coordinator-api/init-openvm.sh - name: Build and push uses: docker/build-push-action@v3 env: