chore: cleanup removing inf from circuits - no opcode changes

Author: MirandaWood

barretenberg/cpp/pil/vm2/bytecode/address_derivation.pil

@@ -307,16 +307,15 @@ namespace address_derivation;
 
     // Enforces address_point = preaddress_public_key + incoming_viewing_key on Grumpkin, and that
     // address = address_point.x.
-    // TODO(MW): Remove result_infinity?
     #[ADDRESS_ECADD]
     sel {
         preaddress_public_key_x, preaddress_public_key_y, precomputed.zero,
         incoming_viewing_key_x, incoming_viewing_key_y, precomputed.zero,
-        address, address_y, precomputed.zero
+        address, address_y
     } in ecc.sel {
         ecc.p_x, ecc.p_y, ecc.p_is_inf,
         ecc.q_x, ecc.q_y, ecc.q_is_inf,
-        ecc.r_x, ecc.r_y, ecc.result_infinity
+        ecc.r_x, ecc.r_y
     };
 
     // Note: We can safely assume the address point is not infinity since that would imply either

barretenberg/cpp/pil/vm2/ecc_mem.pil

@@ -118,8 +118,6 @@ namespace ecc_add_mem;
     pol commit p_x, p_y;
     pol commit q_x, q_y;
 
-    // MW NOTE: Still using p_is_inf, q_is_inf just as flags to tell ecc.pil how to treat the points.
-    // TODO(#AVM-266): Remove p_is_inf, q_is_inf entirely.
     // Needs to be committed columns as they are used in the lookups
     pol commit p_is_inf, q_is_inf; // constrained to be @boolean in the ecc subtrace (see #[INPUT_OUTPUT_ECC_ADD])
 
@@ -185,12 +183,8 @@ namespace ecc_add_mem;
     pol commit sel_should_exec; // @boolean (by definition)
     sel_should_exec = sel * (1 - err);
 
-    // MW NOTE: Still using p_is_inf, q_is_inf just as flags to tell ecc.pil how to treat the points.
-    // MW NOTE: Output inifinities - in ecc.pil, if result_infinity, then r_x = INFINITY_X = 0, r_y = INFINITY_Y = 0.
-    // Sufficient to just lookup res_x, res_y here?
-
-    // TODO(#AVM-266): Remove p_is_inf, q_is_inf entirely. For now, we ensure that the flag being set means that the coordinates
-    // are set to our infinity representation: (INFINITY_X, INFINITY_Y) = (0, 0). The reverse ((INFINITY_X, INFINITY_Y) ==> is_inf)
+    // TODO(#AVM-266): For now, we ensure that the flag being set means that the coordinates are set to our infinity
+    // representation: (INFINITY_X, INFINITY_Y) = (0, 0). The reverse ((INFINITY_X, INFINITY_Y) ==> is_inf)
     // is constrained by #[P/Q_ON_CURVE_CHECK]. Output infinities are already constrained to be (0, 0) in the subtrace.
     #[P_INF_X_CHECK]
     sel * p_is_inf * (p_x - ecc.INFINITY_X) = 0;
@@ -232,12 +226,3 @@ namespace ecc_add_mem;
     memory.sel_ecc_write[1] {
         memory.clk, memory.space_id, memory.address, memory.value, memory.tag, memory.rw
     };
-
-    // #[WRITE_MEM_2]
-    // sel_should_exec {
-    //     execution_clk, space_id, dst_addr[2], res_is_inf, /*U1_mem_tag=1*/ sel_should_exec, /*rw=1*/ sel_should_exec
-    // } is
-    // memory.sel_ecc_write[2] {
-    //     memory.clk, memory.space_id, memory.address, memory.value, memory.tag, memory.rw
-    // };
-

barretenberg/cpp/pil/vm2/scalar_mul.pil

@@ -81,14 +81,12 @@ namespace scalar_mul;
     // Point P in affine form
     pol commit point_x;
     pol commit point_y;
-    // TODO(#AVM-266): Remove infinity flags from point representation.
     pol commit point_inf; // @boolean
     point_inf * (1 - point_inf) = 0;
 
     // Point R = sP in affine form
     pol commit res_x;
     pol commit res_y;
-    // TODO(#AVM-266): Remove infinity flags from point representation.
     pol commit res_inf; // @boolean (constrained to be @boolean by lookup in the ecc subtrace)
 
     ///////////////////////////////
@@ -123,6 +121,7 @@ namespace scalar_mul;
     sel_not_end * (point_x - point_x') = 0;
     #[INPUT_CONSISTENCY_Y]
     sel_not_end * (point_y - point_y') = 0;
+    // TODO(MW): remove/rework below? only used at end
     #[INPUT_CONSISTENCY_INF]
     sel_not_end * (point_inf - point_inf') = 0;
     #[INPUT_CONSISTENCY_SCALAR]
@@ -175,7 +174,6 @@ namespace scalar_mul;
     end * (temp_y - point_y) = 0;
     end * (temp_inf - point_inf) = 0;
 
-    // TODO(MW): Remove result_infinity?
     #[DOUBLE]
     sel_not_end { temp_x, temp_y, temp_inf, temp_x', temp_y', temp_inf', sel_not_end /* = 1 */ }
     in
@@ -204,7 +202,6 @@ namespace scalar_mul;
     SHOULD_PASS * (res_y - res_y') = 0;
     SHOULD_PASS * (res_inf - res_inf') = 0;
 
-    // TODO(MW): Remove result_infinity?
     #[ADD]
     should_add { res_x, res_y, res_inf, res_x', res_y', res_inf', temp_x, temp_y, temp_inf }
     in

barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_address_derivation.hpp

@@ -332,7 +332,7 @@ using lookup_address_derivation_preaddress_scalar_mul_relation =
 struct lookup_address_derivation_address_ecadd_settings_ {
     static constexpr std::string_view NAME = "LOOKUP_ADDRESS_DERIVATION_ADDRESS_ECADD";
     static constexpr std::string_view RELATION_NAME = "address_derivation";
-    static constexpr size_t LOOKUP_TUPLE_SIZE = 9;
+    static constexpr size_t LOOKUP_TUPLE_SIZE = 8;
     static constexpr Column SRC_SELECTOR = Column::address_derivation_sel;
     static constexpr Column DST_SELECTOR = Column::ecc_sel;
     static constexpr Column COUNTS = Column::lookup_address_derivation_address_ecadd_counts;
@@ -345,13 +345,12 @@ struct lookup_address_derivation_address_ecadd_settings_ {
         ColumnAndShifts::address_derivation_incoming_viewing_key_y,
         ColumnAndShifts::precomputed_zero,
         ColumnAndShifts::address_derivation_address,
-        ColumnAndShifts::address_derivation_address_y,
-        ColumnAndShifts::precomputed_zero
+        ColumnAndShifts::address_derivation_address_y
     };
     static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = {
         ColumnAndShifts::ecc_p_x, ColumnAndShifts::ecc_p_y, ColumnAndShifts::ecc_p_is_inf,
         ColumnAndShifts::ecc_q_x, ColumnAndShifts::ecc_q_y, ColumnAndShifts::ecc_q_is_inf,
-        ColumnAndShifts::ecc_r_x, ColumnAndShifts::ecc_r_y, ColumnAndShifts::ecc_result_infinity
+        ColumnAndShifts::ecc_r_x, ColumnAndShifts::ecc_r_y
     };
 };
 

barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/ecc.cpp

@@ -112,19 +112,14 @@ void Ecc::add(MemoryInterface& memory,
     uint16_t space_id = memory.get_space_id();
 
     try {
-        // TODO(#AVM-266): Remove is_infinity flag from point representation.
-        // The resulting EmbeddedCurvePoint is a triple of (x, y, is_infinity).
-        // The x and y coordinates are stored at dst_address and dst_address + 1 respectively,
-        // and the is_infinity flag is stored at dst_address + 2.
-        // Therefore, the maximum address that needs to be written to is dst_address + 2.
-        uint64_t max_write_address = static_cast<uint64_t>(dst_address) + 2;
+        // The resulting EmbeddedCurvePoint is (x, y), stored at dst_address and dst_address + 1 respectively.
+        // Therefore, the maximum address that needs to be written to is dst_address + 1.
+        uint64_t max_write_address = static_cast<uint64_t>(dst_address) + 1;
         // Emits GreaterThanEvent, see #[CHECK_DST_ADDR_IN_RANGE] in ecc_mem.pil.
         if (gt.gt(max_write_address, AVM_HIGHEST_MEM_ADDRESS)) {
             throw InternalEccException("dst address out of range");
         }
 
-        // TODO(#AVM-266): Remove is_infinity flag from point representation. We assume here input
-        // points follow the Noir convention of (x=0, y=0) <==> is_infinity.
         if (!p.on_curve() || !q.on_curve()) {
             throw InternalEccException("One of the points is not on the curve");
         }