@@ -49,7 +49,7 @@ include "opcodes/emit_notehash.pil";
4949include "opcodes/l1_to_l2_message_exists.pil";
5050include "opcodes/nullifier_exists.pil";
5151include "opcodes/emit_nullifier.pil";
52- include "opcodes/emit_unencrypted_log .pil";
52+ include "opcodes/emit_public_log .pil";
5353include "opcodes/send_l2_to_l1_msg.pil";
5454
5555/**
@@ -430,23 +430,23 @@ pol commit sel_gas_calldata_copy; // @boolean
430430pol commit sel_gas_returndata_copy; // @boolean
431431pol commit sel_gas_to_radix; // @boolean
432432pol commit sel_gas_bitwise; // @boolean
433- pol commit sel_gas_emit_unencrypted_log ; // @boolean
433+ pol commit sel_gas_emit_public_log ; // @boolean
434434pol commit sel_gas_sstore; // @boolean
435435
436436// Bolean constraints
437437sel_gas_calldata_copy * (1 - sel_gas_calldata_copy) = 0;
438438sel_gas_returndata_copy * (1 - sel_gas_returndata_copy) = 0;
439439sel_gas_to_radix * (1 - sel_gas_to_radix) = 0;
440440sel_gas_bitwise * (1 - sel_gas_bitwise) = 0;
441- sel_gas_emit_unencrypted_log * (1 - sel_gas_emit_unencrypted_log ) = 0;
441+ sel_gas_emit_public_log * (1 - sel_gas_emit_public_log ) = 0;
442442sel_gas_sstore * (1 - sel_gas_sstore) = 0;
443443
444444#[DYN_GAS_ID_DECOMPOSITION]
445445sel_gas_calldata_copy * constants.AVM_DYN_GAS_ID_CALLDATACOPY +
446446sel_gas_returndata_copy * constants.AVM_DYN_GAS_ID_RETURNDATACOPY +
447447sel_gas_to_radix * constants.AVM_DYN_GAS_ID_TORADIX +
448448sel_gas_bitwise * constants.AVM_DYN_GAS_ID_BITWISE +
449- sel_gas_emit_unencrypted_log * constants.AVM_DYN_GAS_ID_EMITUNENCRYPTEDLOG +
449+ sel_gas_emit_public_log * constants.AVM_DYN_GAS_ID_EMITPUBLICLOG +
450450sel_gas_sstore * constants.AVM_DYN_GAS_ID_SSTORE
451451 // We force the selectors to be 0 if we failed before gas checks
452452 // or when we are not in the execution subtrace.
@@ -535,26 +535,26 @@ sel_gas_sstore {
535535};
536536
537537///////////////////////////////////////////////////////////////////////////////
538- // EMITUNENCRYPTEDLOG , CALLDATACOPY, RETURNDATACOPY, Dynamic Gas Calculation
538+ // EMITPUBLICLOG , CALLDATACOPY, RETURNDATACOPY, Dynamic Gas Calculation
539539///////////////////////////////////////////////////////////////////////////////
540540
541541// #[DYN_GAS_ID_DECOMPOSITION] ensures that the gas selectors are mutually exclusive.
542- // register[0] is the log size for emit_unencrypted_log , the calldata/returndata size for call_data_copy/returndata_copy.
543- (sel_gas_emit_unencrypted_log + sel_gas_calldata_copy + sel_gas_returndata_copy) * (register[0] - dynamic_l2_gas_factor) = 0;
542+ // register[0] is the log size for emit_public_log , the calldata/returndata size for call_data_copy/returndata_copy.
543+ (sel_gas_emit_public_log + sel_gas_calldata_copy + sel_gas_returndata_copy) * (register[0] - dynamic_l2_gas_factor) = 0;
544544
545- sel_gas_emit_unencrypted_log * (/*log_size=*/ register[0] - dynamic_da_gas_factor) = 0;
545+ sel_gas_emit_public_log * (/*log_size=*/ register[0] - dynamic_da_gas_factor) = 0;
546546
547547///////////////////////////////////////////////////////////////////////////////
548548// Dynamic L2/DA Gas Calculation is ZERO for all other cases
549549///////////////////////////////////////////////////////////////////////////////
550550
551- // Except SSTORE, EMITUNENCRYPTEDLOG , all opcodes have a zero dynamic da gas.
551+ // Except SSTORE, EMITPUBLICLOG , all opcodes have a zero dynamic da gas.
552552#[DYN_DA_GAS_IS_ZERO]
553- (1 - sel_gas_sstore - sel_gas_emit_unencrypted_log ) * dynamic_da_gas_factor = 0;
553+ (1 - sel_gas_sstore - sel_gas_emit_public_log ) * dynamic_da_gas_factor = 0;
554554
555- // Except BITWISE, TORADIX, EMITUNENCRYPTEDLOG , CALLDATACOPY, RETURNDATACOPY, all opcodes have a zero dynamic l2 gas.
555+ // Except BITWISE, TORADIX, EMITPUBLICLOG , CALLDATACOPY, RETURNDATACOPY, all opcodes have a zero dynamic l2 gas.
556556#[DYN_L2_GAS_IS_ZERO]
557- (1 - sel_gas_bitwise - sel_gas_to_radix - sel_gas_emit_unencrypted_log - sel_gas_calldata_copy - sel_gas_returndata_copy) * dynamic_l2_gas_factor = 0;
557+ (1 - sel_gas_bitwise - sel_gas_to_radix - sel_gas_emit_public_log - sel_gas_calldata_copy - sel_gas_returndata_copy) * dynamic_l2_gas_factor = 0;
558558
559559/**************************************************************************************************
560560 * Temporality group 5: Opcode execution
@@ -582,7 +582,7 @@ pol commit sel_exec_dispatch_calldata_copy; // @boolean
582582pol commit sel_exec_dispatch_returndata_copy; // @boolean
583583pol commit sel_exec_dispatch_set; // @boolean
584584pol commit sel_exec_dispatch_get_contract_instance; // @boolean
585- pol commit sel_exec_dispatch_emit_unencrypted_log ; // @boolean
585+ pol commit sel_exec_dispatch_emit_public_log ; // @boolean
586586pol commit sel_exec_dispatch_poseidon2_perm; // @boolean
587587pol commit sel_exec_dispatch_sha256_compression; // @boolean
588588pol commit sel_exec_dispatch_keccakf1600; // @boolean
@@ -598,7 +598,7 @@ sel_exec_dispatch_calldata_copy * (1 - sel_exec_dispatch_calldata_copy) = 0;
598598sel_exec_dispatch_returndata_copy * (1 - sel_exec_dispatch_returndata_copy) = 0;
599599sel_exec_dispatch_set * (1 - sel_exec_dispatch_set) = 0;
600600sel_exec_dispatch_get_contract_instance * (1 - sel_exec_dispatch_get_contract_instance) = 0;
601- sel_exec_dispatch_emit_unencrypted_log * (1 - sel_exec_dispatch_emit_unencrypted_log ) = 0;
601+ sel_exec_dispatch_emit_public_log * (1 - sel_exec_dispatch_emit_public_log ) = 0;
602602sel_exec_dispatch_poseidon2_perm * (1 - sel_exec_dispatch_poseidon2_perm) = 0;
603603sel_exec_dispatch_sha256_compression * (1 - sel_exec_dispatch_sha256_compression) = 0;
604604sel_exec_dispatch_keccakf1600 * (1 - sel_exec_dispatch_keccakf1600) = 0;
@@ -615,7 +615,7 @@ sel_exec_dispatch_calldata_copy * constants.AVM_SUBTRACE_ID_CALLDATA_COPY +
615615sel_exec_dispatch_returndata_copy * constants.AVM_SUBTRACE_ID_RETURNDATA_COPY +
616616sel_exec_dispatch_set * constants.AVM_SUBTRACE_ID_SET +
617617sel_exec_dispatch_get_contract_instance * constants.AVM_SUBTRACE_ID_GETCONTRACTINSTANCE +
618- sel_exec_dispatch_emit_unencrypted_log * constants.AVM_SUBTRACE_ID_EMITUNENCRYPTEDLOG +
618+ sel_exec_dispatch_emit_public_log * constants.AVM_SUBTRACE_ID_EMITPUBLICLOG +
619619sel_exec_dispatch_poseidon2_perm * constants.AVM_SUBTRACE_ID_POSEIDON2_PERM +
620620sel_exec_dispatch_sha256_compression * constants.AVM_SUBTRACE_ID_SHA256_COMPRESSION +
621621sel_exec_dispatch_keccakf1600 * constants.AVM_SUBTRACE_ID_KECCAKF1600 +
@@ -765,8 +765,8 @@ sel_execute_returndata_size * (mem_tag_reg[0] - constants.MEM_TAG_U32) = 0; // W
765765(1 - sel_execute_emit_nullifier) * (prev_nullifier_tree_size - nullifier_tree_size) = 0;
766766#[NUM_NULLIFIERS_EMITTED_NOT_CHANGED]
767767(1 - sel_execute_emit_nullifier) * (prev_num_nullifiers_emitted - num_nullifiers_emitted) = 0;
768- #[NUM_UNENCRYPTED_LOGS_NOT_CHANGED ]
769- (1 - sel_exec_dispatch_emit_unencrypted_log ) * (prev_num_unencrypted_log_fields - num_unencrypted_log_fields ) = 0;
768+ #[NUM_PUBLIC_LOGS_NOT_CHANGED ]
769+ (1 - sel_exec_dispatch_emit_public_log ) * (prev_num_public_log_fields - num_public_log_fields ) = 0;
770770#[NUM_L2_TO_L1_MESSAGES_NOT_CHANGED]
771771(1 - sel_execute_send_l2_to_l1_msg) * (prev_num_l2_to_l1_messages - num_l2_to_l1_messages) = 0;
772772// Retrieved bytecodes tree state can only change in the first row of a new context
@@ -808,7 +808,7 @@ sel_opcode_error * (1 - sel_opcode_error) = 0;
808808 // - RETURNDATA_COPY: #[DISPATCH_TO_RD_COPY]
809809 // - SET: #[DISPATCH_TO_SET]
810810 // - GET_CONTRACT_INSTANCE: #[DISPATCH_TO_GET_CONTRACT_INSTANCE]
811- // - EMIT_UNENCRYPTED_LOG : #[DISPATCH_TO_EMIT_UNENCRYPTED_LOG ]
811+ // - EMIT_PUBLIC_LOG : #[DISPATCH_TO_EMIT_PUBLIC_LOG ]
812812 // - POSEIDON2_PERM: #[DISPATCH_TO_POSEIDON2_PERM]
813813 // - SHA256_COMPRESSION: #[DISPATCH_TO_SHA256_COMPRESSION]
814814 // - KECCAKF1600: #[DISPATCH_TO_KECCAKF1600]
@@ -996,8 +996,8 @@ sel_exec_dispatch_get_contract_instance {
996996 get_contract_instance.sel_error
997997};
998998
999- #[DISPATCH_TO_EMIT_UNENCRYPTED_LOG ]
1000- sel_exec_dispatch_emit_unencrypted_log {
999+ #[DISPATCH_TO_EMIT_PUBLIC_LOG ]
1000+ sel_exec_dispatch_emit_public_log {
10011001 clk,
10021002 context_id,
10031003 // Message offset
@@ -1006,23 +1006,23 @@ sel_exec_dispatch_emit_unencrypted_log {
10061006 register[0],
10071007 contract_address,
10081008 // Context
1009- prev_num_unencrypted_log_fields ,
1010- num_unencrypted_log_fields ,
1009+ prev_num_public_log_fields ,
1010+ num_public_log_fields ,
10111011 is_static,
10121012 // Error
10131013 sel_opcode_error,
10141014 discard
1015- } is emit_unencrypted_log .start {
1016- emit_unencrypted_log .execution_clk,
1017- emit_unencrypted_log .space_id,
1018- emit_unencrypted_log .log_address,
1019- emit_unencrypted_log .log_size,
1020- emit_unencrypted_log .contract_address,
1021- emit_unencrypted_log.prev_num_unencrypted_log_fields ,
1022- emit_unencrypted_log.next_num_unencrypted_log_fields ,
1023- emit_unencrypted_log .is_static,
1024- emit_unencrypted_log .error,
1025- emit_unencrypted_log .discard
1015+ } is emit_public_log .start {
1016+ emit_public_log .execution_clk,
1017+ emit_public_log .space_id,
1018+ emit_public_log .log_address,
1019+ emit_public_log .log_size,
1020+ emit_public_log .contract_address,
1021+ emit_public_log.prev_num_public_log_fields ,
1022+ emit_public_log.next_num_public_log_fields ,
1023+ emit_public_log .is_static,
1024+ emit_public_log .error,
1025+ emit_public_log .discard
10261026};
10271027
10281028#[DISPATCH_TO_POSEIDON2_PERM]
0 commit comments