starknet_os: os resources test - add send_message_to_l1

Author: dorimedini-starkware

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

@@ -72,7 +72,7 @@ const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1 = (
     0x06ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2
 );
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2 = (
-    0x066a46bb88553c4dafd12959575033660780d689c99659ab3620e2f524f71701
+    0x0471dd673f38125ba94e98145e3579d700ad13bd0e177687b67bab6221da4fa0
 );
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 3;
 
@@ -119,7 +119,7 @@ const REPLACE_CLASS_GAS_COST = 10000;
 const STORAGE_READ_GAS_COST = 24070;
 const STORAGE_WRITE_GAS_COST = 59970;
 const EMIT_EVENT_GAS_COST = 10000;
-const SEND_MESSAGE_TO_L1_GAS_COST = 14470;
+const SEND_MESSAGE_TO_L1_GAS_COST = 12470;
 const META_TX_V0_GAS_COST = 187350;
 const META_TX_V0_CALLDATA_FACTOR_GAS_COST = 4850;
 

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,6 +1,6 @@
 {
-  "os": "0x3ab760e55c8e6396b6b37f16076c9038ef6750bcebed93827b884194940fd53",
-  "virtual_os": "0x66a46bb88553c4dafd12959575033660780d689c99659ab3620e2f524f71701",
+  "os": "0x10e22135c2f216368f35ec35bdc6a9a6d2e448a1919147886ab0ddb2c0435c",
+  "virtual_os": "0x471dd673f38125ba94e98145e3579d700ad13bd0e177687b67bab6221da4fa0",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"
 }

crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json

@@ -128,7 +128,7 @@
         "allowed_virtual_os_program_hashes": [
             "0x3e98c2d7703b03a7edb73ed7f075f97f1dcbaa8f717cdf6e1a57bf058265473",
             "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
-            "0x66a46bb88553c4dafd12959575033660780d689c99659ab3620e2f524f71701"
+            "0x471dd673f38125ba94e98145e3579d700ad13bd0e177687b67bab6221da4fa0"
         ],
         "constructor_entry_point_selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194",
         "default_entry_point_selector": "0x0",
@@ -454,7 +454,7 @@
                 }
             },
             "SendMessageToL1": {
-                "n_steps": 144,
+                "n_steps": 124,
                 "n_memory_holes": 0,
                 "builtin_instance_counter": {
                     "range_check_builtin": 1

crates/blockifier/resources/versioned_constants_diff_regression/0.14.3_0.14.4.txt

@@ -1,4 +1,4 @@
-+ /os_constants/allowed_virtual_os_program_hashes/2: "0x66a46bb88553c4dafd12959575033660780d689c99659ab3620e2f524f71701"
++ /os_constants/allowed_virtual_os_program_hashes/2: "0x471dd673f38125ba94e98145e3579d700ad13bd0e177687b67bab6221da4fa0"
 ~ /os_resources/execute_syscalls/CallContract/n_steps: 901
 ~ /os_resources/execute_syscalls/Deploy/constant/builtin_instance_counter/pedersen_builtin: 8
 ~ /os_resources/execute_syscalls/Deploy/constant/n_steps: 1183

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

@@ -7,7 +7,8 @@ mod OsResourcesTestContract {
     use starknet::info::SyscallResultTrait;
     use starknet::syscalls::{
         call_contract_syscall, deploy_syscall, emit_event_syscall, get_execution_info_v2_syscall,
-        keccak_syscall, library_call_syscall, replace_class_syscall, sha256_process_block_syscall,
+        keccak_syscall, library_call_syscall, replace_class_syscall, send_message_to_l1_syscall,
+        sha256_process_block_syscall,
     };
     use starknet::{ClassHash, ContractAddress, get_block_hash_syscall, get_class_hash_at_syscall};
 
@@ -121,6 +122,11 @@ mod OsResourcesTestContract {
 
         // replace class syscall.
         replace_class_syscall(self_class_hash).unwrap_syscall();
+
+        // send message to l1 syscall.
+        // TODO(Yoni, 1/6/2022): In this case the number of steps depends on the payload size -
+        //  consider counting it.
+        send_message_to_l1_syscall(100, array![].span()).unwrap_syscall();
     }
 
     // Target for call_contract and library_call — accepts no arguments.

crates/starknet_os_flow_tests/src/os_resources_test.rs

@@ -19,9 +19,11 @@ use indexmap::IndexMap;
 use starknet_api::block::StarknetVersion;
 use starknet_api::contract_class::compiled_class_hash::{HashVersion, HashableCompiledClass};
 use starknet_api::contract_class::{ClassInfo, ContractClass, SierraVersion};
+use starknet_api::core::EthAddress;
 use starknet_api::executable_transaction::{DeclareTransaction, InvokeTransaction};
 use starknet_api::test_utils::declare::declare_tx;
 use starknet_api::test_utils::invoke::invoke_tx;
+use starknet_api::transaction::{L2ToL1Payload, MessageToL1};
 use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
 use starknet_api::{calldata, declare_tx_args, invoke_tx_args};
 use starknet_os::hint_processor::constants::BUILTIN_INSTANCE_SIZES;
@@ -45,7 +47,7 @@ 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; 24] = [
+const UNMEASURABLE_SYSCALLS: [Selector; 23] = [
     Selector::DelegateCall,
     Selector::DelegateL1Handler,
     Selector::GetBlockNumber,
@@ -67,7 +69,6 @@ const UNMEASURABLE_SYSCALLS: [Selector; 24] = [
     Selector::Secp256r1GetXy,
     Selector::Secp256r1Mul,
     Selector::Secp256r1New,
-    Selector::SendMessageToL1,
     Selector::StorageRead,
     Selector::StorageWrite,
 ];
@@ -285,6 +286,13 @@ async fn test_os_resources_regression() {
         }]),
     );
 
+    // Add the expected message to L1.
+    test_builder.messages_to_l1.push(MessageToL1 {
+        from_address: os_resources_contract_address,
+        to_address: EthAddress::try_from(Felt::from(100)).unwrap(),
+        payload: L2ToL1Payload(vec![]),
+    });
+
     // Run test. Grab the execution info from the runner (for later) before consuming it.
     let test_runner = test_builder.build().await;
     let inner_calls = test_runner