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 = (
-    0x04373ade67a35a6ae0466730e5807b828a5db813010d6070bb1db85f99682dcb
+    0x0397efd2933dd48595331d4a61ca1cdf4ae1b4ff1999933cd419625a67fc7b04
 );
 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 = 168550;
 const META_TX_V0_CALLDATA_FACTOR_GAS_COST = 4850;
 

crates/apollo_starknet_os_program/src/program_hash.json

@@ -1,6 +1,6 @@
 {
-  "os": "0x2f2a3b9083c0d74ac187befa00a61033e46f5b4782c03b87869592babcbe3e9",
-  "virtual_os": "0x4373ade67a35a6ae0466730e5807b828a5db813010d6070bb1db85f99682dcb",
+  "os": "0x72a1e11937375845bdbfcb0c13ecc41f98f9439aac233eef668ac0f8272240c",
+  "virtual_os": "0x397efd2933dd48595331d4a61ca1cdf4ae1b4ff1999933cd419625a67fc7b04",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"
 }

crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json

@@ -129,7 +129,7 @@
         "allowed_virtual_os_program_hashes": [
             "0x3e98c2d7703b03a7edb73ed7f075f97f1dcbaa8f717cdf6e1a57bf058265473",
             "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
-            "0x4373ade67a35a6ae0466730e5807b828a5db813010d6070bb1db85f99682dcb"
+            "0x397efd2933dd48595331d4a61ca1cdf4ae1b4ff1999933cd419625a67fc7b04"
         ],
         "constructor_entry_point_selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194",
         "default_entry_point_selector": "0x0",
@@ -455,7 +455,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: "0x4373ade67a35a6ae0466730e5807b828a5db813010d6070bb1db85f99682dcb"
++ /os_constants/allowed_virtual_os_program_hashes/2: "0x397efd2933dd48595331d4a61ca1cdf4ae1b4ff1999933cd419625a67fc7b04"
 ~ /os_resources/execute_syscalls/CallContract/n_steps: 901
 ~ /os_resources/execute_syscalls/EmitEvent/n_steps: 47
 ~ /os_resources/execute_syscalls/GetBlockHash/builtin_instance_counter/range_check_builtin: 3
@@ -10,4 +10,5 @@
 ~ /os_resources/execute_syscalls/LibraryCall/n_steps: 874
 ~ /os_resources/execute_syscalls/MetaTxV0/constant/n_steps: 1307
 ~ /os_resources/execute_syscalls/ReplaceClass/n_steps: 92
+~ /os_resources/execute_syscalls/SendMessageToL1/n_steps: 124
 ~ /os_resources/execute_syscalls/Sha256ProcessBlock/n_steps: 1854

crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs

@@ -75,7 +75,7 @@ fn test_send_message_to_l1(runnable_version: RunnableCairo1) {
             ],
             cairo_native: false,
             failed: false,
-            gas_consumed: 25220,
+            gas_consumed: 23220,
         }
     "#]]
     .assert_debug_eq(&execution);

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

@@ -6,7 +6,8 @@ mod OsResourcesTestContract {
     use starknet::info::SyscallResultTrait;
     use starknet::syscalls::{
         call_contract_syscall, deploy_syscall, emit_event_syscall, get_execution_info_v3_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};
 
@@ -125,5 +126,10 @@ mod OsResourcesTestContract {
 
         // replace class syscall.
         replace_class_syscall(stable_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();
     }
 }

crates/central_systest_blobs/resources/blob_file_generation

@@ -1 +1 @@
-31
+32

crates/central_systest_blobs/resources/preconfirmed_block.json

@@ -20,13 +20,13 @@
     "timestamp": 1013,
     "transaction_receipts": [
       {
-        "actual_fee": "0x1076e9",
+        "actual_fee": "0x106f19",
         "events": [
           {
             "data": [
               "0x3d3759cf036b96f8105f40dcf3fe0c209be3419154aa458d03336ad0443ce81",
               "0x1000",
-              "0x1076e9",
+              "0x106f19",
               "0x0"
             ],
             "from_address": "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33",
@@ -51,7 +51,7 @@
           "total_gas_consumed": {
             "l1_data_gas": 0,
             "l1_gas": 1652,
-            "l2_gas": 1077365
+            "l2_gas": 1075365
           }
         },
         "execution_status": "SUCCEEDED",
@@ -74,11 +74,11 @@
           "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33": [
             {
               "key": "0x2cbac7495ce24b399327e9282b09d029b1dd772b24b7e8dcd0467fedab5af58",
-              "value": "0xfffffffffffffffffffffffff98c1fb3"
+              "value": "0xfffffffffffffffffffffffff98c2f53"
             },
             {
               "key": "0x723973208639b7839ce298f7ffea61e3f9533872defd7abdb91023db4658812",
-              "value": "0x673e04c"
+              "value": "0x673d0ac"
             }
           ]
         }

crates/starknet_os_flow_tests/src/os_resources_test.rs

@@ -20,9 +20,11 @@ use expect_test::expect_file;
 use indexmap::IndexMap;
 use starknet_api::block::StarknetVersion;
 use starknet_api::contract_class::SierraVersion;
+use starknet_api::core::EthAddress;
 use starknet_api::executable_transaction::InvokeTransaction;
 use starknet_api::test_utils::invoke::invoke_tx;
 use starknet_api::transaction::fields::ContractAddressSalt;
+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::os_logger::ResourceFinalizer;
@@ -47,7 +49,7 @@ use crate::test_manager::{
 use crate::tests::NON_TRIVIAL_RESOURCE_BOUNDS;
 
 // 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,
@@ -69,7 +71,6 @@ const UNMEASURABLE_SYSCALLS: [Selector; 24] = [
     Selector::Secp256r1GetXy,
     Selector::Secp256r1Mul,
     Selector::Secp256r1New,
-    Selector::SendMessageToL1,
     Selector::StorageRead,
     Selector::StorageWrite,
 ];
@@ -288,6 +289,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