From 22e390563f620b11b86458e72b7b215edd1707d5 Mon Sep 17 00:00:00 2001 From: Veljko Vranic Date: Wed, 19 Nov 2025 17:38:54 +0100 Subject: [PATCH 1/5] temporarily fix spongefish version --- Cargo.toml | 6 +++--- provekit/r1cs-compiler/src/whir_r1cs.rs | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a0a0f09f8..621ddf00c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,6 +149,6 @@ ark-serialize = "0.5" ark-std = { version = "0.5", features = ["std"] } spongefish = { git = "https://github.com/arkworks-rs/spongefish", features = [ "arkworks-algebra", -] } -spongefish-pow = { git = "https://github.com/arkworks-rs/spongefish" } -whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "3d627d31cec7d73a470a31a913229dd3128ee0cf" } +], rev = "ecb4f08373ed930175585c856517efdb1851fb47" } +spongefish-pow = { git = "https://github.com/arkworks-rs/spongefish", rev = "ecb4f08373ed930175585c856517efdb1851fb47" } +whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "c2bafc36a878500a3e19c12d3239d488ff7b5d61" } \ No newline at end of file diff --git a/provekit/r1cs-compiler/src/whir_r1cs.rs b/provekit/r1cs-compiler/src/whir_r1cs.rs index e08ac26f2..b7509738e 100644 --- a/provekit/r1cs-compiler/src/whir_r1cs.rs +++ b/provekit/r1cs-compiler/src/whir_r1cs.rs @@ -1,9 +1,8 @@ use { - provekit_common::{utils::next_power_of_two, FieldElement, WhirConfig, WhirR1CSScheme, R1CS}, - whir::parameters::{ + provekit_common::{utils::next_power_of_two, WhirConfig, WhirR1CSScheme, R1CS}, std::sync::Arc, whir::{ntt::RSDefault, parameters::{ default_max_pow, DeduplicationStrategy, FoldingFactor, MerkleProofStrategy, MultivariateParameters, ProtocolParameters, SoundnessType, - }, + }} }; // Minimum log2 of the WHIR evaluation domain (lower bound for m). @@ -63,6 +62,8 @@ impl WhirR1CSSchemeBuilder for WhirR1CSScheme { deduplication_strategy: DeduplicationStrategy::Disabled, merkle_proof_strategy: MerkleProofStrategy::Uncompressed, }; - WhirConfig::new(mv_params, whir_params) + let reed_solomon = Arc::new(RSDefault); + let basefield_reed_solomon = reed_solomon.clone(); + WhirConfig::new(reed_solomon, basefield_reed_solomon, mv_params, whir_params) } } From 9da44a24b449c452e6df9c5d08680228dadeca74 Mon Sep 17 00:00:00 2001 From: Veljko Vranic Date: Wed, 19 Nov 2025 17:40:14 +0100 Subject: [PATCH 2/5] use merged whir commit --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 621ddf00c..72dfd4dbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -151,4 +151,4 @@ spongefish = { git = "https://github.com/arkworks-rs/spongefish", features = [ "arkworks-algebra", ], rev = "ecb4f08373ed930175585c856517efdb1851fb47" } spongefish-pow = { git = "https://github.com/arkworks-rs/spongefish", rev = "ecb4f08373ed930175585c856517efdb1851fb47" } -whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "c2bafc36a878500a3e19c12d3239d488ff7b5d61" } \ No newline at end of file +whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "15cf6668e904ed2e80c9e6209dcce69f5bcf79b9" } \ No newline at end of file From 1f678ea26f4c3a3369bc247af81bb47f5238b9fd Mon Sep 17 00:00:00 2001 From: Veljko Vranic Date: Wed, 19 Nov 2025 17:46:34 +0100 Subject: [PATCH 3/5] fmt --- provekit/r1cs-compiler/src/whir_r1cs.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/provekit/r1cs-compiler/src/whir_r1cs.rs b/provekit/r1cs-compiler/src/whir_r1cs.rs index b7509738e..a28110954 100644 --- a/provekit/r1cs-compiler/src/whir_r1cs.rs +++ b/provekit/r1cs-compiler/src/whir_r1cs.rs @@ -1,8 +1,13 @@ use { - provekit_common::{utils::next_power_of_two, WhirConfig, WhirR1CSScheme, R1CS}, std::sync::Arc, whir::{ntt::RSDefault, parameters::{ - default_max_pow, DeduplicationStrategy, FoldingFactor, MerkleProofStrategy, - MultivariateParameters, ProtocolParameters, SoundnessType, - }} + provekit_common::{utils::next_power_of_two, WhirConfig, WhirR1CSScheme, R1CS}, + std::sync::Arc, + whir::{ + ntt::RSDefault, + parameters::{ + default_max_pow, DeduplicationStrategy, FoldingFactor, MerkleProofStrategy, + MultivariateParameters, ProtocolParameters, SoundnessType, + }, + }, }; // Minimum log2 of the WHIR evaluation domain (lower bound for m). From dc4c44dc6fcab0b1cb5e26834118b433e941ee16 Mon Sep 17 00:00:00 2001 From: Veljko Vranic Date: Wed, 19 Nov 2025 18:08:32 +0100 Subject: [PATCH 4/5] harness = false --- tooling/provekit-bench/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/provekit-bench/Cargo.toml b/tooling/provekit-bench/Cargo.toml index 0c67ee051..5c6aaddc6 100644 --- a/tooling/provekit-bench/Cargo.toml +++ b/tooling/provekit-bench/Cargo.toml @@ -34,4 +34,4 @@ workspace = true [[bench]] name = "bench" -harness = true \ No newline at end of file +harness = false \ No newline at end of file From 0cc7c2cc1c05157fc84c99e967b0f5bce40c18cc Mon Sep 17 00:00:00 2001 From: Veljko Vranic Date: Thu, 27 Nov 2025 10:33:09 +0100 Subject: [PATCH 5/5] revert harness flag --- tooling/provekit-bench/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/provekit-bench/Cargo.toml b/tooling/provekit-bench/Cargo.toml index 5c6aaddc6..0c67ee051 100644 --- a/tooling/provekit-bench/Cargo.toml +++ b/tooling/provekit-bench/Cargo.toml @@ -34,4 +34,4 @@ workspace = true [[bench]] name = "bench" -harness = false \ No newline at end of file +harness = true \ No newline at end of file