Merge branch 'next' into merge-train/spartan

Author: AztecBot

avm-transpiler/src/transpile.rs

@@ -718,13 +718,13 @@ fn handle_emit_unencrypted_log(
         // The message array from Brillig is indirect.
         indirect: Some(
             AddressingModeBuilder::default()
-                .indirect_operand(&message_offset)
                 .direct_operand(&message_size_offset)
+                .indirect_operand(&message_offset)
                 .build(),
         ),
         operands: vec![
-            AvmOperand::U16 { value: message_offset.to_usize() as u16 },
             AvmOperand::U16 { value: message_size_offset.to_usize() as u16 },
+            AvmOperand::U16 { value: message_offset.to_usize() as u16 },
         ],
         ..Default::default()
     });

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -13,7 +13,6 @@ namespace constants;
     pol MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 64;
     pol MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 63;
     pol MAX_L2_TO_L1_MSGS_PER_TX = 8;
-    pol MAX_PUBLIC_LOGS_PER_TX = 8;
     pol MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000;
     pol CANONICAL_AUTH_REGISTRY_ADDRESS = 1;
     pol CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
@@ -24,7 +23,10 @@ namespace constants;
     pol MAX_PROTOCOL_CONTRACT_ADDRESS = 6;
     pol FEE_JUICE_BALANCES_SLOT = 1;
     pol UPDATED_CLASS_IDS_SLOT = 1;
-    pol PUBLIC_LOG_SIZE_IN_FIELDS = 13;
+    pol FLAT_PUBLIC_LOGS_HEADER_LENGTH = 1;
+    pol FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH = 4096;
+    pol PUBLIC_LOGS_LENGTH = 4097;
+    pol PUBLIC_LOG_HEADER_LENGTH = 2;
     pol MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS = 21;
     pol MEM_TAG_FF = 0;
     pol MEM_TAG_U1 = 1;
@@ -135,19 +137,18 @@ namespace constants;
     pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_NOTE_HASHES_ROW_IDX = 371;
     pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_NULLIFIERS_ROW_IDX = 372;
     pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_L2_TO_L1_MSGS_ROW_IDX = 373;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_PUBLIC_LOGS_ROW_IDX = 374;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_PUBLIC_DATA_WRITES_ROW_IDX = 375;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ROW_IDX = 376;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX = 376;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX = 440;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX = 504;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_PUBLIC_LOGS_ROW_IDX = 512;
-    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_PUBLIC_DATA_WRITES_ROW_IDX = 616;
-    pol AVM_PUBLIC_INPUTS_TRANSACTION_FEE_ROW_IDX = 680;
-    pol AVM_PUBLIC_INPUTS_REVERTED_ROW_IDX = 681;
-    pol AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH = 682;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ARRAY_LENGTHS_PUBLIC_DATA_WRITES_ROW_IDX = 374;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_ROW_IDX = 375;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX = 375;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX = 439;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX = 503;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_PUBLIC_LOGS_ROW_IDX = 511;
+    pol AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_PUBLIC_DATA_WRITES_ROW_IDX = 4608;
+    pol AVM_PUBLIC_INPUTS_TRANSACTION_FEE_ROW_IDX = 4672;
+    pol AVM_PUBLIC_INPUTS_REVERTED_ROW_IDX = 4673;
+    pol AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH = 4674;
     pol AVM_NUM_PUBLIC_INPUT_COLUMNS = 4;
-    pol AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH = 2728;
+    pol AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH = 18696;
     pol AVM_PC_SIZE_IN_BITS = 32;
     pol AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_HEIGHT = 6;
     pol AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT = 18291678969210913367302010540259942201271604198321103848479209155223586227821;

barretenberg/cpp/pil/vm2/context.pil

@@ -105,11 +105,11 @@ namespace execution;
     pol commit retrieved_bytecodes_tree_size;
 
     // Prev side effects state
-    pol commit prev_num_unencrypted_logs;
+    pol commit prev_num_unencrypted_log_fields;
     pol commit prev_num_l2_to_l1_messages;
 
     // Next side effects state
-    pol commit num_unencrypted_logs;
+    pol commit num_unencrypted_log_fields;
     pol commit num_l2_to_l1_messages;
 
     // ==== Helper columns ====
@@ -347,7 +347,7 @@ namespace execution;
         written_public_data_slots_tree_root,
         written_public_data_slots_tree_size,
         // Retrieved bytecodes tree is not commited and restored, since it's a tx global state.
-        num_unencrypted_logs,
+        num_unencrypted_log_fields,
         num_l2_to_l1_messages
     } in
     context_stack.sel {
@@ -375,7 +375,7 @@ namespace execution;
         context_stack.public_data_tree_size,
         context_stack.written_public_data_slots_tree_root,
         context_stack.written_public_data_slots_tree_size,
-        context_stack.num_unencrypted_logs,
+        context_stack.num_unencrypted_log_fields,
         context_stack.num_l2_to_l1_messages
     };
 
@@ -412,7 +412,7 @@ namespace execution;
         prev_public_data_tree_size',
         prev_written_public_data_slots_tree_root',
         prev_written_public_data_slots_tree_size',
-        prev_num_unencrypted_logs',
+        prev_num_unencrypted_log_fields',
         prev_num_l2_to_l1_messages'
     } in
     context_stack.sel {
@@ -440,7 +440,7 @@ namespace execution;
         context_stack.public_data_tree_size,
         context_stack.written_public_data_slots_tree_root,
         context_stack.written_public_data_slots_tree_size,
-        context_stack.num_unencrypted_logs,
+        context_stack.num_unencrypted_log_fields,
         context_stack.num_l2_to_l1_messages
     };
 
@@ -532,6 +532,6 @@ namespace execution;
     NOT_LAST_EXEC * (l1_l2_tree_root - l1_l2_tree_root') = 0;
 
     #[NUM_UNENCRYPTED_LOGS_CONTINUITY]
-    NOT_LAST_EXEC * DEFAULT_OR_NESTED_RETURN * (num_unencrypted_logs - prev_num_unencrypted_logs') = 0;
+    NOT_LAST_EXEC * DEFAULT_OR_NESTED_RETURN * (num_unencrypted_log_fields - prev_num_unencrypted_log_fields') = 0;
     #[NUM_L2_TO_L1_MESSAGES_CONTINUITY]
     NOT_LAST_EXEC * DEFAULT_OR_NESTED_RETURN * (num_l2_to_l1_messages - prev_num_l2_to_l1_messages') = 0;

barretenberg/cpp/pil/vm2/context_stack.pil

@@ -44,5 +44,5 @@ namespace context_stack;
     pol commit written_public_data_slots_tree_size;
 
     // Side effects state
-    pol commit num_unencrypted_logs;
+    pol commit num_unencrypted_log_fields;
     pol commit num_l2_to_l1_messages;

barretenberg/cpp/pil/vm2/execution.pil

@@ -387,8 +387,8 @@ sel_gas_sstore {
 #[SSTORE_DYN_L2_GAS_IS_ZERO]
 sel_execute_sstore * dynamic_l2_gas_factor = 0;
 
-sel_gas_emit_unencrypted_log * dynamic_l2_gas_factor = 0;
-sel_gas_emit_unencrypted_log * (/*log_size=*/ register[1] - dynamic_da_gas_factor) = 0;
+sel_gas_emit_unencrypted_log * (/*log_size=*/ register[0] - dynamic_l2_gas_factor) = 0;
+sel_gas_emit_unencrypted_log * (/*log_size=*/ register[0] - dynamic_da_gas_factor) = 0;
 
 /**************************************************************************************************
  *  Temporality group 5: Opcode execution
@@ -647,7 +647,7 @@ sel * (1 - sel_execute_emit_nullifier) * (prev_nullifier_tree_size - nullifier_t
 #[NUM_NULLIFIERS_EMITTED_NOT_CHANGED]
 sel * (1 - sel_execute_emit_nullifier) * (prev_num_nullifiers_emitted - num_nullifiers_emitted) = 0;
 #[NUM_UNENCRYPTED_LOGS_NOT_CHANGED]
-sel * (1 - sel_execute_emit_unencrypted_log) * (prev_num_unencrypted_logs - num_unencrypted_logs) = 0;
+sel * (1 - sel_execute_emit_unencrypted_log) * (prev_num_unencrypted_log_fields - num_unencrypted_log_fields) = 0;
 #[NUM_L2_TO_L1_MESSAGES_NOT_CHANGED]
 sel * (1 - sel_execute_send_l2_to_l1_msg) * (prev_num_l2_to_l1_messages - num_l2_to_l1_messages) = 0;
 // Retrieved bytecodes tree state can only change in the first row of a new context