refactor(avm): move interaction jobs to trace builders

barretenberg/cpp/src/barretenberg/vm2/tracegen/address_derivation_trace.cpp

@@ -1,10 +1,16 @@
 #include "barretenberg/vm2/tracegen/address_derivation_trace.hpp"
 
+#include <memory>
+
 #include "barretenberg/vm2/common/aztec_constants.hpp"
 #include "barretenberg/vm2/common/aztec_types.hpp"
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_address_derivation.hpp"
 #include "barretenberg/vm2/simulation/events/address_derivation_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 #include "barretenberg/vm2/tracegen/trace_container.hpp"
 
 namespace bb::avm2::tracegen {
@@ -51,4 +57,28 @@ void AddressDerivationTraceBuilder::process(
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> AddressDerivationTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoDynamicTableSequential<
+            lookup_address_derivation_salted_initialization_hash_poseidon2_0_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<
+            lookup_address_derivation_salted_initialization_hash_poseidon2_1_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_partial_address_poseidon2_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_public_keys_hash_poseidon2_0_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_public_keys_hash_poseidon2_1_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_public_keys_hash_poseidon2_2_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_public_keys_hash_poseidon2_3_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_address_derivation_public_keys_hash_poseidon2_4_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_address_derivation_preaddress_poseidon2_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_address_derivation_preaddress_scalar_mul_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_address_derivation_address_ecadd_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/address_derivation_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/address_derivation_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
@@ -11,6 +13,8 @@ class AddressDerivationTraceBuilder final {
   public:
     void process(const simulation::EventEmitterInterface<simulation::AddressDerivationEvent>::Container& events,
                  TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/bitwise_trace.cpp

@@ -2,12 +2,18 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 #include <ranges>
 #include <stdexcept>
 
 #include "barretenberg/vm2/common/memory_types.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_bitwise.hpp"
 #include "barretenberg/vm2/simulation/events/bitwise_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_into_bitwise.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_into_indexed_by_clk.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 
 namespace bb::avm2::tracegen {
 
@@ -60,4 +66,11 @@ void BitwiseTraceBuilder::process(const simulation::EventEmitterInterface<simula
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> BitwiseTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoBitwise<lookup_bitwise_byte_operations_settings>>(),
+        std::make_unique<LookupIntoIndexedByClk<lookup_bitwise_integral_tag_length_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/bitwise_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/bitwise_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
@@ -11,6 +13,8 @@ class BitwiseTraceBuilder final {
   public:
     void process(const simulation::EventEmitterInterface<simulation::BitwiseEvent>::Container& events,
                  TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
-} // namespace bb::avm2::tracegen
+} // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.cpp

@@ -3,15 +3,23 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 #include <ranges>
 #include <stdexcept>
 #include <vector>
 
 #include "barretenberg/crypto/poseidon2/poseidon2.hpp"
 #include "barretenberg/vm2/common/aztec_constants.hpp"
 #include "barretenberg/vm2/common/instruction_spec.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_bc_decomposition.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_bc_hashing.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_bc_retrieval.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_instr_fetching.hpp"
 #include "barretenberg/vm2/simulation/events/bytecode_events.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_into_indexed_by_clk.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 #include "barretenberg/vm2/tracegen/precomputed_trace.hpp"
 
 using Poseidon2 = bb::crypto::Poseidon2<bb::crypto::Poseidon2Bn254ScalarFieldParams>;
@@ -370,4 +378,31 @@ void BytecodeTraceBuilder::process_instruction_fetching(
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> BytecodeTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        // Bytecode Hashing
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_hashing_get_packed_field_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_hashing_iv_is_len_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_hashing_poseidon2_hash_settings>>(),
+        // Bytecode Retrieval
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_retrieval_bytecode_hash_is_correct_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_retrieval_class_id_derivation_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_retrieval_address_derivation_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_retrieval_update_check_settings>>(),
+        std::make_unique<
+            LookupIntoDynamicTableSequential<lookup_bc_retrieval_silo_deployment_nullifier_poseidon2_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_bc_retrieval_deployment_nullifier_read_settings>>(),
+        // Bytecode Decomposition
+        std::make_unique<LookupIntoIndexedByClk<lookup_bc_decomposition_bytes_are_bytes_settings>>(),
+        std::make_unique<LookupIntoIndexedByClk<lookup_bc_decomposition_abs_diff_is_u16_settings>>(),
+        // Instruction Fetching
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_instr_fetching_bytes_from_bc_dec_settings>>(),
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_instr_fetching_bytecode_size_from_bc_dec_settings>>(),
+        std::make_unique<LookupIntoIndexedByClk<lookup_instr_fetching_wire_instruction_info_settings>>(),
+        std::make_unique<LookupIntoIndexedByClk<lookup_instr_fetching_instr_abs_diff_positive_settings>>(),
+        std::make_unique<LookupIntoIndexedByClk<lookup_instr_fetching_tag_value_validation_settings>>(),
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_instr_fetching_pc_abs_diff_positive_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/bytecode_events.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
@@ -25,6 +27,8 @@ class BytecodeTraceBuilder final {
     void process_instruction_fetching(
         const simulation::EventEmitterInterface<simulation::InstructionFetchingEvent>::Container& events,
         TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
-} // namespace bb::avm2::tracegen
+} // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/class_id_derivation_trace.cpp

@@ -1,8 +1,14 @@
 #include "barretenberg/vm2/tracegen/class_id_derivation_trace.hpp"
 
+#include <memory>
+
 #include "barretenberg/vm2/common/aztec_constants.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_class_id_derivation.hpp"
 #include "barretenberg/vm2/simulation/events/class_id_derivation_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 #include "barretenberg/vm2/tracegen/trace_container.hpp"
 
 namespace bb::avm2::tracegen {
@@ -29,4 +35,11 @@ void ClassIdDerivationTraceBuilder::process(
         row++;
     }
 }
+
+std::vector<std::unique_ptr<InteractionBuilderInterface>> ClassIdDerivationTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_class_id_derivation_class_id_poseidon2_0_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_class_id_derivation_class_id_poseidon2_1_settings>>());
+}
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/class_id_derivation_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/class_id_derivation_event.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
@@ -11,6 +13,8 @@ class ClassIdDerivationTraceBuilder final {
   public:
     void process(const simulation::EventEmitterInterface<simulation::ClassIdDerivationEvent>::Container& events,
                  TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/ecc_trace.cpp

@@ -1,11 +1,16 @@
 #include "barretenberg/vm2/tracegen/ecc_trace.hpp"
 
 #include <cassert>
+#include <memory>
 
 #include "barretenberg/vm2/common/aztec_types.hpp"
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_scalar_mul.hpp"
 #include "barretenberg/vm2/simulation/events/ecc_events.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 
 namespace bb::avm2::tracegen {
 
@@ -153,4 +158,12 @@ void EccTraceBuilder::process_scalar_mul(
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> EccTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_scalar_mul_double_settings>>(),
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_scalar_mul_add_settings>>(),
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_scalar_mul_to_radix_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/ecc_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/ecc_events.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
@@ -13,6 +15,8 @@ class EccTraceBuilder final {
                      TraceContainer& trace);
     void process_scalar_mul(const simulation::EventEmitterInterface<simulation::ScalarMulEvent>::Container& events,
                             TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/field_gt_trace.cpp

@@ -1,6 +1,13 @@
 #include "barretenberg/vm2/tracegen/field_gt_trace.hpp"
+
+#include <memory>
+
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_ff_gt.hpp"
 #include "barretenberg/vm2/simulation/lib/u256_decomposition.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 
 namespace bb::avm2::tracegen {
 
@@ -76,4 +83,11 @@ void FieldGreaterThanTraceBuilder::process(
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> FieldGreaterThanTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_ff_gt_a_lo_range_settings>>(),
+        std::make_unique<LookupIntoDynamicTableGeneric<lookup_ff_gt_a_hi_range_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/field_gt_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
 #include "barretenberg/vm2/simulation/events/field_gt_event.hpp"
@@ -11,6 +13,8 @@ class FieldGreaterThanTraceBuilder final {
   public:
     void process(const simulation::EventEmitterInterface<simulation::FieldGreaterThanEvent>::Container& events,
                  TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/interaction_builder.hpp

@@ -20,4 +20,4 @@ template <typename LookupSettings> void SetDummyInverses(TraceContainer& trace)
                        [&](uint32_t row, const FF&) { trace.set(LookupSettings::INVERSES, row, 0xdeadbeef); });
 }
 
-} // namespace bb::avm2::tracegen
+} // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/make_jobs.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+namespace bb::avm2::tracegen {
+
+// Helper function to create a vector of unique_ptrs.
+template <typename R, typename... Ts> std::vector<R> make_jobs(Ts&&... args)
+{
+    std::vector<R> jobs;
+    jobs.reserve(sizeof...(Ts));
+    (jobs.push_back(std::move(args)), ...);
+    return jobs;
+}
+
+} // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/merkle_check_trace.cpp

@@ -1,8 +1,13 @@
 #include <cstdint>
+#include <memory>
 
 #include "barretenberg/crypto/poseidon2/poseidon2.hpp"
+#include "barretenberg/vm2/generated/relations/lookups_merkle_check.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
 #include "barretenberg/vm2/simulation/events/merkle_check_event.hpp"
+#include "barretenberg/vm2/tracegen/lib/interaction_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp"
+#include "barretenberg/vm2/tracegen/lib/make_jobs.hpp"
 #include "barretenberg/vm2/tracegen/merkle_check_trace.hpp"
 
 namespace bb::avm2::tracegen {
@@ -89,4 +94,11 @@ void MerkleCheckTraceBuilder::process(
     }
 }
 
+std::vector<std::unique_ptr<InteractionBuilderInterface>> MerkleCheckTraceBuilder::lookup_jobs()
+{
+    return make_jobs<std::unique_ptr<InteractionBuilderInterface>>(
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_merkle_check_merkle_poseidon2_read_settings>>(),
+        std::make_unique<LookupIntoDynamicTableSequential<lookup_merkle_check_merkle_poseidon2_write_settings>>());
+}
+
 } // namespace bb::avm2::tracegen

barretenberg/cpp/src/barretenberg/vm2/tracegen/merkle_check_trace.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/simulation/events/event_emitter.hpp"
 #include "barretenberg/vm2/simulation/events/merkle_check_event.hpp"
@@ -11,6 +13,8 @@ class MerkleCheckTraceBuilder final {
   public:
     void process(const simulation::EventEmitterInterface<simulation::MerkleCheckEvent>::Container& events,
                  TraceContainer& trace);
+
+    static std::vector<std::unique_ptr<class InteractionBuilderInterface>> lookup_jobs();
 };
 
 } // namespace bb::avm2::tracegen