From d0ab878ed84c9b1d2a3283cfb0d1717843f5bb50 Mon Sep 17 00:00:00 2001 From: sinka Date: Tue, 24 Sep 2024 20:50:51 +1000 Subject: [PATCH 1/3] bump zkwasm-continuation-batcher --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 878b836d..2942419b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "circuits-batcher" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.4#a67898d14e9c8593b0b458ed66651b6591b768e0" +source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.6#c058e85cd401981f6ddf94d7378281b0ba7a2327" dependencies = [ "anyhow", "ark-std", @@ -1420,7 +1420,7 @@ dependencies = [ [[package]] name = "halo2aggregator-s" version = "1.1.0" -source = "git+https://github.com/DelphinusLab/halo2aggregator-s.git?tag=on-prove-pairing-0.6.3#50978c1e8bc02083c23738055a89279d15edfecd" +source = "git+https://github.com/DelphinusLab/halo2aggregator-s.git?tag=on-prove-pairing-0.6.4#2ce6522fce52938ec7d28c7c1510be4dd85e5be2" dependencies = [ "ark-ff", "ark-std", @@ -1444,7 +1444,7 @@ dependencies = [ [[package]] name = "halo2ecc-s" version = "0.3.2" -source = "git+https://github.com/DelphinusLab/halo2ecc-s.git?tag=on-prove-pairing-0.6.3#ef2c90f208499a5f471599aa2fc538bf89631e76" +source = "git+https://github.com/DelphinusLab/halo2ecc-s.git?tag=on-prove-pairing-0.6.4#164b8367cc243f28128c785930859fa536b5c7af" dependencies = [ "ark-std", "halo2_proofs", @@ -3803,7 +3803,7 @@ dependencies = [ [[package]] name = "zkwasm-prover" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/zkWasm-prover.git#a9dfc9bfe16ccb71b2fbfa44d540a3cf58363827" +source = "git+https://github.com/DelphinusLab/zkWasm-prover.git?branch=oogl/dev-icicle-1.7.0#0c9abcea936a458d7c1be5737ff19b52d33c6d0c" dependencies = [ "ark-std", "cc", diff --git a/Cargo.toml b/Cargo.toml index 882cb7d9..70d262bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,11 +20,11 @@ strum_macros = "0.24.1" ff = "0.12" cfg-if = "1.0.0" halo2_proofs = { git = "https://github.com/DelphinusLab/halo2-gpu-specific.git", default-features = true } -halo2ecc-s = { git = "https://github.com/DelphinusLab/halo2ecc-s.git", tag = "on-prove-pairing-0.6.3"} +halo2ecc-s = { git = "https://github.com/DelphinusLab/halo2ecc-s.git", tag = "on-prove-pairing-0.6.4"} itertools = "0.10.0" num-bigint = { version = "0.4", features = ["rand"] } poseidon = { git = "https://github.com/DelphinusLab/poseidon" } -circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.4" } +circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.6" } rand = "0.8" rand_core = "0.6" ark-std = { version = "0.4.0" } From 35eb3beef3a98d6a826a06692421ba17bc9930bb Mon Sep 17 00:00:00 2001 From: sinka Date: Thu, 26 Sep 2024 18:41:39 +1000 Subject: [PATCH 2/3] bump zkwasm-continuation-batcher --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2942419b..29130896 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "circuits-batcher" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.6#c058e85cd401981f6ddf94d7378281b0ba7a2327" +source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.7#9f9c288baf027d5306f8f320c98022548fc6ea81" dependencies = [ "anyhow", "ark-std", diff --git a/Cargo.toml b/Cargo.toml index 70d262bc..11b83dfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ halo2ecc-s = { git = "https://github.com/DelphinusLab/halo2ecc-s.git", tag = "on itertools = "0.10.0" num-bigint = { version = "0.4", features = ["rand"] } poseidon = { git = "https://github.com/DelphinusLab/poseidon" } -circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.6" } +circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.7" } rand = "0.8" rand_core = "0.6" ark-std = { version = "0.4.0" } From 8eb67f65fa1f6b583a51f0f538a5f6034f71fe5f Mon Sep 17 00:00:00 2001 From: sinka Date: Wed, 16 Oct 2024 08:48:31 +1100 Subject: [PATCH 3/3] use stable-shuffle-1.0 --- Cargo.lock | 153 +---------------------------------------------------- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 152 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29130896..eb61a0d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,29 +410,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.53", - "which", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -554,15 +531,6 @@ version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -612,7 +580,7 @@ dependencies = [ [[package]] name = "circuits-batcher" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=on-prove-pairing-2.7#9f9c288baf027d5306f8f320c98022548fc6ea81" +source = "git+https://github.com/DelphinusLab/continuation-batcher.git?tag=stable-shuffle-1.0#904a0c1b03027b6cf256d9ccd44d8eb5abbac69a" dependencies = [ "anyhow", "ark-std", @@ -647,17 +615,6 @@ dependencies = [ "zkwasm-prover", ] -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob 0.3.1", - "libc", - "libloading", -] - [[package]] name = "clap" version = "3.2.25" @@ -1506,15 +1463,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -1564,34 +1512,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icicle-bn254" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "cmake", - "icicle-core", - "icicle-cuda-runtime", -] - -[[package]] -name = "icicle-core" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "icicle-cuda-runtime", - "rayon", -] - -[[package]] -name = "icicle-cuda-runtime" -version = "1.7.0" -source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.7.0#1abd2ef9c9b4e387ded2333b18e22e95d90f6653" -dependencies = [ - "bindgen", - "bitflags 1.3.2", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1751,12 +1671,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128" version = "0.2.5" @@ -1769,16 +1683,6 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if 1.0.0", - "windows-targets 0.52.4", -] - [[package]] name = "libm" version = "0.2.8" @@ -1895,12 +1799,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -1971,16 +1869,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" version = "0.4.1" @@ -2346,16 +2234,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.53", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2583,12 +2461,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.2.3" @@ -2828,12 +2700,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3498,18 +3364,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[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.31", -] - [[package]] name = "widestring" version = "1.0.2" @@ -3803,15 +3657,12 @@ dependencies = [ [[package]] name = "zkwasm-prover" version = "0.1.0" -source = "git+https://github.com/DelphinusLab/zkWasm-prover.git?branch=oogl/dev-icicle-1.7.0#0c9abcea936a458d7c1be5737ff19b52d33c6d0c" +source = "git+https://github.com/DelphinusLab/zkWasm-prover.git?branch=oogl/dev-msm#87c03e793987c65af8d2888fd67fa7eb470bd99a" dependencies = [ "ark-std", "cc", "cuda-runtime-sys", "halo2_proofs", - "icicle-bn254", - "icicle-core", - "icicle-cuda-runtime", "lazy_static", "libc", "rand", diff --git a/Cargo.toml b/Cargo.toml index 11b83dfe..ff78b0c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ halo2ecc-s = { git = "https://github.com/DelphinusLab/halo2ecc-s.git", tag = "on itertools = "0.10.0" num-bigint = { version = "0.4", features = ["rand"] } poseidon = { git = "https://github.com/DelphinusLab/poseidon" } -circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="on-prove-pairing-2.7" } +circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git", tag="stable-shuffle-1.0" } rand = "0.8" rand_core = "0.6" ark-std = { version = "0.4.0" }