From b10de2e3839890b6c332980d77a8dc3b148cc0fe Mon Sep 17 00:00:00 2001
From: ledwards2225 <l.edwards.d@gmail.com>
Date: Tue, 31 Oct 2023 23:35:42 +0000
Subject: [PATCH] update constructors to fix acir

---
 .../proof_system/circuit_builder/circuit_builder_base.hpp     | 3 ---
 .../proof_system/circuit_builder/standard_circuit_builder.hpp | 2 ++
 .../proof_system/circuit_builder/ultra_circuit_builder.hpp    | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
index 85e8995bf879..140d98b234fe 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
@@ -17,9 +17,6 @@ template <typename FF_> class CircuitBuilderBase {
     using EmbeddedCurve =
         std::conditional_t<std::same_as<FF, barretenberg::g1::coordinate_field>, curve::BN254, curve::Grumpkin>;
 
-    // WORKTODO: hackily defining this here in the base for now. Get acir-bberg test failure otherwise
-    // std::array<std::vector<uint32_t, barretenberg::ContainerSlabAllocator<uint32_t>>, /* max num wires = */ 4> wires;
-
     size_t num_gates = 0;
 
     std::vector<uint32_t> public_inputs;
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
index 28a2272fdc73..015fcb3a143d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
@@ -71,6 +71,8 @@ template <typename FF> class StandardCircuitBuilder_ : public CircuitBuilderBase
     {
         CircuitBuilderBase<FF>::operator=(std::move(other));
         constant_variable_indices = other.constant_variable_indices;
+        wires = other.wires;
+        selectors = other.selectors;
         return *this;
     };
     ~StandardCircuitBuilder_() override = default;
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
index b37fcca85f6e..ce1bb652abc0 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
@@ -600,6 +600,8 @@ template <typename FF> class UltraCircuitBuilder_ : public CircuitBuilderBase<FF
     UltraCircuitBuilder_(UltraCircuitBuilder_&& other)
         : CircuitBuilderBase<FF>(std::move(other))
     {
+        wires = other.wires;
+        selectors = other.selectors;
         constant_variable_indices = other.constant_variable_indices;
 
         lookup_tables = other.lookup_tables;
@@ -616,6 +618,8 @@ template <typename FF> class UltraCircuitBuilder_ : public CircuitBuilderBase<FF
     UltraCircuitBuilder_& operator=(UltraCircuitBuilder_&& other)
     {
         CircuitBuilderBase<FF>::operator=(std::move(other));
+        wires = other.wires;
+        selectors = other.selectors;
         constant_variable_indices = other.constant_variable_indices;
 
         lookup_tables = other.lookup_tables;