starknet_os: os resources test - add emit event

Author: dorimedini-starkware

crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants.cairo

@@ -105,8 +105,8 @@ const SYSCALL_BASE_GAS_COST = 10000;
 
 // Syscall gas costs.
 const CALL_CONTRACT_GAS_COST = 91160;
-const DEPLOY_GAS_COST = 151870;
-const DEPLOY_CALLDATA_FACTOR_GAS_COST = 4650;
+const DEPLOY_GAS_COST = 151670;
+const DEPLOY_CALLDATA_FACTOR_GAS_COST = 5050;
 const GET_BLOCK_HASH_GAS_COST = 10840;
 const GET_CLASS_HASH_AT_GAS_COST = 10000;
 const GET_EXECUTION_INFO_GAS_COST = 12640;

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,5 +1,5 @@
 {
-  "os": "0x62240ee2187ddc8c215c5b258f754c847961b5e4f376586457cbb0a6707d3d",
+  "os": "0x5b8231cecc8a39079e941218abfc486097369f888638f9675b1f04bb24af57",
   "virtual_os": "0x1689e4a3bb32dd81c66ee660a9ca05aad72309b38ba5cbac0ffec782e5b8154",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"

crates/blockifier/resources/blockifier_versioned_constants_0_14_3.json

@@ -247,23 +247,23 @@
             },
             "Deploy": {
                 "constant": {
-                    "n_steps": 1180,
+                    "n_steps": 1178,
                     "n_memory_holes": 0,
                     "builtin_instance_counter": {
                         "range_check_builtin": 21,
                         "pedersen_builtin": 8
                     }
                 },
                 "calldata_factor": {
-                    "n_steps": 6,
+                    "n_steps": 10,
                     "n_memory_holes": 0,
                     "builtin_instance_counter": {
                         "pedersen_builtin": 1
                     }
                 }
             },
             "EmitEvent": {
-                "n_steps": 61,
+                "n_steps": 47,
                 "n_memory_holes": 0,
                 "builtin_instance_counter": {
                     "range_check_builtin": 1

crates/blockifier_test_utils/resources/feature_contracts/cairo1/os_resources_test_contract.cairo

@@ -3,7 +3,9 @@
 mod OsResourcesTestContract {
     use starknet::class_hash::ClassHashZero;
     use starknet::info::SyscallResultTrait;
-    use starknet::syscalls::{call_contract_syscall, deploy_syscall, library_call_syscall};
+    use starknet::syscalls::{
+        call_contract_syscall, deploy_syscall, emit_event_syscall, library_call_syscall
+    };
     use starknet::{ClassHash, ContractAddress};
 
     const EMPTY_FUNCTION_SELECTOR: felt252 = selector!("empty_function");
@@ -81,6 +83,9 @@ mod OsResourcesTestContract {
         deploy_syscall(self_class_hash, 0, array![0].span(), false).unwrap_syscall();
         // deploy syscall: linear factor (calldata len = 1).
         deploy_syscall(self_class_hash, 0, array![1, 0].span(), false).unwrap_syscall();
+
+        // emit event syscall.
+        emit_event_syscall(array![5].span(), array![7].span()).unwrap_syscall();
     }
 
     // Target for call_contract and library_call — accepts no arguments.

crates/starknet_os_flow_tests/src/os_resources_test.rs

@@ -26,15 +26,14 @@ use starknet_types_core::felt::Felt;
 use strum::IntoEnumIterator;
 
 use crate::initial_state::create_default_initial_state_data;
-use crate::test_manager::{TestBuilder, TestBuilderConfig};
+use crate::test_manager::{EventPredicateExpectation, TestBuilder, TestBuilderConfig};
 use crate::tests::NON_TRIVIAL_RESOURCE_BOUNDS;
 use crate::utils::get_class_hash_of_feature_contract;
 
 // TODO(Dori): Delete this, or at least reduce it to a minimal set of unmeasurable syscalls.
-const UNMEASURABLE_SYSCALLS: [Selector; 31] = [
+const UNMEASURABLE_SYSCALLS: [Selector; 30] = [
     Selector::DelegateCall,
     Selector::DelegateL1Handler,
-    Selector::EmitEvent,
     Selector::GetBlockHash,
     Selector::GetBlockNumber,
     Selector::GetBlockTimestamp,
@@ -116,7 +115,19 @@ async fn test_os_resources_regression() {
         &test_builder.chain_id(),
     )
     .unwrap();
-    test_builder.add_invoke_tx(tx, None, None);
+    test_builder.add_invoke_tx(
+        tx,
+        None,
+        // Expect one event from the emit-event syscall measurement.
+        Some(vec![EventPredicateExpectation {
+            description: "emit event syscall".to_string(),
+            predicate: Box::new(move |event| {
+                event.from_address == os_resources_contract_address
+                    && event.content.keys[0].0 == Felt::from(5)
+                    && event.content.data.0[0] == Felt::from(7)
+            }),
+        }]),
+    );
 
     // Run test. Grab the execution info from the runner (for later) before consuming it.
     let test_runner = test_builder.build().await;
@@ -138,7 +149,19 @@ async fn test_os_resources_regression() {
     test_output.perform_default_validations();
 
     // Extract syscall resources consumed, per (measurable) syscall.
-    let syscall_traces = test_output.runner_output.txs_trace.last().unwrap().get_syscalls();
+    // There should be two events emitted: the first is the syscall we are measuring, and the second
+    // is the last syscall in the tx, emitted from the fee transfer. Pop the second event.
+    let mut syscall_traces =
+        test_output.runner_output.txs_trace.last().unwrap().get_syscalls().clone();
+    assert!(!UNMEASURABLE_SYSCALLS.contains(&Selector::EmitEvent));
+    assert_eq!(
+        syscall_traces
+            .iter()
+            .filter(|syscall_trace| syscall_trace.get_selector() == Selector::EmitEvent)
+            .count(),
+        2
+    );
+    assert_eq!(syscall_traces.pop().unwrap().get_selector(), Selector::EmitEvent);
 
     // Measure each syscall overhead. If the syscall incurs an inner call, subtract the inner call
     // overhead.