Improve rename copy constraints

Author: akokoshn

bin/assigner/src/main.cpp

@@ -78,7 +78,7 @@ void print_hex_byteblob(std::ostream &os, TIter iter_begin, TIter iter_end, bool
 template<typename Endianness, typename ArithmetizationType, typename ConstraintSystemType>
 void print_circuit(const circuit_proxy<ArithmetizationType> &circuit_proxy,
                    const assignment_proxy<ArithmetizationType> &table_proxy,
-                   bool rename_required, std::ostream &out = std::cout) {
+                   std::ostream &out = std::cout) {
     using TTypeBase = nil::marshalling::field_type<Endianness>;
     using plonk_constraint_system = nil::marshalling::types::bundle<
         TTypeBase, std::tuple<
@@ -102,31 +102,28 @@ void print_circuit(const circuit_proxy<ArithmetizationType> &circuit_proxy,
     const auto& copy_constraints = circuit_proxy.copy_constraints();
     typename ConstraintSystemType::copy_constraints_container_type used_copy_constraints;
     const auto& used_copy_constraints_idx = circuit_proxy.get_used_copy_constraints();
-    for (const auto &it : used_copy_constraints_idx) {
-        used_copy_constraints.push_back(copy_constraints[it]);
-    }
-
-    if (rename_required) {
-        const auto& used_rows = table_proxy.get_used_rows();
-        std::uint32_t local_row = 0;
-        for (const auto &row : used_rows) {
-            for (auto &constraint : used_copy_constraints) {
-                const auto first_var = constraint.first;
-                const auto second_var = constraint.second;
-                if ((first_var.type == variable_type::column_type::witness ||
-                     first_var.type == variable_type::column_type::constant) &&
-                    first_var.rotation == row) {
-                    constraint.first = variable_type(first_var.index, local_row, first_var.relative,
-                                                     first_var.type);
-                }
-                if ((second_var.type == variable_type::column_type::witness ||
-                     second_var.type == variable_type::column_type::constant) &&
-                    second_var.rotation == row) {
-                    constraint.second = variable_type(second_var.index, local_row,
-                                                      second_var.relative, second_var.type);
-                }
+    if (circuit_proxy.get_id() > 0) {
+        const auto start_row = table_proxy.get_start_row();
+        for (const auto &it : used_copy_constraints_idx) {
+            auto first_var = copy_constraints[it].first;
+            auto second_var = copy_constraints[it].second;
+            if (first_var.type == variable_type::column_type::witness ||
+                first_var.type == variable_type::column_type::constant) {
+                ASSERT(first_var.rotation >= start_row);
+                first_var =
+                    variable_type(first_var.index, first_var.rotation - start_row, first_var.relative, first_var.type);
+            }
+            if (second_var.type == variable_type::column_type::witness ||
+                second_var.type == variable_type::column_type::constant) {
+                ASSERT(second_var.rotation >= start_row);
+                second_var = variable_type(second_var.index, second_var.rotation - start_row, second_var.relative,
+                                           second_var.type);
             }
-            local_row++;
+            used_copy_constraints.push_back({first_var, second_var});
+        }
+    } else {
+        for (const auto &it : used_copy_constraints_idx) {
+            used_copy_constraints.push_back(copy_constraints[it]);
         }
     }
 
@@ -514,7 +511,7 @@ int curve_dependent_main(std::string bytecode_file_name,
         }
 
         print_circuit<nil::marshalling::option::big_endian, ArithmetizationType, ConstraintSystemType>(
-            parser_instance.circuits[0], parser_instance.assignments[0], false, ocircuit);
+            parser_instance.circuits[0], parser_instance.assignments[0], ocircuit);
         ocircuit.close();
     } else if (parser_instance.assignments.size() > 1) {
         for (std::uint32_t idx = 0; idx < parser_instance.assignments.size(); idx++) {
@@ -543,7 +540,7 @@ int curve_dependent_main(std::string bytecode_file_name,
 
             ASSERT_MSG(idx < parser_instance.circuits.size(), "Not found circuit");
             print_circuit<nil::marshalling::option::big_endian, ArithmetizationType, ConstraintSystemType>(
-                parser_instance.circuits[idx], parser_instance.assignments[idx], (idx > 0), ocircuit);
+                parser_instance.circuits[idx], parser_instance.assignments[idx], ocircuit);
 
             ocircuit.close();
         }