From 882b2218f9f4694879b5ff57687d5cba0b20196d Mon Sep 17 00:00:00 2001
From: Balazs Komuves <bkomuves@gmail.com>
Date: Tue, 28 Nov 2023 18:50:11 +0100
Subject: [PATCH] fix the Poseidon2 SNARK benchmark

---
 hash/snark/bench/Poseidon2/build.sh             | 4 ++--
 hash/snark/bench/Poseidon2/hash.circom.template | 2 +-
 hash/snark/bench/Poseidon2/run.sh               | 9 ++++-----
 hash/snark/bench/Poseidon2/setup.sh             | 8 ++++----
 hash/snark/bench/Poseidon2/witness.sh           | 8 ++++----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/hash/snark/bench/Poseidon2/build.sh b/hash/snark/bench/Poseidon2/build.sh
index 56148bc..597fc72 100755
--- a/hash/snark/bench/Poseidon2/build.sh
+++ b/hash/snark/bench/Poseidon2/build.sh
@@ -5,7 +5,7 @@ ZKBENCH_INPUT_SIZE=256
 fi
 
 if [ -z ${ZKBENCH_WHICH} ]; then 
-ZKBENCH_WHICH="hash_sponge"
+ZKBENCH_WHICH="hash_sponge_rate1"
 fi
 
 ORIG=`pwd`
@@ -16,7 +16,7 @@ gcc -O3 generate_input.c -o build/generate_input || { echo "gcc failed"; exit 10
 
 #NAME=${ZKBENCH_WHICH}
 NAME="hash"
-echo ${NAME}.circom.template \
+cat ${NAME}.circom.template \
   | sed "s/ZKBENCH_INPUT_SIZE/${ZKBENCH_INPUT_SIZE}/g" \
   | sed "s/ZKBENCH_WHICH/${ZKBENCH_WHICH}/g"           \
   >build/${NAME}.circom
diff --git a/hash/snark/bench/Poseidon2/hash.circom.template b/hash/snark/bench/Poseidon2/hash.circom.template
index b9b0020..ce11acc 100644
--- a/hash/snark/bench/Poseidon2/hash.circom.template
+++ b/hash/snark/bench/Poseidon2/hash.circom.template
@@ -33,7 +33,7 @@ function CeilLog2(n) {
   return (n==0) ? 0 : (1 + FloorLog2(n-1));
 }
 
-template Bench_hash_merkle2(n) {
+template Bench_hash_merkle(n) {
   var log2n = CeilLog2(n);
   assert( (1<<log2n) == n );    // for now this only works for power-of-two sized inputs 
 
diff --git a/hash/snark/bench/Poseidon2/run.sh b/hash/snark/bench/Poseidon2/run.sh
index 4ad877c..4c19793 100755
--- a/hash/snark/bench/Poseidon2/run.sh
+++ b/hash/snark/bench/Poseidon2/run.sh
@@ -4,22 +4,21 @@ if [ -z ${ZKBENCH_PROVER} ]; then
 ZKBENCH_PROVER="snarkjs"
 fi
 
-if [ -z ${ZKBENCH_WHICH} ]; then 
-ZKBENCH_WHICH="hash_sponge"
-fi
+# if [ -z ${ZKBENCH_WHICH} ]; then 
+# ZKBENCH_WHICH="hash_sponge_rate1"
+# fi
 
 ORIG=`pwd`
 
 cd build
 
+NAME="hash"
 echo "generating proof with ${ZKBENCH_PROVER}"
 case $ZKBENCH_PROVER in
   snarkjs)
-    NAME="${ZKBENCH_WHICH}"
     snarkjs groth16 prove ${NAME}_prover.zkey ${NAME}_witness.wtns ${NAME}_proof.json ${NAME}_public.json
     ;;
   rapidsnark)
-    NAME="${ZKBENCH_WHICH}"
     rapidsnark ${NAME}_prover.zkey ${NAME}_witness.wtns ${NAME}_proof.json ${NAME}_public.json
     ;;
   *)
diff --git a/hash/snark/bench/Poseidon2/setup.sh b/hash/snark/bench/Poseidon2/setup.sh
index c458d51..1c6e783 100755
--- a/hash/snark/bench/Poseidon2/setup.sh
+++ b/hash/snark/bench/Poseidon2/setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ -z ${ZKBENCH_WHICH} ]; then 
-ZKBENCH_WHICH="hash_sponge"
-fi
+# if [ -z ${ZKBENCH_WHICH} ]; then 
+# ZKBENCH_WHICH="hash_sponge_rate1"
+# fi
 
 ORIG=`pwd`
 ROOT="${ORIG}/../../../../"
@@ -10,7 +10,7 @@ ROOT="${ORIG}/../../../../"
 cd build
 
 echo "circuit-specific ceremony..."
-NAME="${ZKBENCH_WHICH}"
+NAME="hash"
 snarkjs groth16 setup ${NAME}.r1cs ${ROOT}/ceremony/ceremony.ptau ${NAME}_0000.zkey
 echo "some_entropy" | snarkjs zkey contribute ${NAME}_0000.zkey ${NAME}_0001.zkey --name="1st Contributor Name"
 rm ${NAME}_0000.zkey
diff --git a/hash/snark/bench/Poseidon2/witness.sh b/hash/snark/bench/Poseidon2/witness.sh
index 223ee5f..65b3219 100755
--- a/hash/snark/bench/Poseidon2/witness.sh
+++ b/hash/snark/bench/Poseidon2/witness.sh
@@ -4,9 +4,9 @@ if [ -z ${ZKBENCH_INPUT_SIZE} ]; then
 ZKBENCH_INPUT_SIZE=256
 fi
 
-if [ -z ${ZKBENCH_WHICH} ]; then 
-ZKBENCH_WHICH="hash_sponge"
-fi
+# if [ -z ${ZKBENCH_WHICH} ]; then 
+# ZKBENCH_WHICH="hash_sponge_rate1"
+# fi
 
 ORIG=`pwd`
 
@@ -16,7 +16,7 @@ echo "generating input..."
 ./generate_input $ZKBENCH_INPUT_SIZE >input.json
 
 echo "generating witness... (WASM)"
-NAME="${ZKBENCH_WHICH}"
+NAME="hash"
 cd ${NAME}_js
 node generate_witness.js ${NAME}.wasm ../input.json ../${NAME}_witness.wtns || { echo "witness gen failed"; exit 101; }
 cd ..