feat: merge-train/avm

barretenberg/cpp/pil/vm2/data_copy.pil

@@ -286,7 +286,7 @@ namespace data_copy;
     // Preconditions to `gt` gadget require both inputs to be bounded by 2^128.
     // `read_addr_upper_bound` = src_addr + read_index_upper_bound (former is U32, latter is < 2^33, so < 2^34).
     // `mem_size` = AVM_MEMORY_SIZE = 2^32.
-    // Note that for a top-level call, src_addr == 0 (enforced in context.pil (#[CD_OFFSET_ENQUEUED_CALL_IS_ZERO]))
+    // Note that for a top-level call, src_addr == 0 (enforced in context.pil (#[CD_ADDR_ENQUEUED_CALL_IS_ZERO]))
     // and src_reads_exceed_mem == 0.
     #[CHECK_SRC_ADDR_IN_RANGE]
     sel_start { read_addr_upper_bound, mem_size, src_reads_exceed_mem }

barretenberg/cpp/pil/vm2/execution/gas.pil

@@ -75,7 +75,7 @@ namespace execution;
     // BASE_L2_GAS < 2^17
     // dynamic_l2_gas_factor < 2^32 (for public logs and to_radix, 32-bit register)
     // dynamic_l2_gas < 2^16
-    // Then total_gas_l2 = prev_l2_gas_used + BASE_L2_GAS + dynamic_l2_gas_factor * dynamic_da_gas < 2^49
+    // Then total_gas_l2 = prev_l2_gas_used + BASE_L2_GAS + dynamic_l2_gas * dynamic_l2_gas_factor < 2^49
     // l2_gas_limit is 32 bits (see at the top of this file).
     #[IS_OUT_OF_GAS_L2]
     sel_should_check_gas { total_gas_l2, l2_gas_limit, out_of_gas_l2 } in gt.sel_gas { gt.input_a, gt.input_b, gt.res };