From 6b0db2ea98a056ac711947da0afc4d713e1541aa Mon Sep 17 00:00:00 2001 From: maramihali Date: Wed, 31 Jan 2024 16:34:15 +0000 Subject: [PATCH] index on mm/pg-folding-goblin: 8928fb1f4 docs(yp): AVM circuit - user memory section (#4323) --- .../src/barretenberg/flavor/goblin_ultra.hpp | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp index ed247351c52..955857962ca 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp @@ -246,6 +246,7 @@ class GoblinUltra { }; RefVector get_witness() { return WitnessEntities::get_all(); }; + RefVector get_to_be_shifted() { return { this->table_1, this->table_2, this->table_3, this->table_4, this->w_l, this->w_r, @@ -380,36 +381,35 @@ class GoblinUltra { calldata_read_counts = "CALLDATA_READ_COUNTS"; lookup_inverses = "LOOKUP_INVERSES"; - // The ones beginning with "__" are only used for debugging - q_c = "__Q_C"; - q_l = "__Q_L"; - q_r = "__Q_R"; - q_o = "__Q_O"; - q_4 = "__Q_4"; - q_m = "__Q_M"; - q_arith = "__Q_ARITH"; - q_sort = "__Q_SORT"; - q_elliptic = "__Q_ELLIPTIC"; - q_aux = "__Q_AUX"; - q_lookup = "__Q_LOOKUP"; - q_busread = "__Q_BUSREAD"; - q_poseidon2_external = "__Q_POSEIDON2_EXTERNAL"; - q_poseidon2_internal = "__Q_POSEIDON2_INTERNAL"; - sigma_1 = "__SIGMA_1"; - sigma_2 = "__SIGMA_2"; - sigma_3 = "__SIGMA_3"; - sigma_4 = "__SIGMA_4"; - id_1 = "__ID_1"; - id_2 = "__ID_2"; - id_3 = "__ID_3"; - id_4 = "__ID_4"; - table_1 = "__TABLE_1"; - table_2 = "__TABLE_2"; - table_3 = "__TABLE_3"; - table_4 = "__TABLE_4"; - lagrange_first = "__LAGRANGE_FIRST"; - lagrange_last = "__LAGRANGE_LAST"; - lagrange_ecc_op = "__Q_ECC_OP_QUEUE"; + q_c = "Q_C"; + q_l = "Q_L"; + q_r = "Q_R"; + q_o = "Q_O"; + q_4 = "Q_4"; + q_m = "Q_M"; + q_arith = "Q_ARITH"; + q_sort = "Q_SORT"; + q_elliptic = "Q_ELLIPTIC"; + q_aux = "Q_AUX"; + q_lookup = "Q_LOOKUP"; + q_busread = "Q_BUSREAD"; + q_poseidon2_external = "Q_POSEIDON2_EXTERNAL"; + q_poseidon2_internal = "Q_POSEIDON2_INTERNAL"; + sigma_1 = "SIGMA_1"; + sigma_2 = "SIGMA_2"; + sigma_3 = "SIGMA_3"; + sigma_4 = "SIGMA_4"; + id_1 = "ID_1"; + id_2 = "ID_2"; + id_3 = "ID_3"; + id_4 = "ID_4"; + table_1 = "TABLE_1"; + table_2 = "TABLE_2"; + table_3 = "TABLE_3"; + table_4 = "TABLE_4"; + lagrange_first = "LAGRANGE_FIRST"; + lagrange_last = "LAGRANGE_LAST"; + lagrange_ecc_op = "Q_ECC_OP_QUEUE"; }; }; @@ -458,15 +458,16 @@ class GoblinUltra { this->w_l = commitments.w_l; this->w_r = commitments.w_r; this->w_o = commitments.w_o; - this->sorted_accum = commitments.sorted_accum; this->w_4 = commitments.w_4; + this->sorted_accum = commitments.sorted_accum; this->z_perm = commitments.z_perm; this->z_lookup = commitments.z_lookup; this->ecc_op_wire_1 = commitments.ecc_op_wire_1; this->ecc_op_wire_2 = commitments.ecc_op_wire_2; this->ecc_op_wire_3 = commitments.ecc_op_wire_3; + this->ecc_op_wire_4 = commitments.ecc_op_wire_4; this->calldata = commitments.calldata; - this->calldata = commitments.calldata_read_counts; + this->calldata_read_counts = commitments.calldata_read_counts; this->lookup_inverses = commitments.lookup_inverses; } }