tweaks

Author: ludamad

barretenberg/acir_tests/scripts/bb_prove_bbjs_verify.sh

@@ -22,7 +22,6 @@ $bb prove \
   -b target/program.json \
   -w target/witness.gz \
   -k output-$$/vk \
-  --output_format bytes_and_fields \
   -o output-$$
 
 # Verify the proof with bb.js classes

barretenberg/acir_tests/scripts/bb_prove_sol_verify.sh

@@ -27,16 +27,15 @@ mkdir -p output-$$
 trap "rm -rf output-$$" EXIT
 
 # Create a proof, write the solidity contract, write the proof as fields in order to extract the public inputs
-$bb prove $flags -b target/program.json --oracle_hash keccak --output_format bytes_and_fields --write_vk -o output-$$
+$bb prove $flags -b target/program.json --oracle_hash keccak --write_vk -o output-$$
 $bb verify $flags --oracle_hash keccak -i output-$$/public_inputs -k output-$$/vk -p output-$$/proof
 $bb write_solidity_verifier $flags -k output-$$/vk -o output-$$/Verifier.sol
 
 # Use solcjs to compile the generated key contract with the template verifier and test contract
 # index.js will start an anvil, on a random port
 # Deploy the verifier then send a test transaction
 PROOF="output-$$/proof" \
-PROOF_AS_FIELDS="output-$$/proof_fields.json" \
-PUBLIC_INPUTS_AS_FIELDS="output-$$/public_inputs_fields.json" \
+PUBLIC_INPUTS="output-$$/public_inputs" \
 VERIFIER_PATH="output-$$/Verifier.sol" \
 TEST_PATH="../../sol-test/HonkTest.sol" \
 HAS_ZK="$has_zk" \

barretenberg/acir_tests/scripts/bbjs_prove_bb_verify.sh

@@ -14,17 +14,7 @@ node ../../bbjs-test prove \
   -w target/witness.gz \
   -o output-$$
 
-proof_bytes=$(cat output-$$/proof | xxd -p)
-public_inputs=$(cat output-$$/public_inputs_fields.json | jq -r '.[]')
-
-public_inputs_bytes=""
-for input in $public_inputs; do
-  public_inputs_bytes+=$input
-done
-
-# Combine proof header and the proof to a single file
-echo -n $proof_bytes | xxd -r -p > output-$$/proof
-echo -n $public_inputs_bytes | xxd -r -p > output-$$/public_inputs
+# The proof and public_inputs are already in binary format from bbjs-test
 
 bb=$(../../../cpp/scripts/find-bb)
 # Verify the proof with bb cli

barretenberg/acir_tests/scripts/bbjs_prove_sol_verify.sh

@@ -35,8 +35,7 @@ $bb write_solidity_verifier --scheme ultra_honk -k output-$$/vk -o output-$$/Ver
 
 # Verify the proof using the solidity verifier
 PROOF="output-$$/proof" \
-PROOF_AS_FIELDS="output-$$/proof_fields.json" \
-PUBLIC_INPUTS_AS_FIELDS="output-$$/public_inputs_fields.json" \
+PUBLIC_INPUTS="output-$$/public_inputs" \
 VERIFIER_PATH="output-$$/Verifier.sol" \
 TEST_PATH="../../sol-test/HonkTest.sol" \
 HAS_ZK="$has_zk" \

barretenberg/acir_tests/sol-test/src/index.js

@@ -175,7 +175,7 @@ const binaryToFields = (buffer) => {
   for (let i = 0; i < buffer.length; i += 32) {
     const chunk = buffer.slice(i, Math.min(i + 32, buffer.length));
     // Pad with leading zeros if chunk is less than 32 bytes
-    const padded = chunk.length < 32 
+    const padded = chunk.length < 32
       ? Buffer.concat([Buffer.alloc(32 - chunk.length), chunk])
       : chunk;
     fields.push('0x' + padded.toString('hex'));
@@ -247,14 +247,14 @@ try {
   var publicInputs = [];
   let numExtraPublicInputs = 0;
   let extraPublicInputs = [];
-  
+
   // For flows that use binary proof format, extract public inputs from the proof
   const proofAsFields = binaryToFields(proof);
   if (proofAsFields.length > NUMBER_OF_FIELDS_IN_PROOF) {
     // We need to extract the public inputs from the proof. This might be empty, or just the pairing point object, or be the entire public inputs...
     [numExtraPublicInputs, extraPublicInputs] = readPublicInputs(proofAsFields);
   }
-  
+
   // Read public inputs from binary file if available
   if (publicInputsPath) {
     const publicInputsBinary = readFileSync(publicInputsPath);