feat: merge-train/barretenberg (#15869)

See
[merge-train-readme.md](https://github.com/AztecProtocol/aztec-packages/blob/next/.github/workflows/merge-train-readme.md).

BEGIN_COMMIT_OVERRIDE
chore: delete unused polynomial arithmetic functions (#15864)
chore: remove circuit merkle membership. (#15794)
chore: assert size == virtual_size in polynomial::evaluate (#15851)
chore: remove non-plookup blake2/3s (#15843)
chore: refactor MergeSettings to not be used in the MegaCircuitBuilder
(#15825)
chore!: split aux relation into memory and nnf relations (#15811)
END_COMMIT_OVERRIDE

---------

Co-authored-by: AztecBot <tech@aztecprotocol.com>
Co-authored-by: Jonathan Hao <jonathan@aztec-labs.com>
Co-authored-by: Suyash Bagad <suyash@aztecprotocol.com>
Co-authored-by: sergei iakovenko <105737703+iakovenkos@users.noreply.github.com>
Co-authored-by: Lucas Xia <lucasxia01@gmail.com>
Co-authored-by: maramihali <mara@aztecprotocol.com>
Co-authored-by: ledwards2225 <98505400+ledwards2225@users.noreply.github.com>
Co-authored-by: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Co-authored-by: thunkar <gregojquiros@gmail.com>

Author: 10 people

avm-transpiler/Cargo.lock

@@ -8,7 +8,7 @@ const logger = pino({
   name: "bbjs-test",
 });
 
-const UH_PROOF_FIELDS_LENGTH = 507; // length of UltraZKHonk flavor
+const UH_PROOF_FIELDS_LENGTH = 508; // length of UltraZKHonk flavor
 const BYTES_PER_FIELD = 32;
 const UH_PROOF_LENGTH_IN_BYTES = UH_PROOF_FIELDS_LENGTH * BYTES_PER_FIELD;
 

barretenberg/acir_tests/bbjs-test/src/index.ts

@@ -6,8 +6,8 @@ import solc from "solc";
 
 // Size excluding number of public inputs
 const NUMBER_OF_FIELDS_IN_PLONK_PROOF = 93;
-const NUMBER_OF_FIELDS_IN_HONK_PROOF = 456;
-const NUMBER_OF_FIELDS_IN_HONK_ZK_PROOF = 507;
+const NUMBER_OF_FIELDS_IN_HONK_PROOF = 457;
+const NUMBER_OF_FIELDS_IN_HONK_ZK_PROOF = 508;
 
 const WRONG_PROOF_LENGTH = "0xed74ac0a";
 const WRONG_PUBLIC_INPUTS_LENGTH = "0xfa066593";
@@ -165,6 +165,26 @@ const deploy = async (signer, abi, bytecode) => {
   return await deployed.getAddress();
 };
 
+/**
+ * Links a library address to bytecode
+ * @param {string} bytecode - The bytecode with library placeholders
+ * @param {string} libraryName - The library name
+ * @param {string} libraryAddress - The deployed library address
+ * @returns {string} - The linked bytecode
+ */
+const linkLibrary = (bytecode, libraryName, libraryAddress) => {
+  // Remove 0x prefix from address if present
+  const address = libraryAddress.replace(/^0x/, '');
+
+  // Library placeholder is __$<keccak256(libraryName)[0:34]>$__
+  // We need to find and replace this placeholder with the actual address
+  const placeholder = `__\\$[a-fA-F0-9]{34}\\$__`;
+  const regex = new RegExp(placeholder, 'g');
+
+  // Replace all occurrences of the placeholder with the library address
+  return bytecode.replace(regex, address);
+};
+
 /**
  * Takes in a proof as fields, and returns the public inputs, as well as the number of public inputs
  * @param {Array<String>} proofAsFields
@@ -258,7 +278,31 @@ try {
   const provider = await getProvider(randomPort);
   const signer = new ethers.Wallet(key, provider);
 
-  const address = await deploy(signer, abi, bytecode);
+  let finalBytecode = bytecode;
+
+  // Deploy ZKTranscript library if needed and link it
+  if (testingHonk && hasZK) {
+    // Check if there's a library placeholder in the bytecode
+    const libraryPlaceholder = /__\$[a-fA-F0-9]{34}\$__/;
+    if (libraryPlaceholder.test(bytecode)) {
+      // Get the ZKTranscriptLib contract from compilation output
+      const zkTranscriptContract = output.contracts["Verifier.sol"]["ZKTranscriptLib"];
+      if (zkTranscriptContract) {
+        const libraryBytecode = zkTranscriptContract.evm.bytecode.object;
+        const libraryAbi = zkTranscriptContract.abi;
+
+        // Deploy the library
+        console.log("Deploying ZKTranscriptLib library...");
+        const libraryAddress = await deploy(signer, libraryAbi, libraryBytecode);
+        console.log("ZKTranscriptLib deployed at:", libraryAddress);
+
+        // Link the library to the verifier bytecode
+        finalBytecode = linkLibrary(bytecode, "ZKTranscriptLib", libraryAddress);
+      }
+    }
+  }
+
+  const address = await deploy(signer, abi, finalBytecode);
   const contract = new ethers.Contract(address, abi, signer);
 
   const result = await contract.test(proofStr, publicInputs);

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

@@ -119,7 +119,8 @@ def print_contributions(prefix, ivc_bench_json, bench_name, components):
     "Lookup::accumulate(t)",
     "DeltaRange::accumulate(t)",
     "Elliptic::accumulate(t)",
-    "Auxiliary::accumulate(t)",
+    "Memory::accumulate(t)",
+    "NonNativeField::accumulate(t)",
     "EccOp::accumulate(t)",
     "DatabusRead::accumulate(t)",
     "PoseidonExt::accumulate(t)",

barretenberg/cpp/scripts/analyze_client_ivc_bench.py

@@ -11,7 +11,7 @@ cd ..
 # - Generate a hash for versioning: sha256sum bb-civc-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-civc-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-civc-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-c373cc52.tar.gz"
+pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-c0333b8c.tar.gz"
 
 # For easily rerunning the inputs generation
 if [[ "${1:-}" == "--update_inputs" ]]; then

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

@@ -37,6 +37,7 @@ Builder generate_trace(size_t target_num_gates)
         op_queue->add_accumulate(a);
         op_queue->mul_accumulate(b, x);
         op_queue->eq_and_reset();
+        op_queue->merge();
     }
 
     Builder builder{ op_queue };

barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp

@@ -65,7 +65,8 @@ template <typename Flavor, typename Relation> void execute_relation_for_pg_univa
 BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, UltraArithmeticRelation<Fr>>);
 BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, DeltaRangeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, EllipticRelation<Fr>>);
-BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, AuxiliaryRelation<Fr>>);
+BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, MemoryRelation<Fr>>);
+BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, NonNativeFieldRelation<Fr>>);
 BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, LogDerivLookupRelation<Fr>>);
 BENCHMARK(execute_relation_for_pg_univariates<UltraFlavor, UltraPermutationRelation<Fr>>);
 
@@ -79,7 +80,8 @@ BENCHMARK(execute_relation_for_pg_univariates<MegaFlavor, Poseidon2InternalRelat
 BENCHMARK(execute_relation_for_univariates<UltraFlavor, UltraArithmeticRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<UltraFlavor, DeltaRangeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<UltraFlavor, EllipticRelation<Fr>>);
-BENCHMARK(execute_relation_for_univariates<UltraFlavor, AuxiliaryRelation<Fr>>);
+BENCHMARK(execute_relation_for_univariates<UltraFlavor, MemoryRelation<Fr>>);
+BENCHMARK(execute_relation_for_univariates<UltraFlavor, NonNativeFieldRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<UltraFlavor, LogDerivLookupRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<UltraFlavor, UltraPermutationRelation<Fr>>);
 
@@ -93,7 +95,8 @@ BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2InternalRelation
 BENCHMARK(execute_relation_for_values<UltraFlavor, UltraArithmeticRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<UltraFlavor, DeltaRangeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<UltraFlavor, EllipticRelation<Fr>>);
-BENCHMARK(execute_relation_for_values<UltraFlavor, AuxiliaryRelation<Fr>>);
+BENCHMARK(execute_relation_for_values<UltraFlavor, MemoryRelation<Fr>>);
+BENCHMARK(execute_relation_for_values<UltraFlavor, NonNativeFieldRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<UltraFlavor, LogDerivLookupRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<UltraFlavor, UltraPermutationRelation<Fr>>);
 
@@ -122,4 +125,4 @@ BENCHMARK(execute_relation_for_values<ECCVMFlavor, ECCVMBoolsRelation<Fq>>);
 
 } // namespace bb::benchmark::relations
 
-BENCHMARK_MAIN();
+BENCHMARK_MAIN();

barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp

@@ -49,10 +49,6 @@ BENCHMARK_CAPTURE(construct_proof_megahonk,
                   ecdsa_verification,
                   &stdlib::generate_ecdsa_verification_test_circuit<MegaCircuitBuilder>)
     ->Unit(kMillisecond);
-BENCHMARK_CAPTURE(construct_proof_megahonk,
-                  merkle_membership,
-                  &stdlib::generate_merkle_membership_test_circuit<MegaCircuitBuilder>)
-    ->Unit(kMillisecond);
 
 BENCHMARK(get_row_power_of_2)
     // 2**15 gates to 2**20 gates

barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp

@@ -38,10 +38,6 @@ BENCHMARK_CAPTURE(construct_proof_megahonk_zk,
                   ecdsa_verification,
                   &stdlib::generate_ecdsa_verification_test_circuit<MegaCircuitBuilder>)
     ->Unit(kMillisecond);
-BENCHMARK_CAPTURE(construct_proof_megahonk_zk,
-                  merkle_membership,
-                  &stdlib::generate_merkle_membership_test_circuit<MegaCircuitBuilder>)
-    ->Unit(kMillisecond);
 
 BENCHMARK(construct_proof_megahonk_power_of_2_zk)
     // 2**15 gates to 2**20 gates

barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_zk_honk.bench.cpp

@@ -2,7 +2,6 @@
 #include <benchmark/benchmark.h>
 
 #include "barretenberg/common/assert.hpp"
-#include "barretenberg/crypto/merkle_tree/membership.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/keccak/keccak.hpp"