diff --git a/common/libzkp/impl/Cargo.lock b/common/libzkp/impl/Cargo.lock index b407878129..1465f17866 100644 --- a/common/libzkp/impl/Cargo.lock +++ b/common/libzkp/impl/Cargo.lock @@ -396,7 +396,7 @@ checksum = "46ff7aa715eb2404cb87fa94390d2c5d5addd70d9617e20b2398ee6f48cb21f0" dependencies = [ "alloy-sol-macro-input", "const-hex", - "heck", + "heck 0.5.0", "indexmap 2.7.1", "proc-macro-error2", "proc-macro2", @@ -414,7 +414,7 @@ checksum = "6f105fa700140c0cc6e2c3377adef650c389ac57b8ead8318a2e6bd52f1ae841" dependencies = [ "const-hex", "dunce", - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.98", @@ -520,7 +520,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -531,7 +531,7 @@ checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", "once_cell", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -742,7 +742,7 @@ dependencies = [ "object", "rustc-demangle", "serde", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -799,10 +799,24 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18c1406a27371b2f76232a2259df6ab607b91b5a0a7476a7729ff590df5a969a" dependencies = [ + "arrayvec", + "bitcode_derive", "bytemuck", + "glam", "serde", ] +[[package]] +name = "bitcode_derive" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "bitflags" version = "2.8.0" @@ -812,6 +826,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2" + [[package]] name = "bitvec" version = "1.0.1" @@ -1078,7 +1098,7 @@ version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.98", @@ -1103,7 +1123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -1430,27 +1450,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1582,7 +1581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -1794,7 +1793,7 @@ dependencies = [ "cfg-if", "libc", "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -1835,6 +1834,12 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "glam" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9" + [[package]] name = "glob" version = "0.3.2" @@ -1875,15 +1880,15 @@ dependencies = [ [[package]] name = "halo2-axiom" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f81aee7974478f9e3ea0cfd349d2a59a3482f7844386486a98e4af9ed8bada6" +checksum = "62f0ca78d12ac5c893f286d7cdfe3869290305ab8cac376e2592cdc8396da102" dependencies = [ "blake2b_simd", "crossbeam", "ff 0.13.0", "group 0.13.0", - "halo2curves-axiom 0.7.0", + "halo2curves-axiom", "itertools 0.11.0", "maybe-rayon", "pairing 0.23.0", @@ -1897,8 +1902,9 @@ dependencies = [ [[package]] name = "halo2-base" -version = "0.4.1" -source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.4.1-git#2fe813b3ccd4f224da195d61829effb20599dcbd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678cf3adc0a39d7b4d9b82315a655201aa24a430dd1902b162c508047f56ac69" dependencies = [ "getset", "halo2-axiom", @@ -1917,8 +1923,9 @@ dependencies = [ [[package]] name = "halo2-ecc" -version = "0.4.1" -source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.4.1-git#2fe813b3ccd4f224da195d61829effb20599dcbd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c00681fdd1febaf552d8814e9f5a6a142d81a1514102190da07039588b366" dependencies = [ "halo2-base", "itertools 0.11.0", @@ -1977,33 +1984,6 @@ dependencies = [ "unroll", ] -[[package]] -name = "halo2curves-axiom" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75bb262279138550a603b35a73da944fcde987a321eb550c05276ce7b0a4e692" -dependencies = [ - "blake2b_simd", - "digest 0.10.7", - "ff 0.13.0", - "group 0.13.0", - "hex", - "lazy_static", - "maybe-rayon", - "num-bigint 0.4.6", - "num-traits", - "pairing 0.23.0", - "pasta_curves 0.5.1", - "paste", - "rand", - "rand_core", - "serde", - "serde_arrays", - "sha2", - "static_assertions", - "subtle", -] - [[package]] name = "halo2curves-axiom" version = "0.7.0" @@ -2072,6 +2052,12 @@ dependencies = [ "serde", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "heck" version = "0.5.0" @@ -2465,16 +2451,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags", - "libc", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -2645,18 +2621,18 @@ dependencies = [ [[package]] name = "munge" -version = "0.4.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0091202c98cf06da46c279fdf50cccb6b1c43b4521abdf6a27b4c7e71d5d9d7" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" dependencies = [ "munge_macro", ] [[package]] name = "munge_macro" -version = "0.4.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734799cf91479720b2f970c61a22850940dd91e27d4f02b1c6fc792778df2459" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" dependencies = [ "proc-macro2", "quote", @@ -2876,26 +2852,25 @@ dependencies = [ [[package]] name = "openvm" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "bytemuck", - "hex-literal", "num-bigint 0.4.6", - "num-traits", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-custom-insn", + "openvm-platform", "openvm-rv32im-guest", "serde", ] [[package]] name = "openvm-algebra-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-algebra-transpiler", @@ -2914,13 +2889,12 @@ dependencies = [ "serde-big-array", "serde_with", "strum 0.26.3", - "tracing", ] [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", @@ -2929,24 +2903,21 @@ dependencies = [ [[package]] name = "openvm-algebra-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "num-bigint 0.4.6", - "openvm", "openvm-algebra-complex-macros", "openvm-algebra-moduli-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "serde", "serde-big-array", "strum_macros 0.26.4", ] [[package]] name = "openvm-algebra-moduli-macros" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", @@ -2955,8 +2926,8 @@ dependencies = [ [[package]] name = "openvm-algebra-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-algebra-guest", "openvm-instructions", @@ -2965,13 +2936,12 @@ dependencies = [ "openvm-transpiler", "rrs-lib", "strum 0.26.3", - "strum_macros 0.26.4", ] [[package]] name = "openvm-bigint-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -2992,21 +2962,22 @@ dependencies = [ [[package]] name = "openvm-bigint-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "num-bigint 0.4.6", "num-traits", "openvm", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "serde", + "serde-big-array", "strum_macros 0.26.4", ] [[package]] name = "openvm-bigint-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-bigint-guest", "openvm-instructions", @@ -3020,27 +2991,22 @@ dependencies = [ [[package]] name = "openvm-build" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "cargo_metadata", - "dirs", "eyre", - "hex", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "serde", "serde_json", - "tempfile", ] [[package]] name = "openvm-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "async-trait", "backtrace", - "bitcode", "cfg-if", "derivative", "derive-new 0.6.0", @@ -3048,10 +3014,8 @@ dependencies = [ "enum_dispatch", "eyre", "getset", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", - "metrics-derive", - "once_cell", "openvm-circuit-derive", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", @@ -3059,72 +3023,69 @@ dependencies = [ "openvm-poseidon2-air", "openvm-stark-backend", "p3-baby-bear", - "p3-symmetric", "rand", - "rayon", "rustc-hash 2.1.1", "serde", "serde-big-array", "static_assertions", "thiserror 1.0.69", - "toml", "tracing", ] [[package]] name = "openvm-circuit-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", - "proc-macro2", + "itertools 0.14.0", "quote", "syn 2.0.98", ] [[package]] name = "openvm-circuit-primitives" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", - "itertools 0.13.0", - "lazy_static", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-circuit-primitives-derive", "openvm-stark-backend", "rand", - "serde", "tracing", ] [[package]] name = "openvm-circuit-primitives-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", - "proc-macro2", + "itertools 0.14.0", "quote", "syn 2.0.98", ] [[package]] -name = "openvm-custom-insn" -version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1#30576cc6ce838f213bf05b2e4ad035d95498c8b3" +name = "openvm-continuations" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", + "derivative", + "openvm-circuit", + "openvm-native-compiler", + "openvm-native-recursion", + "openvm-stark-backend", + "openvm-stark-sdk", + "serde", + "static_assertions", ] [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "proc-macro2", "quote", @@ -3133,13 +3094,12 @@ dependencies = [ [[package]] name = "openvm-ecc-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", "num-traits", @@ -3157,6 +3117,7 @@ dependencies = [ "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", + "rand", "serde", "serde_with", "strum 0.26.3", @@ -3164,35 +3125,33 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "ecdsa", "elliptic-curve", "group 0.13.0", - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "hex-literal", - "itertools 0.13.0", "k256", "lazy_static", "num-bigint 0.4.6", - "num-traits", + "once_cell", "openvm", "openvm-algebra-guest", "openvm-algebra-moduli-macros", + "openvm-custom-insn", "openvm-ecc-sw-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", "openvm-rv32im-guest", "p256", - "rand", "serde", "strum_macros 0.26.4", ] [[package]] name = "openvm-ecc-sw-macros" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", @@ -3201,8 +3160,8 @@ dependencies = [ [[package]] name = "openvm-ecc-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-ecc-guest", "openvm-instructions", @@ -3215,12 +3174,12 @@ dependencies = [ [[package]] name = "openvm-instructions" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "backtrace", "derive-new 0.6.0", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-instructions-derive", @@ -3232,25 +3191,21 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", "quote", "syn 2.0.98", ] [[package]] name = "openvm-keccak256-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", - "eyre", - "hex-literal", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -3271,18 +3226,17 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "serde", + "openvm-platform", "tiny-keccak", ] [[package]] name = "openvm-keccak256-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3295,18 +3249,18 @@ dependencies = [ [[package]] name = "openvm-macros-common" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "syn 2.0.98", ] [[package]] name = "openvm-mod-circuit-builder" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-circuit", @@ -3322,14 +3276,13 @@ dependencies = [ [[package]] name = "openvm-native-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -3350,11 +3303,11 @@ dependencies = [ [[package]] name = "openvm-native-compiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "backtrace", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "num-bigint 0.4.6", "num-integer", @@ -3374,21 +3327,20 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", "quote", "syn 2.0.98", ] [[package]] name = "openvm-native-recursion" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "cfg-if", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "metrics 0.23.0", "once_cell", @@ -3405,22 +3357,22 @@ dependencies = [ "rand", "serde", "serde_json", + "serde_with", "snark-verifier-sdk", "tracing", ] [[package]] name = "openvm-pairing-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", - "once_cell", "openvm-algebra-circuit", "openvm-circuit", "openvm-circuit-derive", @@ -3442,13 +3394,13 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "group 0.13.0", - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "hex-literal", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "num-bigint 0.4.6", "num-traits", @@ -3456,9 +3408,10 @@ dependencies = [ "openvm-algebra-complex-macros", "openvm-algebra-guest", "openvm-algebra-moduli-macros", + "openvm-custom-insn", "openvm-ecc-guest", "openvm-ecc-sw-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "openvm-rv32im-guest", "rand", "serde", @@ -3467,8 +3420,8 @@ dependencies = [ [[package]] name = "openvm-pairing-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3481,35 +3434,22 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1#30576cc6ce838f213bf05b2e4ad035d95498c8b3" -dependencies = [ - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1)", - "stability", - "strum_macros 0.26.4", -] - -[[package]] -name = "openvm-platform" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "getrandom 0.2.15", "libm", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "stability", - "strum_macros 0.26.4", + "openvm-custom-insn", + "openvm-rv32im-guest", ] [[package]] name = "openvm-poseidon2-air" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derivative", - "itertools 0.13.0", "lazy_static", - "openvm-circuit-primitives", "openvm-stark-backend", "openvm-stark-sdk", "p3-monty-31", @@ -3517,17 +3457,16 @@ dependencies = [ "p3-poseidon2-air", "p3-symmetric", "rand", - "tracing", "zkhash", ] [[package]] name = "openvm-rv32-adapters" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", @@ -3539,22 +3478,18 @@ dependencies = [ "serde", "serde-big-array", "serde_with", - "tracing", ] [[package]] name = "openvm-rv32im-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", - "once_cell", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -3566,22 +3501,21 @@ dependencies = [ "serde", "serde-big-array", "strum 0.26.3", - "tracing", ] [[package]] name = "openvm-rv32im-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-custom-insn", "strum_macros 0.26.4", ] [[package]] name = "openvm-rv32im-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3596,8 +3530,8 @@ dependencies = [ [[package]] name = "openvm-sdk" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "async-trait", "bitcode", @@ -3607,7 +3541,7 @@ dependencies = [ "derive_more 1.0.0", "eyre", "getset", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "openvm", "openvm-algebra-circuit", @@ -3616,6 +3550,7 @@ dependencies = [ "openvm-bigint-transpiler", "openvm-build", "openvm-circuit", + "openvm-continuations", "openvm-ecc-circuit", "openvm-ecc-transpiler", "openvm-keccak256-circuit", @@ -3632,15 +3567,18 @@ dependencies = [ "openvm-stark-backend", "openvm-stark-sdk", "openvm-transpiler", + "p3-fri", "serde", - "static_assertions", + "serde_json", + "serde_with", + "thiserror 1.0.69", "tracing", ] [[package]] name = "openvm-sha256-air" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", @@ -3650,10 +3588,9 @@ dependencies = [ [[package]] name = "openvm-sha256-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "openvm-circuit", @@ -3674,18 +3611,17 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "sha2", ] [[package]] name = "openvm-sha256-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -3698,14 +3634,14 @@ dependencies = [ [[package]] name = "openvm-stark-backend" -version = "1.0.0-rc.0" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=bc364134b8315c27bfd29c6e77ac79fe77090137#bc364134b8315c27bfd29c6e77ac79fe77090137" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/stark-backend.git?rev=b051e8978da9c829a76b262abf4a9736c8d1681e#b051e8978da9c829a76b262abf4a9736c8d1681e" dependencies = [ - "async-trait", + "bitcode", "cfg-if", "derivative", "derive-new 0.7.0", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "p3-air", "p3-challenger", @@ -3724,13 +3660,13 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" -version = "1.0.0-rc.0" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=bc364134b8315c27bfd29c6e77ac79fe77090137#bc364134b8315c27bfd29c6e77ac79fe77090137" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/stark-backend.git?rev=b051e8978da9c829a76b262abf4a9736c8d1681e#b051e8978da9c829a76b262abf4a9736c8d1681e" dependencies = [ "derivative", "derive_more 0.99.19", "ff 0.13.0", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "metrics-tracing-context", "metrics-util", @@ -3759,27 +3695,18 @@ dependencies = [ [[package]] name = "openvm-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "derive_more 1.0.0", "elf", "eyre", "openvm-instructions", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "openvm-stark-backend", "rrs-lib", - "strum 0.26.3", "thiserror 1.0.69", - "tracing", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-float" version = "4.6.0" @@ -3810,7 +3737,7 @@ dependencies = [ [[package]] name = "p3-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-field", "p3-matrix", @@ -3819,7 +3746,7 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-field", "p3-mds", @@ -3833,7 +3760,7 @@ dependencies = [ [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "blake3", "p3-symmetric", @@ -3843,7 +3770,7 @@ dependencies = [ [[package]] name = "p3-bn254-fr" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "ff 0.13.0", "halo2curves", @@ -3858,7 +3785,7 @@ dependencies = [ [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -3870,9 +3797,9 @@ dependencies = [ [[package]] name = "p3-commit" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-challenger", "p3-dft", "p3-field", @@ -3884,9 +3811,9 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-matrix", "p3-maybe-rayon", @@ -3897,9 +3824,9 @@ dependencies = [ [[package]] name = "p3-field" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-integer", "num-traits", @@ -3914,9 +3841,9 @@ dependencies = [ [[package]] name = "p3-fri" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-challenger", "p3-commit", "p3-dft", @@ -3933,7 +3860,7 @@ dependencies = [ [[package]] name = "p3-goldilocks" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "num-bigint 0.4.6", "p3-dft", @@ -3950,7 +3877,7 @@ dependencies = [ [[package]] name = "p3-interpolation" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-field", "p3-matrix", @@ -3961,9 +3888,9 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-symmetric", "p3-util", @@ -3973,7 +3900,7 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-air", "p3-field", @@ -3987,9 +3914,9 @@ dependencies = [ [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-maybe-rayon", "p3-util", @@ -4002,7 +3929,7 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "rayon", ] @@ -4010,9 +3937,9 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-dft", "p3-field", "p3-matrix", @@ -4024,9 +3951,9 @@ dependencies = [ [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-commit", "p3-field", "p3-matrix", @@ -4041,9 +3968,9 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "p3-dft", "p3-field", @@ -4062,7 +3989,7 @@ dependencies = [ [[package]] name = "p3-poseidon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-field", "p3-mds", @@ -4073,7 +4000,7 @@ dependencies = [ [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "gcd", "p3-field", @@ -4085,7 +4012,7 @@ dependencies = [ [[package]] name = "p3-poseidon2-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "p3-air", "p3-field", @@ -4101,9 +4028,9 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "serde", ] @@ -4111,9 +4038,9 @@ dependencies = [ [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-air", "p3-challenger", "p3-commit", @@ -4129,7 +4056,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+https://github.com/Plonky3/Plonky3.git?rev=88d7f05#88d7f059500fd956a7c1eb121e08653e5974728d" dependencies = [ "serde", ] @@ -4264,9 +4191,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] name = "poseidon-primitives" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd95570f7ea849b4187298b5bb229643e44e1d47ddf3979d0db8a1c28be26a8" +checksum = "6e4aaeda7a092e21165cc5f0cbc738e72a46f31c03c3cbd87b71ceae9d2d93bc" dependencies = [ "bitvec", "ff 0.13.0", @@ -4535,17 +4462,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "regex" version = "1.11.1" @@ -4602,7 +4518,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4621,7 +4537,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4638,7 +4554,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -4649,7 +4565,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4662,7 +4578,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4675,7 +4591,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4699,7 +4615,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -4724,7 +4640,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4738,7 +4654,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4754,7 +4670,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -4769,7 +4685,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4789,7 +4705,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4814,7 +4730,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4835,7 +4751,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4849,7 +4765,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4867,7 +4783,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "serde", "serde_json", @@ -4877,7 +4793,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "metrics 0.24.1", "metrics-derive", @@ -4886,7 +4802,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4899,7 +4815,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "anyhow", "bincode", @@ -4916,7 +4832,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "once_cell", @@ -4929,7 +4845,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4958,7 +4874,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -4971,7 +4887,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4986,7 +4902,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5009,7 +4925,7 @@ dependencies = [ [[package]] name = "reth-scroll-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "revm 19.4.0", ] @@ -5017,7 +4933,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5043,7 +4959,7 @@ dependencies = [ [[package]] name = "reth-scroll-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-primitives", @@ -5055,7 +4971,7 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5079,7 +4995,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "bytes", @@ -5092,7 +5008,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -5103,7 +5019,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5128,7 +5044,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5143,7 +5059,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "clap", "eyre", @@ -5158,7 +5074,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5180,7 +5096,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5203,7 +5119,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5221,7 +5137,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5236,7 +5152,7 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "zstd", ] @@ -5259,7 +5175,7 @@ dependencies = [ [[package]] name = "revm" version = "19.4.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "auto_impl", "cfg-if", @@ -5298,7 +5214,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "revm-primitives 15.1.0", "serde", @@ -5336,7 +5252,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "16.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -5393,7 +5309,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "alloy-eip2930", "alloy-eip7702 0.5.1", @@ -5598,7 +5514,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -5625,22 +5541,10 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" -[[package]] -name = "sbv" -version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" -dependencies = [ - "sbv-core", - "sbv-helpers", - "sbv-kv", - "sbv-primitives", - "sbv-trie", -] - [[package]] name = "sbv-core" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "reth-evm", "reth-evm-ethereum", @@ -5657,7 +5561,7 @@ dependencies = [ [[package]] name = "sbv-helpers" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "revm 19.4.0", ] @@ -5665,7 +5569,7 @@ dependencies = [ [[package]] name = "sbv-kv" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "auto_impl", "hashbrown 0.15.2", @@ -5675,7 +5579,7 @@ dependencies = [ [[package]] name = "sbv-primitives" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5706,7 +5610,7 @@ dependencies = [ [[package]] name = "sbv-trie" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "alloy-rlp", "alloy-trie", @@ -5721,7 +5625,7 @@ dependencies = [ [[package]] name = "scroll-alloy-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5739,7 +5643,7 @@ dependencies = [ [[package]] name = "scroll-alloy-network" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-network", @@ -5753,7 +5657,7 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5769,40 +5673,52 @@ dependencies = [ [[package]] name = "scroll-zkvm-circuit-input-types" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "alloy-primitives", "alloy-serde 0.8.3", + "itertools 0.14.0", "openvm", + "openvm-custom-insn", "openvm-rv32im-guest", "rkyv", - "sbv", + "sbv-core", + "sbv-kv", + "sbv-primitives", + "sbv-trie", "serde", + "sha2", + "sha3", "tiny-keccak", + "vm-zstd", ] [[package]] name = "scroll-zkvm-prover" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "alloy-primitives", "base64 0.22.1", "bincode", + "c-kzg", "git-version", "hex", "metrics 0.23.0", + "metrics-tracing-context", "metrics-util", + "munge", "once_cell", "openvm-circuit", + "openvm-continuations", "openvm-native-circuit", "openvm-native-recursion", "openvm-sdk", "openvm-stark-sdk", "revm 19.5.0", "rkyv", - "sbv", + "sbv-primitives", "scroll-zkvm-circuit-input-types", "scroll-zkvm-verifier", "serde", @@ -5816,13 +5732,14 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover.git?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "bincode", "eyre", "itertools 0.14.0", "openvm-circuit", + "openvm-continuations", "openvm-native-circuit", "openvm-native-recursion", "openvm-sdk", @@ -6093,8 +6010,9 @@ dependencies = [ [[package]] name = "snark-verifier" -version = "0.1.8" -source = "git+https://github.com/axiom-crypto/snark-verifier?branch=zkvm-v0.1#ab65fda41b56571aa33dd27f68ef1ea461e3fadc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e4c4ed1edca41687fe2d8a09ba30badb0a5cc7fa56dd1159d62aeab7c99ace" dependencies = [ "halo2-base", "halo2-ecc", @@ -6114,8 +6032,9 @@ dependencies = [ [[package]] name = "snark-verifier-sdk" -version = "0.1.8" -source = "git+https://github.com/axiom-crypto/snark-verifier?branch=zkvm-v0.1#ab65fda41b56571aa33dd27f68ef1ea461e3fadc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "babff70ce6292fce03f692d68569f76b8f6710dbac7be7fe5f32c915909c9065" dependencies = [ "ark-std 0.3.0", "bincode", @@ -6151,16 +6070,6 @@ dependencies = [ "der", ] -[[package]] -name = "stability" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" -dependencies = [ - "quote", - "syn 2.0.98", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -6177,7 +6086,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -6198,6 +6107,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + [[package]] name = "strum" version = "0.26.3" @@ -6216,13 +6131,26 @@ dependencies = [ "strum_macros 0.27.1", ] +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.98", +] + [[package]] name = "strum_macros" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -6235,7 +6163,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -6336,7 +6264,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -6498,7 +6426,6 @@ source = "git+https://github.com/scroll-tech/tiny-keccak?branch=scroll-patch-v2. dependencies = [ "cfg-if", "crunchy", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1)", ] [[package]] @@ -6797,6 +6724,19 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vm-zstd" +version = "0.1.1" +source = "git+https://github.com/scroll-tech/rust-zstd-decompressor.git?tag=v0.1.1#c7e953fc690d5f56f201892d88311c0f938f2d21" +dependencies = [ + "anyhow", + "bitstream-io", + "itertools 0.11.0", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", +] + [[package]] name = "wait-timeout" version = "0.2.1" @@ -6911,7 +6851,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] [[package]] @@ -6927,7 +6867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core 0.57.0", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -6936,7 +6876,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -6948,7 +6888,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -6985,16 +6925,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -7003,22 +6934,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -7027,46 +6943,28 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -7079,48 +6977,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -7320,4 +7194,4 @@ dependencies = [ [[package]] name = "zstd" version = "1.1.4" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml index fe47028f68..b1b6a13bb3 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.1.0-rc.6", package = "scroll-zkvm-prover" } -euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.1.0-rc.6", package = "scroll-zkvm-verifier" } +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" } base64 = "0.13.0" env_logger = "0.9.0" diff --git a/common/libzkp/impl/src/verifier.rs b/common/libzkp/impl/src/verifier.rs index b890b52d55..f1bad49dd4 100644 --- a/common/libzkp/impl/src/verifier.rs +++ b/common/libzkp/impl/src/verifier.rs @@ -1,9 +1,11 @@ #![allow(static_mut_refs)] mod euclid; +mod euclidv2; use anyhow::{bail, Result}; use euclid::EuclidVerifier; +use euclidv2::EuclidV2Verifier; use serde::{Deserialize, Serialize}; use std::{cell::OnceCell, path::Path, rc::Rc}; @@ -51,7 +53,17 @@ pub fn init(config: VerifierConfig) { unsafe { VERIFIER_LOW .set(VerifierPair( - config.high_version_circuit.fork_name, + "euclid".to_string(), + Rc::new(Box::new(verifier)), + )) + .unwrap_unchecked(); + } + + let verifier = EuclidV2Verifier::new(&config.high_version_circuit.assets_path); + unsafe { + VERIFIER_HIGH + .set(VerifierPair( + "euclidV2".to_string(), Rc::new(Box::new(verifier)), )) .unwrap_unchecked(); diff --git a/common/libzkp/impl/src/verifier/euclid.rs b/common/libzkp/impl/src/verifier/euclid.rs index 54eac746fa..93673d4544 100644 --- a/common/libzkp/impl/src/verifier/euclid.rs +++ b/common/libzkp/impl/src/verifier/euclid.rs @@ -4,13 +4,13 @@ use anyhow::Result; use crate::utils::panic_catch; use euclid_prover::{BatchProof, BundleProof, ChunkProof}; -use euclid_verifier::verifier::{BatchVerifier, BundleVerifier, ChunkVerifier}; +use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV1, ChunkVerifier}; use std::{fs::File, path::Path}; pub struct EuclidVerifier { chunk_verifier: ChunkVerifier, batch_verifier: BatchVerifier, - bundle_verifier: BundleVerifier, + bundle_verifier: BundleVerifierEuclidV1, } impl EuclidVerifier { @@ -24,7 +24,7 @@ impl EuclidVerifier { .expect("Setting up chunk verifier"), batch_verifier: BatchVerifier::setup(&config, &exe, &verifier_bin) .expect("Setting up batch verifier"), - bundle_verifier: BundleVerifier::setup(&config, &exe, &verifier_bin) + bundle_verifier: BundleVerifierEuclidV1::setup(&config, &exe, &verifier_bin) .expect("Setting up bundle verifier"), } } diff --git a/common/libzkp/impl/src/verifier/euclidv2.rs b/common/libzkp/impl/src/verifier/euclidv2.rs new file mode 100644 index 0000000000..7f4cb9d433 --- /dev/null +++ b/common/libzkp/impl/src/verifier/euclidv2.rs @@ -0,0 +1,65 @@ +use super::{ProofVerifier, TaskType, VKDump}; + +use anyhow::Result; + +use crate::utils::panic_catch; +use euclid_prover::{BatchProof, BundleProof, ChunkProof}; +use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV2, ChunkVerifier}; +use std::{fs::File, path::Path}; + +pub struct EuclidV2Verifier { + chunk_verifier: ChunkVerifier, + batch_verifier: BatchVerifier, + bundle_verifier: BundleVerifierEuclidV2, +} + +impl EuclidV2Verifier { + pub fn new(assets_dir: &str) -> Self { + let verifier_bin = Path::new(assets_dir).join("verifier.bin"); + let config = Path::new(assets_dir).join("root-verifier-vm-config"); + let exe = Path::new(assets_dir).join("root-verifier-committed-exe"); + + Self { + chunk_verifier: ChunkVerifier::setup(&config, &exe, &verifier_bin) + .expect("Setting up chunk verifier"), + batch_verifier: BatchVerifier::setup(&config, &exe, &verifier_bin) + .expect("Setting up batch verifier"), + bundle_verifier: BundleVerifierEuclidV2::setup(&config, &exe, &verifier_bin) + .expect("Setting up bundle verifier"), + } + } +} + +impl ProofVerifier for EuclidV2Verifier { + fn verify(&self, task_type: super::TaskType, proof: Vec) -> Result { + panic_catch(|| match task_type { + TaskType::Chunk => { + let proof = serde_json::from_slice::(proof.as_slice()).unwrap(); + self.chunk_verifier + .verify_proof(proof.proof.as_root_proof().unwrap()) + } + TaskType::Batch => { + let proof = serde_json::from_slice::(proof.as_slice()).unwrap(); + self.batch_verifier + .verify_proof(proof.proof.as_root_proof().unwrap()) + } + TaskType::Bundle => { + let proof = serde_json::from_slice::(proof.as_slice()).unwrap(); + self.bundle_verifier + .verify_proof_evm(&proof.proof.as_evm_proof().unwrap()) + } + }) + .map_err(|err_str: String| anyhow::anyhow!(err_str)) + } + + fn dump_vk(&self, file: &Path) { + let f = File::create(file).expect("Failed to open file to dump VK"); + + let dump = VKDump { + chunk_vk: base64::encode(self.chunk_verifier.get_app_vk()), + batch_vk: base64::encode(self.batch_verifier.get_app_vk()), + bundle_vk: base64::encode(self.bundle_verifier.get_app_vk()), + }; + serde_json::to_writer(f, &dump).expect("Failed to dump VK"); + } +} diff --git a/common/types/message/message.go b/common/types/message/message.go index 7516faf44e..6b69ce00cc 100644 --- a/common/types/message/message.go +++ b/common/types/message/message.go @@ -4,12 +4,18 @@ import ( "encoding/json" "errors" "fmt" + "math/big" "github.com/scroll-tech/go-ethereum/common" + "github.com/scroll-tech/go-ethereum/common/hexutil" ) const ( - euclidFork = "euclid" + EuclidFork = "euclid" + EuclidV2Fork = "euclidV2" + + EuclidForkNameForProver = "euclidv1" + EuclidV2ForkNameForProver = "euclidv2" ) // ProofType represents the type of task. @@ -39,38 +45,102 @@ const ( ProofTypeBundle ) -// ChunkTaskDetail is a type containing ChunkTask detail. +// ChunkTaskDetail is a type containing ChunkTask detail for chunk task. type ChunkTaskDetail struct { - BlockHashes []common.Hash `json:"block_hashes"` + // use one of the string of EuclidFork / EuclidV2Fork + ForkName string `json:"fork_name"` + BlockHashes []common.Hash `json:"block_hashes"` + PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"` +} + +// it is a hex encoded big with fixed length on 48 bytes +type Byte48 struct { + hexutil.Big +} + +func (e Byte48) MarshalText() ([]byte, error) { + i := e.ToInt() + // overrite encode big + if sign := i.Sign(); sign < 0 { + // sanity check + return nil, errors.New("Byte48 must be positive integer") + } else { + s := i.Text(16) + if len(s) > 96 { + return nil, errors.New("integer Exceed 384bit") + } + return []byte(fmt.Sprintf("0x%0*s", 96, s)), nil + } +} + +func isString(input []byte) bool { + return len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"' +} + +// hexutil.Big has limition of 256bit so we have to override it ... +func (e *Byte48) UnmarshalJSON(input []byte) error { + if !isString(input) { + return errors.New("not hex string") + } + + b, err := hexutil.Decode(string(input[1 : len(input)-1])) + if err != nil { + return err + } + if len(b) != 48 { + return fmt.Errorf("not a 48 bytes hex string: %d", len(b)) + } + var dec big.Int + dec.SetBytes(b) + *e = Byte48{(hexutil.Big)(dec)} + return nil } // BatchTaskDetail is a type containing BatchTask detail. type BatchTaskDetail struct { - ChunkInfos []*ChunkInfo `json:"chunk_infos"` - ChunkProofs []ChunkProof `json:"chunk_proofs"` - BatchHeader interface{} `json:"batch_header"` - BlobBytes []byte `json:"blob_bytes"` - KzgProof []byte `json:"kzg_proof"` - KzgCommitment []byte `json:"kzg_commitment"` - Challenge common.Hash `json:"challenge"` + // use one of the string of EuclidFork / EuclidV2Fork + ForkName string `json:"fork_name"` + ChunkInfos []*ChunkInfo `json:"chunk_infos"` + ChunkProofs []ChunkProof `json:"chunk_proofs"` + BatchHeader interface{} `json:"batch_header"` + BlobBytes []byte `json:"blob_bytes"` + KzgProof Byte48 `json:"kzg_proof,omitempty"` + KzgCommitment Byte48 `json:"kzg_commitment,omitempty"` + ChallengeDigest common.Hash `json:"challenge_digest,omitempty"` } // BundleTaskDetail consists of all the information required to describe the task to generate a proof for a bundle of batches. type BundleTaskDetail struct { - BatchProofs []BatchProof `json:"batch_proofs"` + // use one of the string of EuclidFork / EuclidV2Fork + ForkName string `json:"fork_name"` + BatchProofs []BatchProof `json:"batch_proofs"` + BundleInfo *OpenVMBundleInfo `json:"bundle_info,omitempty"` } // ChunkInfo is for calculating pi_hash for chunk type ChunkInfo struct { - ChainID uint64 `json:"chain_id"` - PrevStateRoot common.Hash `json:"prev_state_root"` - PostStateRoot common.Hash `json:"post_state_root"` - WithdrawRoot common.Hash `json:"withdraw_root"` - DataHash common.Hash `json:"data_hash"` - IsPadding bool `json:"is_padding"` - TxBytes []byte `json:"tx_bytes"` - TxBytesHash common.Hash `json:"tx_data_digest"` - PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"` + ChainID uint64 `json:"chain_id"` + PrevStateRoot common.Hash `json:"prev_state_root"` + PostStateRoot common.Hash `json:"post_state_root"` + WithdrawRoot common.Hash `json:"withdraw_root"` + DataHash common.Hash `json:"data_hash"` + IsPadding bool `json:"is_padding"` + TxBytes []byte `json:"tx_bytes"` + TxBytesHash common.Hash `json:"tx_data_digest"` + PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"` + PostMsgQueueHash common.Hash `json:"post_msg_queue_hash"` + TxDataLength uint64 `json:"tx_data_length"` + InitialBlockNumber uint64 `json:"initial_block_number"` + BlockCtxs []BlockContextV2 `json:"block_ctxs"` +} + +// BlockContextV2 is the block context for euclid v2 +type BlockContextV2 struct { + Timestamp uint64 `json:"timestamp"` + BaseFee hexutil.Big `json:"base_fee"` + GasLimit uint64 `json:"gas_limit"` + NumTxs uint16 `json:"num_txs"` + NumL1Msgs uint16 `json:"num_l1_msgs"` } // SubCircuitRowUsage tracing info added in v0.11.0rc8 @@ -87,7 +157,7 @@ type ChunkProof interface { // NewChunkProof creates a new ChunkProof instance. func NewChunkProof(hardForkName string) ChunkProof { switch hardForkName { - case euclidFork: + case EuclidFork, EuclidV2Fork: return &OpenVMChunkProof{} default: return &Halo2ChunkProof{} @@ -121,7 +191,7 @@ type BatchProof interface { // NewBatchProof creates a new BatchProof instance. func NewBatchProof(hardForkName string) BatchProof { switch hardForkName { - case euclidFork: + case EuclidFork, EuclidV2Fork: return &OpenVMBatchProof{} default: return &Halo2BatchProof{} @@ -178,7 +248,7 @@ type BundleProof interface { // NewBundleProof creates a new BundleProof instance. func NewBundleProof(hardForkName string) BundleProof { switch hardForkName { - case euclidFork: + case EuclidFork, EuclidV2Fork: return &OpenVMBundleProof{} default: return &Halo2BundleProof{} @@ -258,12 +328,14 @@ func (p *OpenVMChunkProof) Proof() []byte { // OpenVMBatchInfo is for calculating pi_hash for batch header type OpenVMBatchInfo struct { - ParentBatchHash common.Hash `json:"parent_batch_hash"` - ParentStateRoot common.Hash `json:"parent_state_root"` - StateRoot common.Hash `json:"state_root"` - WithdrawRoot common.Hash `json:"withdraw_root"` - BatchHash common.Hash `json:"batch_hash"` - ChainID uint64 `json:"chain_id"` + ParentBatchHash common.Hash `json:"parent_batch_hash"` + ParentStateRoot common.Hash `json:"parent_state_root"` + StateRoot common.Hash `json:"state_root"` + WithdrawRoot common.Hash `json:"withdraw_root"` + BatchHash common.Hash `json:"batch_hash"` + ChainID uint64 `json:"chain_id"` + PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"` + PostMsgQueueHash common.Hash `json:"post_msg_queue_hash"` } // BatchProof includes the proof info that are required for batch verification and rollup. @@ -323,6 +395,7 @@ type OpenVMBundleInfo struct { NumBatches uint32 `json:"num_batches"` PrevBatchHash common.Hash `json:"prev_batch_hash"` BatchHash common.Hash `json:"batch_hash"` + MsgQueueHash common.Hash `json:"msg_queue_hash"` } // OpenVMBundleProof includes the proof info that are required for verification of a bundle of batch proofs. diff --git a/common/types/message/message_test.go b/common/types/message/message_test.go new file mode 100644 index 0000000000..c757cbf248 --- /dev/null +++ b/common/types/message/message_test.go @@ -0,0 +1,22 @@ +package message + +import ( + "fmt" + "testing" +) + +func TestBytes48(t *testing.T) { + ti := &Byte48{} + ti.UnmarshalText([]byte("0x1")) + if s, err := ti.MarshalText(); err == nil { + if len(s) != 98 { + panic(fmt.Sprintf("wrong str: %s", s)) + } + } + ti.UnmarshalText([]byte("0x0")) + if s, err := ti.MarshalText(); err == nil { + if len(s) != 98 { + panic(fmt.Sprintf("wrong str: %s", s)) + } + } +} diff --git a/common/version/version.go b/common/version/version.go index 4b56e16a49..b3f1ccd72c 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.4.99" +var tag = "v4.5.0" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/coordinator/go.mod b/coordinator/go.mod index 92ad5b33be..d99242556e 100644 --- a/coordinator/go.mod +++ b/coordinator/go.mod @@ -2,8 +2,6 @@ module scroll-tech/coordinator go 1.22 -toolchain go1.22.2 - require ( github.com/appleboy/gin-jwt/v2 v2.9.1 github.com/gin-gonic/gin v1.9.1 @@ -11,7 +9,7 @@ require ( github.com/google/uuid v1.6.0 github.com/mitchellh/mapstructure v1.5.0 github.com/prometheus/client_golang v1.19.0 - github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435 + github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 github.com/shopspring/decimal v1.3.1 github.com/stretchr/testify v1.10.0 diff --git a/coordinator/go.sum b/coordinator/go.sum index 30b5c6f5ce..a4777cd1b1 100644 --- a/coordinator/go.sum +++ b/coordinator/go.sum @@ -177,8 +177,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435 h1:X9fkvjrYBY79lGgKEPpUhuiJ4vWpWwzOVw4H8CU8L54= -github.com/scroll-tech/da-codec v0.1.3-0.20250310095435-012aaee6b435/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 h1:Ioc01J0WEMxuwFvEPGJeBKXdf2KY4Yc3XbFky/IxLlI= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 h1:NEsjCG6uSvLRBlsP3+x6PL1kM+Ojs3g8UGotIPgJSz8= github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ= github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE= diff --git a/coordinator/internal/logic/auth/login.go b/coordinator/internal/logic/auth/login.go index 205bcce197..b8d1bf4775 100644 --- a/coordinator/internal/logic/auth/login.go +++ b/coordinator/internal/logic/auth/login.go @@ -9,6 +9,7 @@ import ( "github.com/scroll-tech/go-ethereum/log" "gorm.io/gorm" + "scroll-tech/common/types/message" "scroll-tech/common/version" "scroll-tech/coordinator/internal/config" @@ -42,9 +43,10 @@ func NewLoginLogic(db *gorm.DB, cfg *config.Config, vf *verifier.Verifier) *Logi var highHardForks []string highHardForks = append(highHardForks, cfg.ProverManager.Verifier.HighVersionCircuit.ForkName) - if cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != "euclid" { + if cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != message.EuclidFork && cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != message.EuclidV2Fork { highHardForks = append(highHardForks, cfg.ProverManager.Verifier.LowVersionCircuit.ForkName) } + highHardForks = append(highHardForks, message.EuclidFork, message.EuclidV2Fork) proverVersionHardForkMap[cfg.ProverManager.Verifier.HighVersionCircuit.MinProverVersion] = highHardForks proverVersionHardForkMap[cfg.ProverManager.Verifier.LowVersionCircuit.MinProverVersion] = []string{cfg.ProverManager.Verifier.LowVersionCircuit.ForkName} diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 70d7340bb3..5103530760 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "math/big" "time" "github.com/gin-gonic/gin" @@ -11,6 +12,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/scroll-tech/da-codec/encoding" "github.com/scroll-tech/go-ethereum/common" + "github.com/scroll-tech/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" @@ -121,7 +123,7 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato for i := 0; i < len(proverTasks); i++ { if proverTasks[i].ProverPublicKey == taskCtx.PublicKey || taskCtx.ProverProviderType == uint8(coordinatorType.ProverProviderTypeExternal) && cutils.IsExternalProverNameMatch(proverTasks[i].ProverName, taskCtx.ProverName) { - log.Debug("get empty batch, the prover already failed this task", "height", getTaskParameter.ProverHeight) + log.Debug("get empty batch, the prover already failed this task", "height", getTaskParameter.ProverHeight, "task ID", tmpBatchTask.Hash, "prover name", taskCtx.ProverName, "prover public key", taskCtx.PublicKey) return nil, nil } } @@ -211,17 +213,23 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove WithdrawRoot: common.HexToHash(chunk.WithdrawRoot), DataHash: common.HexToHash(chunk.Hash), PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash), + PostMsgQueueHash: common.HexToHash(chunk.PostL1MessageQueueHash), IsPadding: false, } - if haloProot, ok := proof.(*message.Halo2ChunkProof); ok { - if haloProot.ChunkInfo != nil { - chunkInfo.TxBytes = haloProot.ChunkInfo.TxBytes + if halo2Proof, ok := proof.(*message.Halo2ChunkProof); ok { + if halo2Proof.ChunkInfo != nil { + chunkInfo.TxBytes = halo2Proof.ChunkInfo.TxBytes } } + if openvmProof, ok := proof.(*message.OpenVMChunkProof); ok { + chunkInfo.InitialBlockNumber = openvmProof.MetaData.ChunkInfo.InitialBlockNumber + chunkInfo.BlockCtxs = openvmProof.MetaData.ChunkInfo.BlockCtxs + chunkInfo.TxDataLength = openvmProof.MetaData.ChunkInfo.TxDataLength + } chunkInfos = append(chunkInfos, &chunkInfo) } - taskDetail, err := bp.getBatchTaskDetail(batch, chunkInfos, chunkProofs) + taskDetail, err := bp.getBatchTaskDetail(batch, chunkInfos, chunkProofs, hardForkName) if err != nil { return nil, fmt.Errorf("failed to get batch task detail, taskID:%s err:%w", task.TaskID, err) } @@ -238,6 +246,9 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove TaskData: string(chunkProofsBytes), HardForkName: hardForkName, } + + log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeBatch.String(), "hard_fork_name", hardForkName, "task_data", taskMsg.TaskData) + return taskMsg, nil } @@ -247,12 +258,18 @@ func (bp *BatchProverTask) recoverActiveAttempts(ctx *gin.Context, batchTask *or } } -func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*message.ChunkInfo, chunkProofs []message.ChunkProof) (*message.BatchTaskDetail, error) { +func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*message.ChunkInfo, chunkProofs []message.ChunkProof, hardForkName string) (*message.BatchTaskDetail, error) { taskDetail := &message.BatchTaskDetail{ ChunkInfos: chunkInfos, ChunkProofs: chunkProofs, } + if hardForkName == message.EuclidV2Fork { + taskDetail.ForkName = message.EuclidV2ForkNameForProver + } else if hardForkName == message.EuclidFork { + taskDetail.ForkName = message.EuclidForkNameForProver + } + dbBatchCodecVersion := encoding.CodecVersion(dbBatch.CodecVersion) switch dbBatchCodecVersion { case encoding.CodecV3, encoding.CodecV4, encoding.CodecV6, encoding.CodecV7: @@ -271,17 +288,13 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []* } taskDetail.BatchHeader = batchHeader taskDetail.BlobBytes = dbBatch.BlobBytes - - if len(dbBatch.BlobDataProof) < 160 { - return nil, fmt.Errorf("blob data proof length is less than 160 bytes = %d, taskID: %s: %s", len(dbBatch.BlobDataProof), dbBatch.Hash, common.Bytes2Hex(dbBatch.BlobDataProof)) - } - + taskDetail.ChallengeDigest = common.HexToHash(dbBatch.ChallengeDigest) // Memory layout of `BlobDataProof`: used in Codec.BlobDataProofForPointEvaluation() // | z | y | kzg_commitment | kzg_proof | // |---------|---------|----------------|-----------| // | bytes32 | bytes32 | bytes48 | bytes48 | - taskDetail.KzgProof = dbBatch.BlobDataProof[112:160] - taskDetail.KzgCommitment = dbBatch.BlobDataProof[64:112] - taskDetail.Challenge = common.Hash(dbBatch.BlobDataProof[0:32]) + taskDetail.KzgProof = message.Byte48{Big: hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[112:160]))} + taskDetail.KzgCommitment = message.Byte48{Big: hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[64:112]))} + return taskDetail, nil } diff --git a/coordinator/internal/logic/provertask/bundle_prover_task.go b/coordinator/internal/logic/provertask/bundle_prover_task.go index 87e7b214fc..1f9dc1a46e 100644 --- a/coordinator/internal/logic/provertask/bundle_prover_task.go +++ b/coordinator/internal/logic/provertask/bundle_prover_task.go @@ -9,6 +9,7 @@ import ( "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/scroll-tech/go-ethereum/common" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" @@ -120,7 +121,7 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat for i := 0; i < len(proverTasks); i++ { if proverTasks[i].ProverPublicKey == taskCtx.PublicKey || taskCtx.ProverProviderType == uint8(coordinatorType.ProverProviderTypeExternal) && cutils.IsExternalProverNameMatch(proverTasks[i].ProverName, taskCtx.ProverName) { - log.Debug("get empty bundle, the prover already failed this task", "height", getTaskParameter.ProverHeight) + log.Debug("get empty bundle, the prover already failed this task", "height", getTaskParameter.ProverHeight, "task ID", tmpBundleTask.Hash, "prover name", taskCtx.ProverName, "prover public key", taskCtx.PublicKey) return nil, nil } } @@ -194,6 +195,11 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov return nil, fmt.Errorf("failed to get batch proofs for bundle task id:%s, no batch found", task.TaskID) } + parentBatch, err := bp.batchOrm.GetBatchByHash(ctx, batches[0].ParentBatchHash) + if err != nil { + return nil, fmt.Errorf("failed to get parent batch for batch task id:%s err:%w", task.TaskID, err) + } + var batchProofs []message.BatchProof for _, batch := range batches { proof := message.NewBatchProof(hardForkName) @@ -207,6 +213,26 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov BatchProofs: batchProofs, } + if hardForkName == message.EuclidV2Fork { + taskDetail.ForkName = message.EuclidV2ForkNameForProver + } else if hardForkName == message.EuclidFork { + taskDetail.ForkName = message.EuclidForkNameForProver + } + + taskDetail.BundleInfo = &message.OpenVMBundleInfo{ + ChainID: bp.cfg.L2.ChainID, + PrevStateRoot: common.HexToHash(parentBatch.StateRoot), + PostStateRoot: common.HexToHash(batches[len(batches)-1].StateRoot), + WithdrawRoot: common.HexToHash(batches[len(batches)-1].WithdrawRoot), + NumBatches: uint32(len(batches)), + PrevBatchHash: common.HexToHash(batches[0].ParentBatchHash), + BatchHash: common.HexToHash(batches[len(batches)-1].Hash), + } + + if hardForkName == message.EuclidV2Fork { + taskDetail.BundleInfo.MsgQueueHash = common.HexToHash(batches[len(batches)-1].PostL1MessageQueueHash) + } + batchProofsBytes, err := json.Marshal(taskDetail) if err != nil { return nil, fmt.Errorf("failed to marshal batch proofs, taskID:%s err:%w", task.TaskID, err) @@ -219,6 +245,9 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov TaskData: string(batchProofsBytes), HardForkName: hardForkName, } + + log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeBundle.String(), "hard_fork_name", hardForkName, "task_data", taskMsg.TaskData) + return taskMsg, nil } diff --git a/coordinator/internal/logic/provertask/chunk_prover_task.go b/coordinator/internal/logic/provertask/chunk_prover_task.go index 1bd58a7449..40e34674f2 100644 --- a/coordinator/internal/logic/provertask/chunk_prover_task.go +++ b/coordinator/internal/logic/provertask/chunk_prover_task.go @@ -9,6 +9,7 @@ import ( "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/scroll-tech/go-ethereum/common" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/params" "gorm.io/gorm" @@ -118,7 +119,7 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato for i := 0; i < len(proverTasks); i++ { if proverTasks[i].ProverPublicKey == taskCtx.PublicKey || taskCtx.ProverProviderType == uint8(coordinatorType.ProverProviderTypeExternal) && cutils.IsExternalProverNameMatch(proverTasks[i].ProverName, taskCtx.ProverName) { - log.Debug("get empty chunk, the prover already failed this task", "height", getTaskParameter.ProverHeight) + log.Debug("get empty chunk, the prover already failed this task", "height", getTaskParameter.ProverHeight, "task ID", tmpChunkTask.Hash, "prover name", taskCtx.ProverName, "prover public key", taskCtx.PublicKey) return nil, nil } } @@ -162,7 +163,7 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return nil, ErrCoordinatorInternalFailure } - taskMsg, err := cp.formatProverTask(ctx.Copy(), &proverTask, hardForkName) + taskMsg, err := cp.formatProverTask(ctx.Copy(), &proverTask, chunkTask, hardForkName) if err != nil { cp.recoverActiveAttempts(ctx, chunkTask) log.Error("format prover task failure", "task_id", chunkTask.Hash, "err", err) @@ -179,17 +180,27 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato return taskMsg, nil } -func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, hardForkName string) (*coordinatorType.GetTaskSchema, error) { +func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.ProverTask, chunk *orm.Chunk, hardForkName string) (*coordinatorType.GetTaskSchema, error) { // Get block hashes. blockHashes, dbErr := cp.blockOrm.GetL2BlockHashesByChunkHash(ctx, task.TaskID) if dbErr != nil || len(blockHashes) == 0 { return nil, fmt.Errorf("failed to fetch block hashes of a chunk, chunk hash:%s err:%w", task.TaskID, dbErr) } + var taskDetailBytes []byte taskDetail := message.ChunkTaskDetail{ - BlockHashes: blockHashes, + BlockHashes: blockHashes, + PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash), } - blockHashesBytes, err := json.Marshal(taskDetail) + + if hardForkName == message.EuclidV2Fork { + taskDetail.ForkName = message.EuclidV2ForkNameForProver + } else if hardForkName == message.EuclidFork { + taskDetail.ForkName = message.EuclidForkNameForProver + } + + var err error + taskDetailBytes, err = json.Marshal(taskDetail) if err != nil { return nil, fmt.Errorf("failed to marshal block hashes hash:%s, err:%w", task.TaskID, err) } @@ -198,10 +209,12 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove UUID: task.UUID.String(), TaskID: task.TaskID, TaskType: int(message.ProofTypeChunk), - TaskData: string(blockHashesBytes), + TaskData: string(taskDetailBytes), HardForkName: hardForkName, } + log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeChunk.String(), "hard_fork_name", hardForkName, "task_data", proverTaskSchema.TaskData) + return proverTaskSchema, nil } diff --git a/coordinator/internal/logic/provertask/prover_task.go b/coordinator/internal/logic/provertask/prover_task.go index 4b9f60bf0d..1c4f2fd3e6 100644 --- a/coordinator/internal/logic/provertask/prover_task.go +++ b/coordinator/internal/logic/provertask/prover_task.go @@ -122,7 +122,7 @@ func (b *BaseProverTask) hardForkSanityCheck(ctx *gin.Context, taskCtx *proverTa } if _, ok := taskCtx.HardForkNames[hardForkName]; !ok { - return "", errors.New("to be assigned prover task's hard-fork name is not the same as prover") + return "", fmt.Errorf("to be assigned prover task's hard-fork name is not the same as prover, proverName: %s, proverVersion: %s, proverSupportHardForkNames: %s, taskHardForkName: %v", taskCtx.ProverName, taskCtx.ProverVersion, taskCtx.HardForkNames, hardForkName) } return hardForkName, nil } diff --git a/coordinator/internal/logic/verifier/verifier.go b/coordinator/internal/logic/verifier/verifier.go index 1d3d55a539..33de675619 100644 --- a/coordinator/internal/logic/verifier/verifier.go +++ b/coordinator/internal/logic/verifier/verifier.go @@ -103,11 +103,16 @@ func NewVerifier(cfg *config.VerifierConfig) (*Verifier, error) { return nil, err } - if err := v.loadOpenVMVks(cfg.HighVersionCircuit.ForkName); err != nil { + if err := v.loadOpenVMVks(message.EuclidFork); err != nil { return nil, err } - v.loadCurieVersionVKs() + if err := v.loadOpenVMVks(message.EuclidV2Fork); err != nil { + return nil, err + } + + v.loadDarwinVKs() + return v, nil } @@ -224,8 +229,9 @@ func (v *Verifier) loadLowVersionVKs(cfg *config.VerifierConfig) error { return nil } -func (v *Verifier) loadCurieVersionVKs() { - v.BatchVKMap["AAAAGgAAAARX2S0K1wF333B1waOsnG/vcASJmWG9YM6SNWCBy1ywD9jfGkei+f0wNYpkjW7JO12EfU7CjYVBo+PGku3zaQJI64lbn6BwyTBa4RfrPFpV5mP47ix0sXZ+Wt5wklMLRW7OIJb1yfCDm+gkSsp3/Zqrxt4SY4rQ4WtHfynTCQ0KDi78jNuiFvwxO3ub3DkgGVaxMkGxTRP/Vz6E7MCZMUBR5wZFcMzJn+73f0wYjDxfj00krg9O1VrwVxbVV1ycLR6oQLcOgm/l+xwth8io0vDpF9OY21gD5DgJn9GgcYe8KoRVEbEqApLZPdBibpcSMTY9czZI2LnFcqrDDmYvhEwgjhZrsTog2xLXOODoOupZ/is5ekQ9Gi0y871b1mLlCGA="] = struct{}{} +func (v *Verifier) loadDarwinVKs() { + v.BundleVkMap["AAAAGgAAAARX2S0K1wF333B1waOsnG/vcASJmWG9YM6SNWCBy1ywD5dsp1rEy7PSqiIFikkkOPqKokLW2mZSwCbtKdkfLQcvTxARUwHSe4iZe27PRJ5WWaLqtRV1+x6+pSVKtcPtaV4kE7v2YJRf0582hxiAF0IBaOoREdpyNfA2a9cvhWb2TMaPrUYP9EDQ7CUiW1FQzxbjGc95ua2htscnpU7d9S5stHWzKb7okkCG7bTIL9aG6qTQo2YXW7n3H3Ir47oVJB7IKrUzKGvI5Wmanh2zpZOJ9Qm4/wY24cT7cJz+Ux6wAg=="] = struct{}{} + v.BatchVKMap["AAAAGgAAAARX2S0K1wF333B1waOsnG/vcASJmWG9YM6SNWCBy1ywD1DEjW4Kell67H07wazT5DdzrSh4+amh+cmosQHp9p9snFypyoBGt3UHtoJGQBZlywZWDS9ht5pnaEoGBdaKcQk+lFb+WxTiId0KOAa0mafTZTQw8yToy57Jple64qzlRu1dux30tZZGuerLN1CKzg5Xl2iOpMK+l87jCINwVp5cUtF/XrvhBbU7onKh3KBiy99iUqVyA3Y6iiIZhGKWBSuSA4bNgDYIoVkqjHpdL35aEShoRO6pNXt7rDzxFoPzH0JuPI54nE4OhVrzZXwtkAEosxVa/fszcE092FH+HhhtxZBYe/KEzwdISU9TOPdId3UF/UMYC0MiYOlqffVTgAg="] = struct{}{} v.ChunkVKMap["AAAAGQAAAATyWEABRbJ6hQQ5/zLX1gTasr7349minA9rSgMS6gDeHwZKqikRiO3md+pXjjxMHnKQtmXYgMXhJSvlmZ+Ws+cheuly2X1RuNQzcZuRImaKPR9LJsVZYsXfJbuqdKX8p0Gj8G83wMJOmTzNVUyUol0w0lTU+CEiTpHOnxBsTF3EWaW3s1u4ycOgWt1c9M6s7WmaBZLYgAWYCunO5CLCLApNGbCASeck/LuSoedEri5u6HccCKU2khG6zl6W07jvYSbDVLJktbjRiHv+/HQix+K14j8boo8Z/unhpwXCsPxkQA=="] = struct{}{} } diff --git a/coordinator/internal/orm/batch.go b/coordinator/internal/orm/batch.go index 933eb320ec..51e904a016 100644 --- a/coordinator/internal/orm/batch.go +++ b/coordinator/internal/orm/batch.go @@ -19,20 +19,23 @@ type Batch struct { db *gorm.DB `gorm:"column:-"` // batch - Index uint64 `json:"index" gorm:"column:index"` - Hash string `json:"hash" gorm:"column:hash"` - DataHash string `json:"data_hash" gorm:"column:data_hash"` - StartChunkIndex uint64 `json:"start_chunk_index" gorm:"column:start_chunk_index"` - StartChunkHash string `json:"start_chunk_hash" gorm:"column:start_chunk_hash"` - EndChunkIndex uint64 `json:"end_chunk_index" gorm:"column:end_chunk_index"` - EndChunkHash string `json:"end_chunk_hash" gorm:"column:end_chunk_hash"` - StateRoot string `json:"state_root" gorm:"column:state_root"` - WithdrawRoot string `json:"withdraw_root" gorm:"column:withdraw_root"` - ParentBatchHash string `json:"parent_batch_hash" gorm:"column:parent_batch_hash"` - BatchHeader []byte `json:"batch_header" gorm:"column:batch_header"` - CodecVersion int16 `json:"codec_version" gorm:"column:codec_version"` - EnableCompress bool `json:"enable_compress" gorm:"column:enable_compress"` - BlobBytes []byte `json:"blob_bytes" gorm:"column:blob_bytes"` + Index uint64 `json:"index" gorm:"column:index"` + Hash string `json:"hash" gorm:"column:hash"` + DataHash string `json:"data_hash" gorm:"column:data_hash"` + StartChunkIndex uint64 `json:"start_chunk_index" gorm:"column:start_chunk_index"` + StartChunkHash string `json:"start_chunk_hash" gorm:"column:start_chunk_hash"` + EndChunkIndex uint64 `json:"end_chunk_index" gorm:"column:end_chunk_index"` + EndChunkHash string `json:"end_chunk_hash" gorm:"column:end_chunk_hash"` + StateRoot string `json:"state_root" gorm:"column:state_root"` + WithdrawRoot string `json:"withdraw_root" gorm:"column:withdraw_root"` + ParentBatchHash string `json:"parent_batch_hash" gorm:"column:parent_batch_hash"` + BatchHeader []byte `json:"batch_header" gorm:"column:batch_header"` + CodecVersion int16 `json:"codec_version" gorm:"column:codec_version"` + PrevL1MessageQueueHash string `json:"prev_l1_message_queue_hash" gorm:"column:prev_l1_message_queue_hash"` + PostL1MessageQueueHash string `json:"post_l1_message_queue_hash" gorm:"column:post_l1_message_queue_hash"` + EnableCompress bool `json:"enable_compress" gorm:"column:enable_compress"` + BlobBytes []byte `json:"blob_bytes" gorm:"column:blob_bytes"` + ChallengeDigest string `json:"challenge_digest" gorm:"column:challenge_digest"` // proof ChunkProofsStatus int16 `json:"chunk_proofs_status" gorm:"column:chunk_proofs_status;default:1"` diff --git a/database/migrate/migrate_test.go b/database/migrate/migrate_test.go index 6c44252218..91697ef311 100644 --- a/database/migrate/migrate_test.go +++ b/database/migrate/migrate_test.go @@ -59,20 +59,20 @@ func testResetDB(t *testing.T) { cur, err := Current(pgDB) assert.NoError(t, err) // total number of tables. - assert.Equal(t, int64(25), cur) + assert.Equal(t, int64(26), cur) } func testMigrate(t *testing.T) { assert.NoError(t, Migrate(pgDB)) cur, err := Current(pgDB) assert.NoError(t, err) - assert.Equal(t, int64(25), cur) + assert.Equal(t, int64(26), cur) } func testRollback(t *testing.T) { version, err := Current(pgDB) assert.NoError(t, err) - assert.Equal(t, int64(25), version) + assert.Equal(t, int64(26), version) assert.NoError(t, Rollback(pgDB, nil)) diff --git a/database/migrate/migrations/00026_add_challenge_digest.sql b/database/migrate/migrations/00026_add_challenge_digest.sql new file mode 100644 index 0000000000..abd9a072b0 --- /dev/null +++ b/database/migrate/migrations/00026_add_challenge_digest.sql @@ -0,0 +1,15 @@ +-- +goose Up +-- +goose StatementBegin + +ALTER TABLE batch +ADD COLUMN challenge_digest VARCHAR DEFAULT ''; + +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin + +ALTER TABLE IF EXISTS batch +DROP COLUMN IF EXISTS challenge_digest; + +-- +goose StatementEnd diff --git a/go.work.sum b/go.work.sum index 1b9fd1ee1d..f252c743d6 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1357,13 +1357,13 @@ github.com/scroll-tech/da-codec v0.1.1-0.20241014152913-2703f226fb0b h1:5H6V6yba github.com/scroll-tech/da-codec v0.1.1-0.20241014152913-2703f226fb0b/go.mod h1:48uxaqVgpD8ulH8p+nrBtfeLHZ9tX82bVVdPNkW3rPE= github.com/scroll-tech/da-codec v0.1.3-0.20250227072756-a1482833595f h1:YYbhuUwjowqI4oyXtECRofck7Fyj18e1tcRjuQlZpJE= github.com/scroll-tech/da-codec v0.1.3-0.20250227072756-a1482833595f/go.mod h1:xECEHZLVzbdUn+tNbRJhRIjLGTOTmnFQuTgUTeVLX58= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 h1:Ioc01J0WEMxuwFvEPGJeBKXdf2KY4Yc3XbFky/IxLlI= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= github.com/scroll-tech/go-ethereum v1.10.14-0.20240607130425-e2becce6a1a4/go.mod h1:byf/mZ8jLYUCnUePTicjJWn+RvKdxDn7buS6glTnMwQ= github.com/scroll-tech/go-ethereum v1.10.14-0.20240821074444-b3fa00861e5e/go.mod h1:swB5NSp8pKNDuYsTxfR08bHS6L56i119PBx8fxvV8Cs= github.com/scroll-tech/go-ethereum v1.10.14-0.20241010064814-3d88e870ae22/go.mod h1:r9FwtxCtybMkTbWYCyBuevT9TW3zHmOTHqD082Uh+Oo= github.com/scroll-tech/go-ethereum v1.10.14-0.20250206083728-ea43834c198f/go.mod h1:Ik3OBLl7cJxPC+CFyCBYNXBPek4wpdzkWehn/y5qLM8= github.com/scroll-tech/go-ethereum v1.10.14-0.20250225152658-bcfdb48dd939/go.mod h1:AgU8JJxC7+nfs7R7ma35AU7dMAGW7wCw3dRZRefIKyQ= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250305084331-57148478e950 h1:qfOaRflvH1vtnFWloB7BveKlP/VqYgMqLJ6e9TlBJ/8= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250305084331-57148478e950/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= diff --git a/rollup/go.mod b/rollup/go.mod index 71741a3aa1..d06be48597 100644 --- a/rollup/go.mod +++ b/rollup/go.mod @@ -2,8 +2,6 @@ module scroll-tech/rollup go 1.22 -toolchain go1.22.2 - require ( github.com/agiledragon/gomonkey/v2 v2.12.0 github.com/consensys/gnark-crypto v0.16.0 @@ -13,7 +11,7 @@ require ( github.com/holiman/uint256 v1.3.2 github.com/mitchellh/mapstructure v1.5.0 github.com/prometheus/client_golang v1.16.0 - github.com/scroll-tech/da-codec v0.1.3-0.20250313030021-a8341d04bc4e + github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 github.com/smartystreets/goconvey v1.8.0 github.com/spf13/viper v1.19.0 diff --git a/rollup/go.sum b/rollup/go.sum index 5ea8461cbd..e87d0e6980 100644 --- a/rollup/go.sum +++ b/rollup/go.sum @@ -249,8 +249,8 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/scroll-tech/da-codec v0.1.3-0.20250313030021-a8341d04bc4e h1:0IkSVltsMrKCprOOfQyJsLeqhPEuA0sTp41pZBpDeDk= -github.com/scroll-tech/da-codec v0.1.3-0.20250313030021-a8341d04bc4e/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493 h1:Ioc01J0WEMxuwFvEPGJeBKXdf2KY4Yc3XbFky/IxLlI= +github.com/scroll-tech/da-codec v0.1.3-0.20250401062930-9f9f53898493/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 h1:NEsjCG6uSvLRBlsP3+x6PL1kM+Ojs3g8UGotIPgJSz8= github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ= github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE= diff --git a/rollup/internal/orm/batch.go b/rollup/internal/orm/batch.go index 979ecf1eda..e3d02e8ed5 100644 --- a/rollup/internal/orm/batch.go +++ b/rollup/internal/orm/batch.go @@ -39,6 +39,7 @@ type Batch struct { PostL1MessageQueueHash string `json:"post_l1_message_queue_hash" gorm:"column:post_l1_message_queue_hash"` EnableCompress bool `json:"enable_compress" gorm:"column:enable_compress"` // use for debug BlobBytes []byte `json:"blob_bytes" gorm:"column:blob_bytes"` + ChallengeDigest string `json:"challenge_digest" gorm:"column:challenge_digest"` // proof ChunkProofsStatus int16 `json:"chunk_proofs_status" gorm:"column:chunk_proofs_status;default:1"` @@ -305,6 +306,7 @@ func (o *Batch) InsertBatch(ctx context.Context, batch *encoding.Batch, codecVer PostL1MessageQueueHash: batch.PostL1MessageQueueHash.Hex(), EnableCompress: enableCompress, BlobBytes: batchMeta.BlobBytes, + ChallengeDigest: batchMeta.ChallengeDigest.Hex(), ChunkProofsStatus: int16(types.ChunkProofsStatusPending), ProvingStatus: int16(types.ProvingTaskUnassigned), RollupStatus: int16(types.RollupPending), diff --git a/rollup/internal/utils/utils.go b/rollup/internal/utils/utils.go index 4f9a1f91d1..a5026a737f 100644 --- a/rollup/internal/utils/utils.go +++ b/rollup/internal/utils/utils.go @@ -164,6 +164,7 @@ type BatchMetadata struct { StartChunkHash common.Hash EndChunkHash common.Hash BlobBytes []byte + ChallengeDigest common.Hash } // GetBatchMetadata retrieves the metadata of a batch. @@ -179,10 +180,11 @@ func GetBatchMetadata(batch *encoding.Batch, codecVersion encoding.CodecVersion) } batchMeta := &BatchMetadata{ - BatchHash: daBatch.Hash(), - BatchDataHash: daBatch.DataHash(), - BatchBytes: daBatch.Encode(), - BlobBytes: daBatch.BlobBytes(), + BatchHash: daBatch.Hash(), + BatchDataHash: daBatch.DataHash(), + BatchBytes: daBatch.Encode(), + BlobBytes: daBatch.BlobBytes(), + ChallengeDigest: daBatch.ChallengeDigest(), } batchMeta.BatchBlobDataProof, err = daBatch.BlobDataProofForPointEvaluation() diff --git a/zkvm-prover/Cargo.lock b/zkvm-prover/Cargo.lock index a6ad716131..00ee2e80f7 100644 --- a/zkvm-prover/Cargo.lock +++ b/zkvm-prover/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.63" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996564c1782285d4e0299c29b318bc74f24b1d7f456cef3e040810b061ee3256" +checksum = "f8e42c54af787e3521229df1787d7b8300910dc6d9d04d378eb593b26388bd11" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -151,7 +151,7 @@ dependencies = [ "alloy-transport", "futures", "futures-util", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -181,7 +181,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.7.3", + "winnow 0.7.4", ] [[package]] @@ -194,7 +194,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -232,7 +232,7 @@ dependencies = [ "k256", "serde", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -290,7 +290,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", ] @@ -316,7 +316,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -344,13 +344,13 @@ dependencies = [ "derive_more 1.0.0", "foldhash", "hashbrown 0.15.2", - "indexmap 2.7.1", + "indexmap 2.8.0", "itoa", "k256", "keccak-asm", "paste", "proptest", - "rand", + "rand 0.8.5", "rkyv", "ruint", "rustc-hash 2.1.1", @@ -386,10 +386,10 @@ dependencies = [ "lru", "parking_lot 0.12.3", "pin-project", - "reqwest 0.12.12", + "reqwest 0.12.15", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tracing", "url", @@ -415,7 +415,7 @@ checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -430,7 +430,7 @@ dependencies = [ "alloy-transport-http", "futures", "pin-project", - "reqwest 0.12.12", + "reqwest 0.12.15", "serde", "serde_json", "tokio", @@ -496,7 +496,7 @@ dependencies = [ "itertools 0.14.0", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -533,7 +533,7 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -548,8 +548,8 @@ dependencies = [ "alloy-signer", "async-trait", "k256", - "rand", - "thiserror 2.0.11", + "rand 0.8.5", + "thiserror 2.0.12", ] [[package]] @@ -563,7 +563,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -576,11 +576,11 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.7.1", + "indexmap 2.8.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "syn-solidity", "tiny-keccak", ] @@ -598,18 +598,18 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.98", + "syn 2.0.100", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c649acc6c9d3893e392c737faeadce30b4a1751eed148ae43bc2f27f29c4480c" +checksum = "488a747fdcefeec5c1ed5aa9e08becd775106777fdeae2a35730729fc8a95910" dependencies = [ "serde", - "winnow 0.7.3", + "winnow 0.7.4", ] [[package]] @@ -636,7 +636,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tower 0.5.2", "tracing", @@ -652,7 +652,7 @@ checksum = "20819c4cb978fb39ce6ac31991ba90f386d595f922f42ef888b4a18be190713e" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest 0.12.12", + "reqwest 0.12.15", "serde_json", "tower 0.5.2", "tracing", @@ -751,9 +751,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] [[package]] name = "ark-ff" @@ -867,7 +876,7 @@ checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "colored", "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -877,7 +886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -897,9 +906,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06575e6a9673580f52661c92107baabffbf41e2141373441cbcdc47cb733003c" +checksum = "c0cf008e5e1a9e9e22a7d3c9a4992e21a350290069e36d8fb72304ed17e8f2d2" dependencies = [ "flate2", "futures-core", @@ -927,18 +936,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "async-trait" -version = "0.1.86" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -976,7 +985,7 @@ checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1076,9 +1085,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "bincode" @@ -1095,7 +1104,7 @@ version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "cexpr", "clang-sys", "itertools 0.11.0", @@ -1106,7 +1115,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1126,14 +1135,28 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcode" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c1406a27371b2f76232a2259df6ab607b91b5a0a7476a7729ff590df5a969a" +checksum = "cf300f4aa6e66f3bdff11f1236a88c622fe47ea814524792240b4d554d9858ee" dependencies = [ + "arrayvec", + "bitcode_derive", "bytemuck", + "glam 0.30.1", "serde", ] +[[package]] +name = "bitcode_derive" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -1142,13 +1165,19 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2" + [[package]] name = "bitvec" version = "1.0.1" @@ -1184,9 +1213,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675f87afced0413c9bb02843499dbbd3882a237645883f71a2b59644a6d2f753" +checksum = "b17679a8d69b6d7fd9cd9801a536cec9fa5e5970b69f9d4747f70b39b031f5e7" dependencies = [ "arrayref", "arrayvec", @@ -1213,7 +1242,7 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "pairing 0.22.0", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1231,9 +1260,9 @@ dependencies = [ [[package]] name = "bon" -version = "3.3.2" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" +checksum = "65268237be94042665b92034f979c42d431d2fd998b49809543afe3e66abad1c" dependencies = [ "bon-macros", "rustversion", @@ -1241,9 +1270,9 @@ dependencies = [ [[package]] name = "bon-macros" -version = "3.3.2" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" +checksum = "803c95b2ecf650eb10b5f87dda6b9f6a1b758cee53245e2b7b825c9b3803a443" dependencies = [ "darling", "ident_case", @@ -1251,7 +1280,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1262,9 +1291,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byte-slice-cast" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" [[package]] name = "bytecheck" @@ -1286,14 +1315,28 @@ checksum = "efb7846e0cb180355c2dec69e721edafa36919850f1a9f52ffba4ebc0393cb71" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "2ff22c2722516255d1823ce3cc4bc0b154dbc9364be5c905d6baa6eccbbc8774" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] [[package]] name = "byteorder" @@ -1303,21 +1346,20 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] [[package]] name = "bzip2-sys" -version = "0.1.12+1.0.8" +version = "0.1.13+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ebc2f1a417f01e1da30ef264ee86ae31d2dcd2d603ea283d3c244a883ca2a9" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -1362,7 +1404,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "thiserror 1.0.69", @@ -1370,9 +1412,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.15" +version = "1.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" +checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" dependencies = [ "jobserver", "libc", @@ -1438,9 +1480,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" dependencies = [ "clap_builder", "clap_derive", @@ -1448,9 +1490,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ "anstream", "anstyle", @@ -1460,14 +1502,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1676,7 +1718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1698,7 +1740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1710,6 +1752,52 @@ dependencies = [ "cipher", ] +[[package]] +name = "cust" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6cc71911e179f12483b9734120b45bd00bf64fab085cc4818428523eedd469" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "cust_core", + "cust_derive", + "cust_raw", + "find_cuda_helper", +] + +[[package]] +name = "cust_core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039f79662cb8f890cbf335e818cd522d6e3a53fe63f61d1aaaf859cd3d975f06" +dependencies = [ + "cust_derive", + "glam 0.20.5", + "mint", + "vek", +] + +[[package]] +name = "cust_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3bc95fe629aed92b2423de6ccff9e40174b21d19cb6ee6281a4d04ac72f66" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cust_raw" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf40d6ade12cb9828bbc844b9875c7b93d25e67a3c9bf61c7aa3ae09e402bf8" +dependencies = [ + "find_cuda_helper", +] + [[package]] name = "darling" version = "0.20.10" @@ -1731,7 +1819,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1742,7 +1830,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1777,9 +1865,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", "serde", @@ -1804,7 +1892,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1815,7 +1903,7 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1828,7 +1916,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1849,7 +1937,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "unicode-xid", ] @@ -1875,10 +1963,10 @@ dependencies = [ ] [[package]] -name = "dirs" +name = "directories" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] @@ -1903,7 +1991,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -1926,9 +2014,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] name = "ecdsa" @@ -1947,9 +2035,9 @@ dependencies = [ [[package]] name = "either" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elf" @@ -1966,11 +2054,11 @@ dependencies = [ "base16ct", "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "generic-array", "group 0.13.0", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "serdect", "subtle", @@ -2003,7 +2091,7 @@ dependencies = [ "hex", "k256", "log", - "rand", + "rand 0.8.5", "rlp", "serde", "sha3", @@ -2019,7 +2107,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2030,7 +2118,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2045,14 +2133,14 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -2084,7 +2172,7 @@ dependencies = [ "hex", "hmac", "pbkdf2", - "rand", + "rand 0.8.5", "scrypt", "serde", "serde_json", @@ -2157,7 +2245,7 @@ dependencies = [ "k256", "num_enum 0.6.1", "open-fastrlp", - "rand", + "rand 0.8.5", "rlp", "serde", "serde_json", @@ -2238,31 +2326,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "ff" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ "bitvec", "byteorder", "ff_derive", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "ff_derive" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f54704be45ed286151c5e11531316eaef5b8f5af7d597b806fdb8af108d84a" +checksum = "f10d12652036b0e99197587c6ba87a8fc3031986499973c030d8b44fcc151b60" dependencies = [ "addchain", - "cfg-if", "num-bigint 0.3.3", "num-integer", "num-traits", @@ -2271,6 +2358,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "find_cuda_helper" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9f9e65c593dd01ac77daad909ea4ad17f0d6d1776193fc8ea766356177abdad" +dependencies = [ + "glob", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -2278,7 +2374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -2301,9 +2397,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "foreign-types" @@ -2401,7 +2497,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2491,14 +2587,16 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -2510,7 +2608,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -2536,9 +2634,24 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] +[[package]] +name = "glam" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "glam" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9" + [[package]] name = "glob" version = "0.3.2" @@ -2565,7 +2678,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", "memuse", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2575,8 +2688,8 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", - "rand_core", + "ff 0.13.1", + "rand_core 0.6.4", "subtle", ] @@ -2592,7 +2705,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.7.1", + "indexmap 2.8.0", "slab", "tokio", "tokio-util", @@ -2610,8 +2723,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.2.0", - "indexmap 2.7.1", + "http 1.3.1", + "indexmap 2.8.0", "slab", "tokio", "tokio-util", @@ -2629,20 +2742,20 @@ dependencies = [ [[package]] name = "halo2-axiom" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f81aee7974478f9e3ea0cfd349d2a59a3482f7844386486a98e4af9ed8bada6" +checksum = "62f0ca78d12ac5c893f286d7cdfe3869290305ab8cac376e2592cdc8396da102" dependencies = [ "blake2b_simd", "crossbeam", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", - "halo2curves-axiom 0.7.0", + "halo2curves-axiom", "itertools 0.11.0", "maybe-rayon", "pairing 0.23.0", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "rustc-hash 1.1.0", "sha3", @@ -2651,8 +2764,9 @@ dependencies = [ [[package]] name = "halo2-base" -version = "0.4.1" -source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.4.1-git#2fe813b3ccd4f224da195d61829effb20599dcbd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678cf3adc0a39d7b4d9b82315a655201aa24a430dd1902b162c508047f56ac69" dependencies = [ "getset", "halo2-axiom", @@ -2662,7 +2776,7 @@ dependencies = [ "num-integer", "num-traits", "poseidon-primitives", - "rand_chacha", + "rand_chacha 0.3.1", "rayon", "rustc-hash 1.1.0", "serde", @@ -2671,17 +2785,18 @@ dependencies = [ [[package]] name = "halo2-ecc" -version = "0.4.1" -source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.4.1-git#2fe813b3ccd4f224da195d61829effb20599dcbd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c00681fdd1febaf552d8814e9f5a6a142d81a1514102190da07039588b366" dependencies = [ "halo2-base", "itertools 0.11.0", "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", - "rand_chacha", - "rand_core", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "rayon", "serde", "serde_json", @@ -2698,7 +2813,7 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "pasta_curves 0.4.1", - "rand_core", + "rand_core 0.6.4", "rayon", ] @@ -2710,7 +2825,7 @@ checksum = "b756596082144af6e57105a20403b7b80fe9dccd085700b74fae3af523b74dba" dependencies = [ "blake2", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "halo2derive", "hex", @@ -2720,8 +2835,8 @@ dependencies = [ "num-traits", "pairing 0.23.0", "paste", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "serde", "serde_arrays", @@ -2731,33 +2846,6 @@ dependencies = [ "unroll", ] -[[package]] -name = "halo2curves-axiom" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75bb262279138550a603b35a73da944fcde987a321eb550c05276ce7b0a4e692" -dependencies = [ - "blake2b_simd", - "digest 0.10.7", - "ff 0.13.0", - "group 0.13.0", - "hex", - "lazy_static", - "maybe-rayon", - "num-bigint 0.4.6", - "num-traits", - "pairing 0.23.0", - "pasta_curves 0.5.1", - "paste", - "rand", - "rand_core", - "serde", - "serde_arrays", - "sha2", - "static_assertions", - "subtle", -] - [[package]] name = "halo2curves-axiom" version = "0.7.0" @@ -2766,7 +2854,7 @@ checksum = "dd8309e4638b4f1bcf6613d72265a84074d26034c35edc5d605b5688e580b8b8" dependencies = [ "blake2b_simd", "digest 0.10.7", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "hex", "lazy_static", @@ -2775,8 +2863,8 @@ dependencies = [ "pairing 0.23.0", "pasta_curves 0.5.1", "paste", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "serde", "serde_arrays", @@ -2879,6 +2967,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "http" version = "0.2.12" @@ -2892,9 +2989,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -2919,27 +3016,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.2.0", + "http 1.3.1", ] [[package]] name = "http-body-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", - "http 1.2.0", + "futures-core", + "http 1.3.1", "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -2947,12 +3044,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.32" @@ -2987,7 +3078,7 @@ dependencies = [ "futures-channel", "futures-util", "h2 0.4.8", - "http 1.2.0", + "http 1.3.1", "http-body 1.0.1", "httparse", "itoa", @@ -3018,13 +3109,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http 1.2.0", + "http 1.3.1", "hyper 1.6.0", "hyper-util", - "rustls 0.23.23", + "rustls 0.23.25", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", "tower-service", "webpki-roots 0.26.8", ] @@ -3054,7 +3145,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body 1.0.1", "hyper 1.6.0", "pin-project-lite", @@ -3202,7 +3293,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3267,7 +3358,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3289,9 +3380,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -3369,9 +3460,33 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] [[package]] name = "jobserver" @@ -3402,7 +3517,7 @@ dependencies = [ "bls12_381", "ff 0.12.1", "group 0.12.1", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -3457,9 +3572,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libloading" @@ -3483,7 +3598,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "libc", ] @@ -3504,9 +3619,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.21" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "pkg-config", @@ -3519,6 +3634,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "linux-raw-sys" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" + [[package]] name = "litemap" version = "0.7.5" @@ -3587,6 +3708,16 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + [[package]] name = "maybe-rayon" version = "0.1.1" @@ -3647,7 +3778,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3656,7 +3787,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62a6a1f7141f1d9bc7a886b87536bbfc97752e08b369e1e0453a9acfab5f5da4" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.8.0", "itoa", "lockfree-object-pool", "metrics 0.23.0", @@ -3677,7 +3808,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.7.1", + "indexmap 2.8.0", "metrics 0.23.0", "num_cpus", "ordered-float", @@ -3707,6 +3838,12 @@ dependencies = [ "adler2", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" version = "1.0.3" @@ -3741,22 +3878,22 @@ dependencies = [ [[package]] name = "munge" -version = "0.4.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0091202c98cf06da46c279fdf50cccb6b1c43b4521abdf6a27b4c7e71d5d9d7" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" dependencies = [ "munge_macro", ] [[package]] name = "munge_macro" -version = "0.4.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734799cf91479720b2f970c61a22850940dd91e27d4f02b1c6fc792778df2459" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3776,6 +3913,20 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", + "rayon", +] + [[package]] name = "nibble_vec" version = "0.1.0" @@ -3847,7 +3998,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", - "rand", + "rand 0.8.5", "serde", ] @@ -3904,6 +4055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -3943,7 +4095,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3954,7 +4106,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -3966,7 +4118,7 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -3993,9 +4145,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" dependencies = [ "critical-section", "portable-atomic", @@ -4003,9 +4155,9 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.10.7" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed6cad421e41d400667a06df8bd306dd316c3e1fed803df065b1c65d7de6795" +checksum = "a9ddc5e1dcd2967e8325ab06ed52a2c7cfa562a6dd31ffc9f64e7075bba9f221" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4015,7 +4167,7 @@ dependencies = [ "derive_more 1.0.0", "serde", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -4049,7 +4201,7 @@ version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "cfg-if", "foreign-types", "libc", @@ -4066,7 +4218,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -4089,26 +4241,25 @@ dependencies = [ [[package]] name = "openvm" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "bytemuck", - "hex-literal", "num-bigint 0.4.6", - "num-traits", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-custom-insn", + "openvm-platform", "openvm-rv32im-guest", "serde", ] [[package]] name = "openvm-algebra-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-algebra-transpiler", @@ -4122,54 +4273,50 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "serde_with", "strum 0.26.3", - "tracing", ] [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-algebra-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "num-bigint 0.4.6", - "openvm", "openvm-algebra-complex-macros", "openvm-algebra-moduli-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "serde", "serde-big-array", "strum_macros 0.26.4", ] [[package]] name = "openvm-algebra-moduli-macros" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-algebra-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-algebra-guest", "openvm-instructions", @@ -4178,13 +4325,12 @@ dependencies = [ "openvm-transpiler", "rrs-lib", "strum 0.26.3", - "strum_macros 0.26.4", ] [[package]] name = "openvm-bigint-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -4199,27 +4345,28 @@ dependencies = [ "openvm-rv32im-transpiler", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "openvm-bigint-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "num-bigint 0.4.6", "num-traits", "openvm", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "serde", + "serde-big-array", "strum_macros 0.26.4", ] [[package]] name = "openvm-bigint-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-bigint-guest", "openvm-instructions", @@ -4233,27 +4380,22 @@ dependencies = [ [[package]] name = "openvm-build" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "cargo_metadata", - "dirs", "eyre", - "hex", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "serde", "serde_json", - "tempfile", ] [[package]] name = "openvm-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "async-trait", "backtrace", - "bitcode", "cfg-if", "derivative", "derive-new 0.6.0", @@ -4261,10 +4403,8 @@ dependencies = [ "enum_dispatch", "eyre", "getset", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", - "metrics-derive", - "once_cell", "openvm-circuit-derive", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", @@ -4272,87 +4412,83 @@ dependencies = [ "openvm-poseidon2-air", "openvm-stark-backend", "p3-baby-bear", - "p3-symmetric", - "rand", - "rayon", + "rand 0.8.5", "rustc-hash 2.1.1", "serde", "serde-big-array", "static_assertions", "thiserror 1.0.69", - "toml", "tracing", ] [[package]] name = "openvm-circuit-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", - "proc-macro2", + "itertools 0.14.0", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-circuit-primitives" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", - "itertools 0.13.0", - "lazy_static", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-circuit-primitives-derive", "openvm-stark-backend", - "rand", - "serde", + "rand 0.8.5", "tracing", ] [[package]] name = "openvm-circuit-primitives-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", - "proc-macro2", + "itertools 0.14.0", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] -name = "openvm-custom-insn" -version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1#30576cc6ce838f213bf05b2e4ad035d95498c8b3" +name = "openvm-continuations" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", + "derivative", + "openvm-circuit", + "openvm-native-compiler", + "openvm-native-recursion", + "openvm-stark-backend", + "openvm-stark-sdk", + "serde", + "static_assertions", ] [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-ecc-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", "num-traits", @@ -4370,6 +4506,7 @@ dependencies = [ "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", + "rand 0.8.5", "serde", "serde_with", "strum 0.26.3", @@ -4377,45 +4514,43 @@ dependencies = [ [[package]] name = "openvm-ecc-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "ecdsa", "elliptic-curve", "group 0.13.0", - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "hex-literal", - "itertools 0.13.0", "k256", "lazy_static", "num-bigint 0.4.6", - "num-traits", + "once_cell", "openvm", "openvm-algebra-guest", "openvm-algebra-moduli-macros", + "openvm-custom-insn", "openvm-ecc-sw-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", "openvm-rv32im-guest", "p256", - "rand", "serde", "strum_macros 0.26.4", ] [[package]] name = "openvm-ecc-sw-macros" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-macros-common", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-ecc-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-ecc-guest", "openvm-instructions", @@ -4428,12 +4563,12 @@ dependencies = [ [[package]] name = "openvm-instructions" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "backtrace", "derive-new 0.6.0", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-instructions-derive", @@ -4445,25 +4580,21 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-keccak256-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", - "eyre", - "hex-literal", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -4474,7 +4605,7 @@ dependencies = [ "openvm-stark-backend", "openvm-stark-sdk", "p3-keccak-air", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "strum 0.26.3", @@ -4484,18 +4615,17 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "serde", + "openvm-platform", "tiny-keccak", ] [[package]] name = "openvm-keccak256-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4508,18 +4638,18 @@ dependencies = [ [[package]] name = "openvm-macros-common" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-mod-circuit-builder" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", "openvm-circuit", @@ -4527,7 +4657,7 @@ dependencies = [ "openvm-instructions", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde_with", "tracing", @@ -4535,14 +4665,13 @@ dependencies = [ [[package]] name = "openvm-native-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -4553,7 +4682,7 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "static_assertions", @@ -4563,11 +4692,11 @@ dependencies = [ [[package]] name = "openvm-native-compiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "backtrace", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "num-bigint 0.4.6", "num-integer", @@ -4587,21 +4716,20 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "openvm-native-recursion" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "cfg-if", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "metrics 0.23.0", "once_cell", @@ -4615,25 +4743,25 @@ dependencies = [ "p3-fri", "p3-merkle-tree", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", "serde_json", + "serde_with", "snark-verifier-sdk", "tracing", ] [[package]] name = "openvm-pairing-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", - "once_cell", "openvm-algebra-circuit", "openvm-circuit", "openvm-circuit-derive", @@ -4648,20 +4776,20 @@ dependencies = [ "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", - "rand", + "rand 0.8.5", "serde", "strum 0.26.3", ] [[package]] name = "openvm-pairing-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "group 0.13.0", - "halo2curves-axiom 0.5.3", + "halo2curves-axiom", "hex-literal", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "num-bigint 0.4.6", "num-traits", @@ -4669,19 +4797,20 @@ dependencies = [ "openvm-algebra-complex-macros", "openvm-algebra-guest", "openvm-algebra-moduli-macros", + "openvm-custom-insn", "openvm-ecc-guest", "openvm-ecc-sw-macros", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "openvm-rv32im-guest", - "rand", + "rand 0.8.5", "serde", "strum_macros 0.26.4", ] [[package]] name = "openvm-pairing-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4694,53 +4823,39 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1#30576cc6ce838f213bf05b2e4ad035d95498c8b3" -dependencies = [ - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1)", - "stability", - "strum_macros 0.26.4", -] - -[[package]] -name = "openvm-platform" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "getrandom 0.2.15", "libm", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", - "stability", - "strum_macros 0.26.4", + "openvm-custom-insn", + "openvm-rv32im-guest", ] [[package]] name = "openvm-poseidon2-air" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derivative", - "itertools 0.13.0", "lazy_static", - "openvm-circuit-primitives", "openvm-stark-backend", "openvm-stark-sdk", "p3-monty-31", "p3-poseidon2", "p3-poseidon2-air", "p3-symmetric", - "rand", - "tracing", + "rand 0.8.5", "zkhash", ] [[package]] name = "openvm-rv32-adapters" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "derive-new 0.6.0", - "itertools 0.13.0", + "itertools 0.14.0", "openvm-circuit", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", @@ -4748,26 +4863,22 @@ dependencies = [ "openvm-rv32im-circuit", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "serde_with", - "tracing", ] [[package]] name = "openvm-rv32im-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "eyre", - "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", - "once_cell", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", @@ -4775,26 +4886,25 @@ dependencies = [ "openvm-instructions", "openvm-rv32im-transpiler", "openvm-stark-backend", - "rand", + "rand 0.8.5", "serde", "serde-big-array", "strum 0.26.3", - "tracing", ] [[package]] name = "openvm-rv32im-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-custom-insn", "strum_macros 0.26.4", ] [[package]] name = "openvm-rv32im-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4809,8 +4919,8 @@ dependencies = [ [[package]] name = "openvm-sdk" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "async-trait", "bitcode", @@ -4820,7 +4930,7 @@ dependencies = [ "derive_more 1.0.0", "eyre", "getset", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "openvm", "openvm-algebra-circuit", @@ -4829,6 +4939,7 @@ dependencies = [ "openvm-bigint-transpiler", "openvm-build", "openvm-circuit", + "openvm-continuations", "openvm-ecc-circuit", "openvm-ecc-transpiler", "openvm-keccak256-circuit", @@ -4845,28 +4956,30 @@ dependencies = [ "openvm-stark-backend", "openvm-stark-sdk", "openvm-transpiler", + "p3-fri", "serde", - "static_assertions", + "serde_json", + "serde_with", + "thiserror 1.0.69", "tracing", ] [[package]] name = "openvm-sha256-air" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", - "rand", + "rand 0.8.5", "sha2", ] [[package]] name = "openvm-sha256-circuit" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "bitcode", "derive-new 0.6.0", "derive_more 1.0.0", "openvm-circuit", @@ -4879,7 +4992,7 @@ dependencies = [ "openvm-sha256-transpiler", "openvm-stark-backend", "openvm-stark-sdk", - "rand", + "rand 0.8.5", "serde", "sha2", "strum 0.26.3", @@ -4887,18 +5000,17 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "openvm", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "sha2", ] [[package]] name = "openvm-sha256-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ "openvm-instructions", "openvm-instructions-derive", @@ -4911,19 +5023,22 @@ dependencies = [ [[package]] name = "openvm-stark-backend" -version = "1.0.0-rc.0" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=bc364134b8315c27bfd29c6e77ac79fe77090137#bc364134b8315c27bfd29c6e77ac79fe77090137" +version = "1.0.0-rc.2" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#1baaa78b1b2d707d41a55ea0920d2555222d3108" dependencies = [ - "async-trait", + "bitcode", "cfg-if", "derivative", "derive-new 0.7.0", - "itertools 0.13.0", + "itertools 0.14.0", "metrics 0.23.0", "p3-air", "p3-challenger", "p3-commit", "p3-field", + "p3-gpu-backend", + "p3-gpu-base", + "p3-gpu-module", "p3-matrix", "p3-maybe-rayon", "p3-uni-stark", @@ -4937,13 +5052,13 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" -version = "1.0.0-rc.0" -source = "git+https://github.com/openvm-org/stark-backend.git?rev=bc364134b8315c27bfd29c6e77ac79fe77090137#bc364134b8315c27bfd29c6e77ac79fe77090137" +version = "1.0.0-rc.2" +source = "git+ssh://git@github.com/scroll-tech/openvm-stark-gpu.git?branch=main#1baaa78b1b2d707d41a55ea0920d2555222d3108" dependencies = [ "derivative", "derive_more 0.99.19", - "ff 0.13.0", - "itertools 0.13.0", + "ff 0.13.1", + "itertools 0.14.0", "metrics 0.23.0", "metrics-tracing-context", "metrics-util", @@ -4954,12 +5069,13 @@ dependencies = [ "p3-dft", "p3-fri", "p3-goldilocks", + "p3-gpu-backend", "p3-keccak", "p3-merkle-tree", "p3-poseidon", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", "serde_json", "static_assertions", @@ -4972,19 +5088,16 @@ dependencies = [ [[package]] name = "openvm-transpiler" -version = "1.0.0-rc.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=f1b4844#f1b484499b9c059d14949cdfaa648906757ca7aa" +version = "1.0.0-rc.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=3c35e9f#3c35e9f369da8dee065a089fb72f3580af7dcaf9" dependencies = [ - "derive_more 1.0.0", "elf", "eyre", "openvm-instructions", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?rev=f1b4844)", + "openvm-platform", "openvm-stark-backend", "rrs-lib", - "strum 0.26.3", "thiserror 1.0.69", - "tracing", ] [[package]] @@ -5023,7 +5136,7 @@ dependencies = [ [[package]] name = "p3-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-field", "p3-matrix", @@ -5032,21 +5145,21 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-field", "p3-mds", "p3-monty-31", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "blake3", "p3-symmetric", @@ -5056,22 +5169,22 @@ dependencies = [ [[package]] name = "p3-bn254-fr" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "ff 0.13.0", + "ff 0.13.1", "halo2curves", "num-bigint 0.4.6", "p3-field", "p3-poseidon2", "p3-symmetric", - "rand", + "rand 0.8.5", "serde", ] [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -5083,12 +5196,14 @@ dependencies = [ [[package]] name = "p3-commit" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "anyhow", + "itertools 0.14.0", "p3-challenger", "p3-dft", "p3-field", + "p3-gpu-base", "p3-matrix", "p3-util", "serde", @@ -5097,9 +5212,9 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-matrix", "p3-maybe-rayon", @@ -5110,60 +5225,150 @@ dependencies = [ [[package]] name = "p3-field" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "num-integer", "num-traits", "nums", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", + "serde", + "tracing", +] + +[[package]] +name = "p3-fri" +version = "0.1.0" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +dependencies = [ + "anyhow", + "itertools 0.14.0", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-gpu-backend", + "p3-gpu-base", + "p3-interpolation", + "p3-matrix", + "p3-maybe-rayon", + "p3-merkle-tree", + "p3-util", + "rand 0.8.5", + "serde", + "tracing", + "zkhash", +] + +[[package]] +name = "p3-goldilocks" +version = "0.1.0" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" +dependencies = [ + "num-bigint 0.4.6", + "p3-dft", + "p3-field", + "p3-mds", + "p3-poseidon", + "p3-poseidon2", + "p3-symmetric", + "p3-util", + "rand 0.8.5", + "serde", +] + +[[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" +dependencies = [ + "anyhow", + "bytemuck", + "cc", + "cust", + "cust_raw", + "ff 0.13.1", + "itertools 0.13.0", + "lazy_static", + "ndarray", + "once_cell", + "p3-baby-bear", + "p3-commit", + "p3-dft", + "p3-field", + "p3-gpu-base", + "p3-gpu-build", + "p3-interpolation", + "p3-matrix", + "p3-maybe-rayon", + "p3-poseidon2", + "p3-util", + "parking_lot 0.12.3", + "paste", + "rand 0.8.5", + "rand_core 0.6.4", + "rayon", "serde", + "sppark", + "tracing", + "transpose", +] + +[[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" +dependencies = [ + "anyhow", + "bytemuck", + "cust", + "cust_raw", + "hex", + "lazy_static", + "p3-field", + "p3-matrix", + "parking_lot 0.12.3", "tracing", ] [[package]] -name = "p3-fri" +name = "p3-gpu-build" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-interpolation", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", - "rand", - "serde", - "tracing", + "cc", + "directories", + "hex", + "p3-gpu-field", + "sha2", + "tempfile", ] [[package]] -name = "p3-goldilocks" +name = "p3-gpu-field" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" + +[[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" dependencies = [ - "num-bigint 0.4.6", - "p3-dft", + "itertools 0.14.0", "p3-field", - "p3-mds", - "p3-poseidon", - "p3-poseidon2", - "p3-symmetric", + "p3-gpu-base", + "p3-matrix", "p3-util", - "rand", - "serde", + "tracing", ] [[package]] name = "p3-interpolation" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-field", "p3-matrix", @@ -5174,9 +5379,9 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-symmetric", "p3-util", @@ -5186,27 +5391,29 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-air", "p3-field", + "p3-gpu-backend", "p3-matrix", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", "tracing", + "zkhash", ] [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "p3-maybe-rayon", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", "transpose", @@ -5215,7 +5422,7 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "rayon", ] @@ -5223,30 +5430,32 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-dft", "p3-field", "p3-matrix", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "anyhow", + "itertools 0.14.0", "p3-commit", "p3-field", + "p3-gpu-base", "p3-matrix", "p3-maybe-rayon", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", ] @@ -5254,9 +5463,9 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint 0.4.6", "p3-dft", "p3-field", @@ -5266,7 +5475,7 @@ dependencies = [ "p3-poseidon2", "p3-symmetric", "p3-util", - "rand", + "rand 0.8.5", "serde", "tracing", "transpose", @@ -5275,30 +5484,30 @@ dependencies = [ [[package]] name = "p3-poseidon" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-field", "p3-mds", "p3-symmetric", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "gcd", "p3-field", "p3-mds", "p3-symmetric", - "rand", + "rand 0.8.5", ] [[package]] name = "p3-poseidon2-air" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "p3-air", "p3-field", @@ -5306,7 +5515,7 @@ dependencies = [ "p3-maybe-rayon", "p3-poseidon2", "p3-util", - "rand", + "rand 0.8.5", "tikv-jemallocator", "tracing", ] @@ -5314,9 +5523,9 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-field", "serde", ] @@ -5324,9 +5533,9 @@ dependencies = [ [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ - "itertools 0.13.0", + "itertools 0.14.0", "p3-air", "p3-challenger", "p3-commit", @@ -5342,7 +5551,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=b0591e9#b0591e9b82d58d10f86359875b5d5fa96433b4cf" +source = "git+ssh://git@github.com/scroll-tech/plonky3-gpu.git?tag=v0.1.0#0cebd85e85ae9fa3ef436fe716a5d10ab1d70aeb" dependencies = [ "serde", ] @@ -5388,10 +5597,10 @@ version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -5437,7 +5646,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.9", + "redox_syscall 0.5.10", "smallvec", "windows-targets 0.52.6", ] @@ -5452,7 +5661,7 @@ dependencies = [ "ff 0.12.1", "group 0.12.1", "lazy_static", - "rand", + "rand 0.8.5", "static_assertions", "subtle", ] @@ -5464,10 +5673,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "blake2b_simd", - "ff 0.13.0", + "ff 0.13.1", "group 0.13.0", "lazy_static", - "rand", + "rand 0.8.5", "static_assertions", "subtle", ] @@ -5500,7 +5709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.11", + "thiserror 2.0.12", "ucd-trie", ] @@ -5516,22 +5725,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -5558,9 +5767,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" @@ -5568,17 +5777,26 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "poseidon-primitives" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd95570f7ea849b4187298b5bb229643e44e1d47ddf3979d0db8a1c28be26a8" +checksum = "6e4aaeda7a092e21165cc5f0cbc738e72a46f31c03c3cbd87b71ceae9d2d93bc" dependencies = [ "bitvec", - "ff 0.13.0", + "ff 0.13.1", "lazy_static", "log", - "rand", + "rand 0.8.5", "rand_xorshift", "thiserror 1.0.69", ] @@ -5591,21 +5809,21 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy", + "zerocopy 0.8.23", ] [[package]] name = "prettyplease" -version = "0.2.29" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb" dependencies = [ "proc-macro2", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -5643,9 +5861,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ "toml_edit 0.22.24", ] @@ -5669,14 +5887,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -5689,11 +5907,11 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.8.0", + "bitflags 2.9.0", "lazy_static", "num-traits", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax 0.8.5", "rusty-fork", @@ -5716,11 +5934,11 @@ dependencies = [ "ethers-providers", "futures", "hex", - "http 1.2.0", + "http 1.3.1", "log", "once_cell", - "rand", - "reqwest 0.12.12", + "rand 0.8.5", + "reqwest 0.12.15", "reqwest-middleware", "reqwest-retry", "rlp", @@ -5762,7 +5980,7 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -5788,37 +6006,39 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.23", + "rustls 0.23.25", "socket2", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.11.9" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" dependencies = [ "bytes", - "getrandom 0.2.15", - "rand", - "ring 0.17.11", + "getrandom 0.3.2", + "rand 0.9.0", + "ring 0.17.14", "rustc-hash 2.1.1", - "rustls 0.23.23", + "rustls 0.23.25", "rustls-pki-types", "slab", - "thiserror 2.0.11", + "thiserror 2.0.12", "tinyvec", "tracing", "web-time", @@ -5840,13 +6060,19 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radium" version = "0.7.0" @@ -5879,11 +6105,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "serde", ] +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "zerocopy 0.8.23", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -5891,7 +6128,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -5903,24 +6150,39 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.2", +] + [[package]] name = "rand_xorshift" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] name = "raw-cpuid" -version = "11.4.0" +version = "11.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529468c1335c1c03919960dfefdb1b3648858c20d7ec2d0663e728e4a717efbc" +checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + [[package]] name = "rayon" version = "1.10.0" @@ -5952,11 +6214,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" +checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] [[package]] @@ -6066,9 +6328,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.12" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ "async-compression", "base64 0.22.1", @@ -6077,7 +6339,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.4.8", - "http 1.2.0", + "http 1.3.1", "http-body 1.0.1", "http-body-util", "hyper 1.6.0", @@ -6093,7 +6355,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.23", + "rustls 0.23.25", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -6103,7 +6365,7 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", "tokio-util", "tower 0.5.2", "tower-service", @@ -6123,8 +6385,8 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", - "http 1.2.0", - "reqwest 0.12.12", + "http 1.3.1", + "reqwest 0.12.15", "serde", "thiserror 1.0.69", "tower-service", @@ -6141,10 +6403,10 @@ dependencies = [ "chrono", "futures", "getrandom 0.2.15", - "http 1.2.0", + "http 1.3.1", "hyper 1.6.0", "parking_lot 0.11.2", - "reqwest 0.12.12", + "reqwest 0.12.15", "reqwest-middleware", "retry-policies", "tokio", @@ -6155,7 +6417,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6174,7 +6436,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6191,18 +6453,18 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "reth-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6215,7 +6477,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6228,7 +6490,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6246,13 +6508,13 @@ dependencies = [ "reth-trie-common", "serde", "sysinfo", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-db-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6277,7 +6539,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6291,7 +6553,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6307,7 +6569,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -6322,7 +6584,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6342,7 +6604,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6367,7 +6629,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6388,7 +6650,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6396,13 +6658,13 @@ dependencies = [ "nybbles", "reth-consensus", "reth-storage-errors", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-execution-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6420,17 +6682,17 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-metrics" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "metrics 0.24.1", "metrics-derive", @@ -6439,20 +6701,20 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", "secp256k1", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", "url", ] [[package]] name = "reth-nippy-jar" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "anyhow", "bincode", @@ -6461,7 +6723,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", "zstd", ] @@ -6469,7 +6731,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "once_cell", @@ -6482,7 +6744,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6505,26 +6767,26 @@ dependencies = [ "secp256k1", "serde", "serde_with", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-prune-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "derive_more 1.0.0", "modular-bitfield", "reth-codecs", "serde", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-revm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6539,7 +6801,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6562,7 +6824,7 @@ dependencies = [ [[package]] name = "reth-scroll-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "revm 19.4.0", ] @@ -6570,7 +6832,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6589,14 +6851,14 @@ dependencies = [ "revm 19.4.0", "revm-primitives 15.1.0", "scroll-alloy-consensus", - "thiserror 2.0.11", + "thiserror 2.0.12", "tracing", ] [[package]] name = "reth-scroll-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-chains", "alloy-primitives", @@ -6608,7 +6870,7 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6619,7 +6881,7 @@ dependencies = [ "modular-bitfield", "once_cell", "proptest", - "rand", + "rand 0.8.5", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", @@ -6632,7 +6894,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "bytes", @@ -6645,7 +6907,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -6656,7 +6918,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6681,7 +6943,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6690,13 +6952,13 @@ dependencies = [ "reth-primitives-traits", "reth-prune-types", "reth-static-file-types", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-tracing" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "clap", "eyre", @@ -6711,7 +6973,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6733,7 +6995,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -6756,7 +7018,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6774,7 +7036,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6783,13 +7045,13 @@ dependencies = [ "reth-tracing", "reth-trie-common", "smallvec", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "reth-zstd-compressors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "zstd", ] @@ -6802,7 +7064,7 @@ checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810" dependencies = [ "anyhow", "chrono", - "rand", + "rand 0.8.5", ] [[package]] @@ -6823,7 +7085,7 @@ dependencies = [ [[package]] name = "revm" version = "19.4.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "auto_impl", "cfg-if", @@ -6836,9 +7098,9 @@ dependencies = [ [[package]] name = "revm" -version = "19.5.0" +version = "19.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc5bef3c95fadf3b6a24a253600348380c169ef285f9780a793bb7090c8990d" +checksum = "7b906766b7ba049b515848952b5ae74f363d456e98de2021048a513e442b4f42" dependencies = [ "auto_impl", "cfg-if", @@ -6862,7 +7124,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "revm-primitives 15.1.0", "serde", @@ -6900,7 +7162,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "16.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -6944,7 +7206,7 @@ dependencies = [ "alloy-eip7702 0.4.2", "alloy-primitives", "auto_impl", - "bitflags 2.8.0", + "bitflags 2.9.0", "bitvec", "c-kzg", "cfg-if", @@ -6957,13 +7219,13 @@ dependencies = [ [[package]] name = "revm-primitives" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-v2#fdfbc90666769aec55c05a6aefdb6e5e1c32a3b3" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#c7a586deca0d1e2ec079cb9a7bab1ecdb53dc4a6" dependencies = [ "alloy-eip2930", "alloy-eip7702 0.5.1", "alloy-primitives", "auto_impl", - "bitflags 2.8.0", + "bitflags 2.9.0", "bitvec", "c-kzg", "cfg-if", @@ -6983,7 +7245,7 @@ dependencies = [ "alloy-eip7702 0.5.1", "alloy-primitives", "auto_impl", - "bitflags 2.8.0", + "bitflags 2.9.0", "bitvec", "c-kzg", "cfg-if", @@ -7020,9 +7282,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.11" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", @@ -7050,14 +7312,14 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.15.2", - "indexmap 2.7.1", + "indexmap 2.8.0", "munge", "ptr_meta", "rancor", "rend", "rkyv_derive", "tinyvec", - "uuid 1.15.1", + "uuid 1.16.0", ] [[package]] @@ -7068,7 +7330,7 @@ checksum = "246b40ac189af6c675d124b802e8ef6d5246c53e17367ce9501f8f66a81abb7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -7147,7 +7409,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand", + "rand 0.8.5", "rkyv", "rlp", "ruint-macro", @@ -7200,7 +7462,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.25", + "semver 1.0.26", ] [[package]] @@ -7209,10 +7471,23 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" +dependencies = [ + "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.9.3", "windows-sys 0.59.0", ] @@ -7223,21 +7498,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.11", + "ring 0.17.14", "rustls-webpki 0.101.7", "sct", ] [[package]] name = "rustls" -version = "0.23.23" +version = "0.23.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" +checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" dependencies = [ "once_cell", - "ring 0.17.11", + "ring 0.17.14", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki 0.103.0", "subtle", "zeroize", ] @@ -7285,26 +7560,26 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.11", + "ring 0.17.14", "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f" dependencies = [ - "ring 0.17.11", + "ring 0.17.14", "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "rusty-fork" @@ -7320,9 +7595,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "salsa20" @@ -7333,22 +7608,10 @@ dependencies = [ "cipher", ] -[[package]] -name = "sbv" -version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" -dependencies = [ - "sbv-core", - "sbv-helpers", - "sbv-kv", - "sbv-primitives", - "sbv-trie", -] - [[package]] name = "sbv-core" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "reth-evm", "reth-evm-ethereum", @@ -7365,7 +7628,7 @@ dependencies = [ [[package]] name = "sbv-helpers" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "revm 19.4.0", ] @@ -7373,7 +7636,7 @@ dependencies = [ [[package]] name = "sbv-kv" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "auto_impl", "hashbrown 0.15.2", @@ -7383,7 +7646,7 @@ dependencies = [ [[package]] name = "sbv-primitives" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7414,7 +7677,7 @@ dependencies = [ [[package]] name = "sbv-trie" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "alloy-rlp", "alloy-trie", @@ -7429,7 +7692,7 @@ dependencies = [ [[package]] name = "sbv-utils" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-v2#74d7fb0398b1bc94fe20ac29bdc445634c4bfeea" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6759d7b0893e31782e3a24abaad6be655edffdde" dependencies = [ "alloy-provider", "alloy-transport", @@ -7457,10 +7720,10 @@ version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -7481,7 +7744,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll-alloy-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7499,7 +7762,7 @@ dependencies = [ [[package]] name = "scroll-alloy-network" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-network", @@ -7513,7 +7776,7 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7530,7 +7793,7 @@ dependencies = [ [[package]] name = "scroll-proving-sdk" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-proving-sdk.git?rev=af95d2a#af95d2a85109a4e44482cf4deb3dadfbb8617ef0" +source = "git+https://github.com/scroll-tech/scroll-proving-sdk.git?branch=main#3e673acb63d2506beec2fec340ed2288f290327f" dependencies = [ "alloy", "anyhow", @@ -7541,10 +7804,10 @@ dependencies = [ "ethers-core", "ethers-providers", "hex", - "http 1.2.0", + "http 1.3.1", "log", - "rand", - "reqwest 0.12.12", + "rand 0.8.5", + "reqwest 0.12.15", "reqwest-middleware", "reqwest-retry", "rlp", @@ -7562,65 +7825,78 @@ dependencies = [ [[package]] name = "scroll-zkvm-circuit-input-types" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "alloy-primitives", "alloy-serde 0.8.3", + "itertools 0.14.0", "openvm", + "openvm-custom-insn", "openvm-rv32im-guest", "rkyv", - "sbv", + "sbv-core", + "sbv-kv", + "sbv-primitives", + "sbv-trie", "serde", + "sha2", + "sha3", "tiny-keccak", + "vm-zstd", ] [[package]] name = "scroll-zkvm-prover" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "alloy-primitives", "base64 0.22.1", "bincode", + "c-kzg", "git-version", "hex", "metrics 0.23.0", + "metrics-tracing-context", "metrics-util", + "munge", "once_cell", "openvm-circuit", + "openvm-continuations", "openvm-native-circuit", "openvm-native-recursion", "openvm-sdk", "openvm-stark-sdk", - "revm 19.5.0", + "revm 19.6.0", "rkyv", - "sbv", + "sbv-primitives", "scroll-zkvm-circuit-input-types", "scroll-zkvm-verifier", "serde", "serde_json", "serde_stacker", "snark-verifier-sdk", - "thiserror 2.0.11", + "thiserror 2.0.12", "toml", "tracing", ] [[package]] name = "scroll-zkvm-verifier" -version = "0.1.0-rc.6" -source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.1.0-rc.6#8adaaf856b00ca992e76c95e657761a5148d6084" +version = "0.2.0" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.2.0#5854f8179d14f2afa489a499290e0ff6a953b314" dependencies = [ "bincode", "eyre", "itertools 0.14.0", "openvm-circuit", + "openvm-continuations", "openvm-native-circuit", "openvm-native-recursion", "openvm-sdk", "openvm-stark-sdk", - "revm 19.5.0", + "revm 19.6.0", "scroll-zkvm-circuit-input-types", "serde", "snark-verifier-sdk", @@ -7644,7 +7920,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.11", + "ring 0.17.14", "untrusted 0.9.0", ] @@ -7669,7 +7945,7 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "rand", + "rand 0.8.5", "secp256k1-sys", "serde", ] @@ -7689,7 +7965,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "core-foundation", "core-foundation-sys", "libc", @@ -7717,9 +7993,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ "serde", ] @@ -7747,9 +8023,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -7774,31 +8050,31 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.15" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.8.0", "itoa", "memchr", "ryu", @@ -7807,9 +8083,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" dependencies = [ "itoa", "serde", @@ -7826,9 +8102,9 @@ dependencies = [ [[package]] name = "serde_stacker" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "babfccff5773ff80657f0ecf553c7c516bdc2eb16389c0918b36b73e7015276e" +checksum = "69c8defe6c780725cce4ec6ad3bd91e321baf6fa4e255df1f31e345d507ef01a" dependencies = [ "serde", "stacker", @@ -7856,7 +8132,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.7.1", + "indexmap 2.8.0", "serde", "serde_derive", "serde_json", @@ -7873,7 +8149,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -7959,7 +8235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -8010,8 +8286,9 @@ dependencies = [ [[package]] name = "snark-verifier" -version = "0.1.8" -source = "git+https://github.com/axiom-crypto/snark-verifier?branch=zkvm-v0.1#ab65fda41b56571aa33dd27f68ef1ea461e3fadc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e4c4ed1edca41687fe2d8a09ba30badb0a5cc7fa56dd1159d62aeab7c99ace" dependencies = [ "halo2-base", "halo2-ecc", @@ -8022,7 +8299,7 @@ dependencies = [ "num-integer", "num-traits", "pairing 0.23.0", - "rand", + "rand 0.8.5", "revm 18.0.0", "ruint", "serde", @@ -8031,8 +8308,9 @@ dependencies = [ [[package]] name = "snark-verifier-sdk" -version = "0.1.8" -source = "git+https://github.com/axiom-crypto/snark-verifier?branch=zkvm-v0.1#ab65fda41b56571aa33dd27f68ef1ea461e3fadc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "babff70ce6292fce03f692d68569f76b8f6710dbac7be7fe5f32c915909c9065" dependencies = [ "ark-std 0.3.0", "bincode", @@ -8045,8 +8323,8 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "serde", "serde_json", "snark-verifier", @@ -8085,13 +8363,12 @@ dependencies = [ ] [[package]] -name = "stability" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +name = "sppark" +version = "0.1.8" +source = "git+https://github.com/scroll-tech/sppark.git?branch=sp1-v3.0#07fe0de43a745a395dd718c735cdfe0cfc457b0a" dependencies = [ - "quote", - "syn 2.0.98", + "cc", + "which", ] [[package]] @@ -8102,9 +8379,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9156ebd5870ef293bfb43f91c7a74528d363ec0d424afe24160ed5a4343d08a" +checksum = "601f9201feb9b09c00266478bf459952b9ef9a6b94edb2f21eba14ab681a60a9" dependencies = [ "cc", "cfg-if", @@ -8140,6 +8417,12 @@ dependencies = [ "strum_macros 0.24.3", ] +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + [[package]] name = "strum" version = "0.26.3" @@ -8171,6 +8454,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.100", +] + [[package]] name = "strum_macros" version = "0.26.4" @@ -8181,7 +8477,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8194,7 +8490,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8206,7 +8502,7 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand", + "rand 0.8.5", "rustc-hex", ] @@ -8229,9 +8525,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -8240,14 +8536,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9f9798a84bca5cd4d1760db691075fda8f2c3a5d9647e8bfd29eb9b3fabb87" +checksum = "d975606bae72d8aad5b07d9342465e123a2cccf53a5a735aedf81ca92a709ecb" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8273,7 +8569,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8306,7 +8602,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", "core-foundation", "system-configuration-sys 0.6.0", ] @@ -8339,15 +8635,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.17.1" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.2", "once_cell", - "rustix", + "rustix 1.0.3", "windows-sys 0.59.0", ] @@ -8369,7 +8664,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8380,7 +8675,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "test-case-core", ] @@ -8395,11 +8690,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -8410,18 +8705,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8465,9 +8760,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618" dependencies = [ "deranged", "itoa", @@ -8480,15 +8775,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04" dependencies = [ "num-conv", "time-core", @@ -8497,11 +8792,10 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/scroll-tech/tiny-keccak?branch=scroll-patch-v2.0.2-openvm-v1.0.0-rc.1#bfab37175b16c645419e77a77ffb796b6e5459be" +source = "git+https://github.com/scroll-tech/tiny-keccak?branch=scroll-patch-v2.0.2-openvm-v1.0.0-rc.1#4c7c96660cb852b4f8aed2296d30c31f06e103c9" dependencies = [ "cfg-if", "crunchy", - "openvm-platform 1.0.0-rc.1 (git+https://github.com/openvm-org/openvm.git?tag=v1.0.0-rc.1)", ] [[package]] @@ -8516,9 +8810,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" dependencies = [ "tinyvec_macros", ] @@ -8531,9 +8825,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" dependencies = [ "backtrace", "bytes", @@ -8555,7 +8849,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8580,11 +8874,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.23", + "rustls 0.23.25", "tokio", ] @@ -8617,9 +8911,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" dependencies = [ "bytes", "futures-core", @@ -8655,7 +8949,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.8.0", "toml_datetime", "winnow 0.5.40", ] @@ -8666,11 +8960,11 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.8.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.3", + "winnow 0.7.4", ] [[package]] @@ -8748,7 +9042,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -8877,7 +9171,7 @@ dependencies = [ "http 0.2.12", "httparse", "log", - "rand", + "rand 0.8.5", "rustls 0.21.12", "sha1", "thiserror 1.0.69", @@ -8918,9 +9212,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" @@ -9003,9 +9297,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.15.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" [[package]] name = "valuable" @@ -9019,12 +9313,37 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vek" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8085882662f9bc47fc8b0cdafa5e19df8f592f650c02b9083da8d45ac9eebd17" +dependencies = [ + "approx", + "num-integer", + "num-traits", + "rustc_version 0.4.1", +] + [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vm-zstd" +version = "0.1.1" +source = "git+https://github.com/scroll-tech/rust-zstd-decompressor.git?tag=v0.1.1#c7e953fc690d5f56f201892d88311c0f938f2d21" +dependencies = [ + "anyhow", + "bitstream-io", + "itertools 0.11.0", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", +] + [[package]] name = "wait-timeout" version = "0.2.1" @@ -9051,9 +9370,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ "wit-bindgen-rt", ] @@ -9080,7 +9399,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -9115,7 +9434,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9184,7 +9503,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.11", + "ring 0.17.14", "untrusted 0.9.0", ] @@ -9212,6 +9531,18 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] + [[package]] name = "winapi" version = "0.3.9" @@ -9273,7 +9604,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -9284,24 +9615,24 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] name = "windows-link" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" [[package]] name = "windows-registry" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ - "windows-result 0.2.0", + "windows-result 0.3.2", "windows-strings", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] @@ -9315,21 +9646,20 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" dependencies = [ - "windows-targets 0.52.6", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -9383,13 +9713,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -9402,6 +9748,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -9414,6 +9766,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -9426,12 +9784,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -9444,6 +9814,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -9456,6 +9832,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -9468,6 +9850,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -9480,6 +9868,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.5.40" @@ -9491,9 +9885,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" dependencies = [ "memchr", ] @@ -9510,11 +9904,11 @@ dependencies = [ [[package]] name = "wit-bindgen-rt" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.9.0", ] [[package]] @@ -9577,7 +9971,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "synstructure", ] @@ -9587,8 +9981,16 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" +dependencies = [ + "zerocopy-derive 0.8.23", ] [[package]] @@ -9599,7 +10001,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", ] [[package]] @@ -9619,7 +10032,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", "synstructure", ] @@ -9640,7 +10053,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -9662,7 +10075,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.100", ] [[package]] @@ -9684,7 +10097,7 @@ dependencies = [ "jubjub", "lazy_static", "pasta_curves 0.5.1", - "rand", + "rand 0.8.5", "serde", "sha2", "sha3", @@ -9694,7 +10107,7 @@ dependencies = [ [[package]] name = "zstd" version = "1.1.4" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-v2#b037c98a5a3462526829179f58cd67f51511f227" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" [[package]] name = "zstd-sys" diff --git a/zkvm-prover/Cargo.toml b/zkvm-prover/Cargo.toml index abe2e13ac8..22bce3ec16 100644 --- a/zkvm-prover/Cargo.toml +++ b/zkvm-prover/Cargo.toml @@ -18,13 +18,13 @@ serde = { version = "1.0.198", features = ["derive"] } serde_json = "1.0.116" futures = "0.3.30" -scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.1.0-rc.6" } +scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.2.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", rev = "af95d2a", features = [ +scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", branch = "main", features = [ "openvm", ] } -sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-v2", features = [ +sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = [ "scroll", ] } base64 = "0.13.1" @@ -45,3 +45,34 @@ clap = { version = "4.5", features = ["derive"] } ctor = "0.2.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 = "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.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-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" } diff --git a/zkvm-prover/config.json b/zkvm-prover/config.json index e6b88306db..978c2be570 100644 --- a/zkvm-prover/config.json +++ b/zkvm-prover/config.json @@ -23,8 +23,8 @@ "db_path": "unique-db-path-for-prover-1" }, "circuits": { - "euclid": { - "hard_fork_name": "euclid", + "euclidV2": { + "hard_fork_name": "euclidV2", "workspace_path": "/home/ubuntu/prover-workdir" } } diff --git a/zkvm-prover/src/main.rs b/zkvm-prover/src/main.rs index 83fd2bd8e1..145788b05a 100644 --- a/zkvm-prover/src/main.rs +++ b/zkvm-prover/src/main.rs @@ -10,7 +10,7 @@ use scroll_proving_sdk::{ }; #[derive(Parser, Debug)] -#[clap(disable_version_flag = true)] +#[command(disable_version_flag = true)] struct Args { /// Path of config file #[arg(long = "config", default_value = "conf/config.json")] diff --git a/zkvm-prover/src/prover.rs b/zkvm-prover/src/prover.rs index 3719f9b68e..c169343c52 100644 --- a/zkvm-prover/src/prover.rs +++ b/zkvm-prover/src/prover.rs @@ -1,4 +1,6 @@ -use crate::zk_circuits_handler::{euclid::EuclidHandler, CircuitsHandler}; +use crate::zk_circuits_handler::{ + euclid::EuclidHandler, euclidV2::EuclidV2Handler, CircuitsHandler, +}; use anyhow::{anyhow, Result}; use async_trait::async_trait; use scroll_proving_sdk::{ @@ -181,9 +183,14 @@ impl LocalProver { // coordinator let config = self.config.circuits.get(hard_fork_name).unwrap(); - Arc::new(match hard_fork_name { - "euclid" => Arc::new(Mutex::new(EuclidHandler::new(&config.workspace_path))), + match hard_fork_name { + "euclid" => Arc::new(Arc::new(Mutex::new(EuclidHandler::new( + &config.workspace_path, + )))) as Arc, + "euclidV2" => Arc::new(Arc::new(Mutex::new(EuclidV2Handler::new( + &config.workspace_path, + )))) as Arc, _ => unreachable!(), - }) as Arc + } } } diff --git a/zkvm-prover/src/zk_circuits_handler.rs b/zkvm-prover/src/zk_circuits_handler.rs index efdac1c3c9..6b97e3d906 100644 --- a/zkvm-prover/src/zk_circuits_handler.rs +++ b/zkvm-prover/src/zk_circuits_handler.rs @@ -1,5 +1,8 @@ pub mod euclid; +#[allow(non_snake_case)] +pub mod euclidV2; + use anyhow::Result; use async_trait::async_trait; use scroll_proving_sdk::prover::{proving_service::ProveRequest, ProofType}; diff --git a/zkvm-prover/src/zk_circuits_handler/euclid.rs b/zkvm-prover/src/zk_circuits_handler/euclid.rs index 3f33c9da68..1235da4fc3 100644 --- a/zkvm-prover/src/zk_circuits_handler/euclid.rs +++ b/zkvm-prover/src/zk_circuits_handler/euclid.rs @@ -4,37 +4,95 @@ use super::CircuitsHandler; use anyhow::{anyhow, Result}; use async_trait::async_trait; use scroll_proving_sdk::prover::{proving_service::ProveRequest, ProofType}; -use scroll_zkvm_prover::{ +use scroll_zkvm_prover_euclid::{ task::{batch::BatchProvingTask, bundle::BundleProvingTask, chunk::ChunkProvingTask}, - BatchProver, BundleProver, ChunkProver, + BatchProver, BundleProverEuclidV1, ChunkProver, ProverConfig, }; use tokio::sync::Mutex; pub struct EuclidHandler { chunk_prover: ChunkProver, batch_prover: BatchProver, - bundle_prover: BundleProver, + bundle_prover: BundleProverEuclidV1, +} + +#[derive(Clone, Copy)] +pub(crate) enum Phase { + EuclidV1, + EuclidV2, +} + +impl Phase { + pub fn as_str(&self) -> &str { + match self { + Phase::EuclidV1 => "euclidv1", + Phase::EuclidV2 => "euclidv2", + } + } + + pub fn phase_spec_chunk(&self, workspace_path: &Path) -> ProverConfig { + let dir_cache = Some(workspace_path.join("cache")); + let path_app_exe = workspace_path.join("chunk/app.vmexe"); + let path_app_config = workspace_path.join("chunk/openvm.toml"); + let segment_len = Some((1 << 22) - 100); + ProverConfig { + dir_cache, + path_app_config, + path_app_exe, + segment_len, + ..Default::default() + } + } + + pub fn phase_spec_batch(&self, workspace_path: &Path) -> ProverConfig { + let dir_cache = Some(workspace_path.join("cache")); + let path_app_exe = workspace_path.join("batch/app.vmexe"); + let path_app_config = workspace_path.join("batch/openvm.toml"); + let segment_len = Some((1 << 22) - 100); + ProverConfig { + dir_cache, + path_app_config, + path_app_exe, + segment_len, + ..Default::default() + } + } + + pub fn phase_spec_bundle(&self, workspace_path: &Path) -> ProverConfig { + let dir_cache = Some(workspace_path.join("cache")); + let path_app_config = workspace_path.join("bundle/openvm.toml"); + let segment_len = Some((1 << 22) - 100); + match self { + Phase::EuclidV1 => ProverConfig { + dir_cache, + path_app_config, + segment_len, + path_app_exe: workspace_path.join("bundle/app_euclidv1.vmexe"), + ..Default::default() + }, + Phase::EuclidV2 => ProverConfig { + dir_cache, + path_app_config, + segment_len, + path_app_exe: workspace_path.join("bundle/app.vmexe"), + ..Default::default() + }, + } + } } unsafe impl Send for EuclidHandler {} impl EuclidHandler { pub fn new(workspace_path: &str) -> Self { + let p = Phase::EuclidV1; let workspace_path = Path::new(workspace_path); - - let cache_dir = workspace_path.join("cache"); - let chunk_exe = workspace_path.join("chunk/app.vmexe"); - let chunk_app_config = workspace_path.join("chunk/openvm.toml"); - let chunk_prover = ChunkProver::setup(chunk_exe, chunk_app_config, Some(cache_dir.clone())) + let chunk_prover = ChunkProver::setup(p.phase_spec_chunk(workspace_path)) .expect("Failed to setup chunk prover"); - let batch_exe = workspace_path.join("batch/app.vmexe"); - let batch_app_config = workspace_path.join("batch/openvm.toml"); - let batch_prover = BatchProver::setup(batch_exe, batch_app_config, Some(cache_dir.clone())) + let batch_prover = BatchProver::setup(p.phase_spec_batch(workspace_path)) .expect("Failed to setup batch prover"); - let bundle_exe = workspace_path.join("bundle/app.vmexe"); - let bundle_app_config = workspace_path.join("bundle/openvm.toml"); - let bundle_prover = BundleProver::setup(bundle_exe, bundle_app_config, Some(cache_dir)) + let bundle_prover = BundleProverEuclidV1::setup(p.phase_spec_bundle(workspace_path)) .expect("Failed to setup bundle prover"); Self { @@ -59,16 +117,8 @@ impl CircuitsHandler for Arc> { async fn get_proof_data(&self, prove_request: ProveRequest) -> Result { match prove_request.proof_type { ProofType::Chunk => { - let witnesses: Vec = - serde_json::from_str(&prove_request.input)?; - - let proof = self - .try_lock() - .unwrap() - .chunk_prover - .gen_proof(&ChunkProvingTask { - block_witnesses: witnesses, - })?; + let task: ChunkProvingTask = serde_json::from_str(&prove_request.input)?; + let proof = self.try_lock().unwrap().chunk_prover.gen_proof(&task)?; Ok(serde_json::to_string(&proof)?) } diff --git a/zkvm-prover/src/zk_circuits_handler/euclidV2.rs b/zkvm-prover/src/zk_circuits_handler/euclidV2.rs new file mode 100644 index 0000000000..2191f0d5f3 --- /dev/null +++ b/zkvm-prover/src/zk_circuits_handler/euclidV2.rs @@ -0,0 +1,79 @@ +use std::{path::Path, sync::Arc}; + +use super::{euclid::Phase, CircuitsHandler}; +use anyhow::{anyhow, Result}; +use async_trait::async_trait; +use scroll_proving_sdk::prover::{proving_service::ProveRequest, ProofType}; +use scroll_zkvm_prover_euclid::{ + task::{batch::BatchProvingTask, bundle::BundleProvingTask, chunk::ChunkProvingTask}, + BatchProver, BundleProverEuclidV2, ChunkProver, +}; +use tokio::sync::Mutex; +pub struct EuclidV2Handler { + chunk_prover: ChunkProver, + batch_prover: BatchProver, + bundle_prover: BundleProverEuclidV2, +} + +unsafe impl Send for EuclidV2Handler {} + +impl EuclidV2Handler { + pub fn new(workspace_path: &str) -> Self { + let p = Phase::EuclidV2; + let workspace_path = Path::new(workspace_path); + let chunk_prover = ChunkProver::setup(p.phase_spec_chunk(workspace_path)) + .expect("Failed to setup chunk prover"); + + let batch_prover = BatchProver::setup(p.phase_spec_batch(workspace_path)) + .expect("Failed to setup batch prover"); + + let bundle_prover = BundleProverEuclidV2::setup(p.phase_spec_bundle(workspace_path)) + .expect("Failed to setup bundle prover"); + + Self { + chunk_prover, + batch_prover, + bundle_prover, + } + } +} + +#[async_trait] +impl CircuitsHandler for Arc> { + async fn get_vk(&self, task_type: ProofType) -> Option> { + Some(match task_type { + ProofType::Chunk => self.try_lock().unwrap().chunk_prover.get_app_vk(), + ProofType::Batch => self.try_lock().unwrap().batch_prover.get_app_vk(), + ProofType::Bundle => self.try_lock().unwrap().bundle_prover.get_app_vk(), + _ => unreachable!("Unsupported proof type"), + }) + } + + async fn get_proof_data(&self, prove_request: ProveRequest) -> Result { + match prove_request.proof_type { + ProofType::Chunk => { + let task: ChunkProvingTask = serde_json::from_str(&prove_request.input)?; + let proof = self.try_lock().unwrap().chunk_prover.gen_proof(&task)?; + + Ok(serde_json::to_string(&proof)?) + } + ProofType::Batch => { + let task: BatchProvingTask = serde_json::from_str(&prove_request.input)?; + let proof = self.try_lock().unwrap().batch_prover.gen_proof(&task)?; + + Ok(serde_json::to_string(&proof)?) + } + ProofType::Bundle => { + let batch_proofs: BundleProvingTask = serde_json::from_str(&prove_request.input)?; + let proof = self + .try_lock() + .unwrap() + .bundle_prover + .gen_proof_evm(&batch_proofs)?; + + Ok(serde_json::to_string(&proof)?) + } + _ => Err(anyhow!("Unsupported proof type")), + } + } +}