Rebase on master

AztecProtocol · Oct 25, 2024 · ee99b0d · ee99b0d
1 parent 0588d7c
commit ee99b0d
Show file tree

Hide file tree

Showing 5 changed files with 572 additions and 12 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm_recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm_recursion_constraint.cpp
@@ -51,9 +51,10 @@ void create_dummy_vkey_and_proof(Builder& builder,
 
     // Derivation of circuit size based on the proof
     // Here, we should always get CONST_PROOF_SIZE_LOG_N.
-    auto log_circuit_size = (proof_size - Flavor::NUM_WITNESS_ENTITIES * Flavor::NUM_FRS_COM -
-                             (Flavor::NUM_ALL_ENTITIES + 1) * Flavor::NUM_FRS_FR - Flavor::NUM_FRS_COM) /
-                            (Flavor::NUM_FRS_COM + Flavor::NUM_FRS_FR * (Flavor::BATCHED_RELATION_PARTIAL_LENGTH + 1));
+    const auto log_circuit_size =
+        (proof_size - Flavor::NUM_WITNESS_ENTITIES * Flavor::NUM_FRS_COM -
+         (Flavor::NUM_ALL_ENTITIES + 1) * Flavor::NUM_FRS_FR - Flavor::NUM_FRS_COM) /
+        (Flavor::NUM_FRS_COM + Flavor::NUM_FRS_FR * (Flavor::BATCHED_RELATION_PARTIAL_LENGTH + 1));
 
     /***************************************************************************
      *                  Construct Dummy Verification Key

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp
@@ -70,9 +70,9 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co
                     col_size = num_rows;
                 } else {
                     // We process each column from bottom and stops as soon as we encounter a non-zero entry.
-                    for (size_t j = num_rows; j > 0; --j) {
-                        if (!rows[j - 1].as_vector()[col_idx].is_zero()) {
-                            col_size = j;
+                    for (size_t j = 0; j < num_rows; j++) {
+                        if (!rows[num_rows - j - 1].as_vector()[col_idx].is_zero()) {
+                            col_size = num_rows - j;
                             break;
                         }
                     }