Merkle cap verifier side

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" }

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)
     }
 }

recursive-verifier/app/circuit/circuit.go

@@ -51,7 +51,6 @@ func (circuit *Circuit) Define(api frontend.API) error {
 	}
 
 	rootHash, batchingRandomness, initialOODQueries, initialOODAnswers, err := parseBatchedCommitment(arthur, circuit.WHIRParamsWitness)
-
 	if err != nil {
 		return err
 	}
@@ -68,7 +67,6 @@ func (circuit *Circuit) Define(api frontend.API) error {
 	}
 
 	whirFoldingRandomness, err := RunZKWhir(api, arthur, uapi, sc, circuit.WitnessMerkle, circuit.WitnessFirstRound, circuit.WHIRParamsWitness, [][]frontend.Variable{circuit.WitnessClaimedEvaluations, circuit.WitnessBlindingEvaluations}, circuit.WitnessLinearStatementEvaluations, batchingRandomness, initialOODQueries, initialOODAnswers, rootHash)
-
 	if err != nil {
 		return err
 	}
@@ -88,8 +86,8 @@ func (circuit *Circuit) Define(api frontend.API) error {
 func verifyCircuit(
 	deferred []Fp256, cfg Config, hints Hints, pk *groth16.ProvingKey, vk *groth16.VerifyingKey, claimedEvaluations ClaimedEvaluations, internedR1CS R1CS, interner Interner, buildOps common.BuildOps,
 ) error {
-	transcriptT := make([]uints.U8, cfg.TranscriptLen)
-	contTranscript := make([]uints.U8, cfg.TranscriptLen)
+	transcriptT := make([]uints.U8, len(cfg.Transcript))
+	contTranscript := make([]uints.U8, len(cfg.Transcript))
 
 	for i := range cfg.Transcript {
 		transcriptT[i] = uints.NewU8(cfg.Transcript[i])