blockifier,apollo_starknet_os_program: support linear message cost

dorimedini-starkware · dorimedini-starkware · commit 5945995a2856 · 2026-06-09T15:06:00.000+03:00
diff --git a/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants.cairo b/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 = (
-    0x0531d387113cc4b96b8f5151c7b17515a2e909a15442f1f12fd113f7c10777cd
+    0x026ed490d325bff4c3951ad418bc46e59536633b9a369bda562bf316be1de11f
 );
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 3;
 
@@ -119,7 +119,8 @@ 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 = 12470;
+const SEND_MESSAGE_TO_L1_GAS_COST = 12770;
+const SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST = 800;
 const META_TX_V0_GAS_COST = 168550;
 const META_TX_V0_CALLDATA_FACTOR_GAS_COST = 4850;
 
diff --git a/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants_template.txt b/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants_template.txt
@@ -99,6 +99,7 @@ const STORAGE_READ_GAS_COST = {STORAGE_READ_GAS_COST};
 const STORAGE_WRITE_GAS_COST = {STORAGE_WRITE_GAS_COST};
 const EMIT_EVENT_GAS_COST = {EMIT_EVENT_GAS_COST};
 const SEND_MESSAGE_TO_L1_GAS_COST = {SEND_MESSAGE_TO_L1_GAS_COST};
+const SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST = {SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST};
 const META_TX_V0_GAS_COST = {META_TX_V0_GAS_COST};
 const META_TX_V0_CALLDATA_FACTOR_GAS_COST = {META_TX_V0_CALLDATA_FACTOR_GAS_COST};
 
diff --git a/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/execution/syscall_impls.cairo b/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/execution/syscall_impls.cairo
@@ -115,6 +115,7 @@ from starkware.starknet.core.os.constants import (
     SECP256R1_MUL_GAS_COST,
     SECP256R1_NEW_GAS_COST,
     SEND_MESSAGE_TO_L1_GAS_COST,
+    SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST,
     SHA256_PROCESS_BLOCK_GAS_COST,
     SHA512_PROCESS_BLOCK_GAS_COST,
     SIERRA_ARRAY_LEN_BOUND,
@@ -1403,17 +1404,20 @@ func execute_send_message_to_l1{range_check_ptr, syscall_ptr: felt*, outputs: Os
 ) {
     alloc_locals;
     let request = cast(syscall_ptr + RequestHeader.SIZE, SendMessageToL1Request*);
+
+    tempvar payload_start = request.payload_start;
+    tempvar payload_size = request.payload_end - payload_start;
+
+    let total_gas_cost = SEND_MESSAGE_TO_L1_GAS_COST + SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST *
+        payload_size;
     let success = reduce_syscall_gas_and_write_response_header(
-        total_gas_cost=SEND_MESSAGE_TO_L1_GAS_COST, request_struct_size=SendMessageToL1Request.SIZE
+        total_gas_cost=total_gas_cost, request_struct_size=SendMessageToL1Request.SIZE
     );
     if (success == FALSE) {
         // Not enough gas to execute the syscall.
         return ();
     }
 
-    tempvar payload_start = request.payload_start;
-    tempvar payload_size = request.payload_end - payload_start;
-
     assert [outputs.messages_to_l1] = MessageToL1Header(
         from_address=contract_address, to_address=request.to_address, payload_size=payload_size
     );
diff --git a/crates/apollo_starknet_os_program/src/constants_test.rs b/crates/apollo_starknet_os_program/src/constants_test.rs
@@ -164,7 +164,9 @@ fn generate_constants_file() -> String {
             base_only_syscall_cost(SyscallSelector::StorageWrite, os_constants),
         EMIT_EVENT_GAS_COST = base_only_syscall_cost(SyscallSelector::EmitEvent, os_constants),
         SEND_MESSAGE_TO_L1_GAS_COST =
-            base_only_syscall_cost(SyscallSelector::SendMessageToL1, os_constants),
+            os_constants.gas_costs.syscalls.send_message_to_l1.get_syscall_cost(0),
+        SEND_MESSAGE_TO_L1_PAYLOAD_FACTOR_GAS_COST =
+            os_constants.gas_costs.syscalls.send_message_to_l1.linear_syscall_cost(),
         META_TX_V0_GAS_COST = os_constants.gas_costs.syscalls.meta_tx_v0.get_syscall_cost(0),
         META_TX_V0_CALLDATA_FACTOR_GAS_COST =
             os_constants.gas_costs.syscalls.meta_tx_v0.linear_syscall_cost(),
diff --git a/crates/apollo_starknet_os_program/src/program_hash.json b/crates/apollo_starknet_os_program/src/program_hash.json
@@ -1,6 +1,6 @@
 {
-  "os": "0x444730bad97d2dd8c243fad2887bfd5ab98babaddaec38653bab90a41bf1fc2",
-  "virtual_os": "0x531d387113cc4b96b8f5151c7b17515a2e909a15442f1f12fd113f7c10777cd",
+  "os": "0x61152c9c3dd68d0a683b2a50c42c5d863b28e188f8efd35f71e52b67ede994b",
+  "virtual_os": "0x26ed490d325bff4c3951ad418bc46e59536633b9a369bda562bf316be1de11f",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"
 }
diff --git a/crates/apollo_starknet_os_program/src/virtual_os_test.rs b/crates/apollo_starknet_os_program/src/virtual_os_test.rs
@@ -19,11 +19,11 @@ fn test_virtual_os_swapped_files() {
 #[test]
 fn test_program_bytecode_lengths() {
     expect![[r#"
-        16395
+        16399
     "#]]
     .assert_debug_eq(&OS_PROGRAM.data_len());
     expect![[r#"
-        11443
+        11447
     "#]]
     .assert_debug_eq(&VIRTUAL_OS_PROGRAM.data_len());
 }
diff --git a/crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json b/crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json
@@ -129,7 +129,7 @@
         "allowed_virtual_os_program_hashes": [
             "0x3e98c2d7703b03a7edb73ed7f075f97f1dcbaa8f717cdf6e1a57bf058265473",
             "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
-            "0x531d387113cc4b96b8f5151c7b17515a2e909a15442f1f12fd113f7c10777cd"
+            "0x26ed490d325bff4c3951ad418bc46e59536633b9a369bda562bf316be1de11f"
         ],
         "constructor_entry_point_selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194",
         "default_entry_point_selector": "0x0",
@@ -455,10 +455,17 @@
                 }
             },
             "SendMessageToL1": {
-                "n_steps": 124,
-                "n_memory_holes": 0,
-                "builtin_instance_counter": {
-                    "range_check_builtin": 1
+                "constant": {
+                    "n_steps": 127,
+                    "n_memory_holes": 0,
+                    "builtin_instance_counter": {
+                        "range_check_builtin": 1
+                    }
+                },
+                "calldata_factor": {
+                    "n_steps": 8,
+                    "n_memory_holes": 0,
+                    "builtin_instance_counter": {}
                 }
             },
             "Sha256ProcessBlock": {
diff --git a/crates/blockifier/resources/versioned_constants_diff_regression/0.14.3_0.14.4.txt b/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: "0x531d387113cc4b96b8f5151c7b17515a2e909a15442f1f12fd113f7c10777cd"
++ /os_constants/allowed_virtual_os_program_hashes/2: "0x26ed490d325bff4c3951ad418bc46e59536633b9a369bda562bf316be1de11f"
 ~ /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
@@ -9,5 +9,9 @@
 ~ /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/SendMessageToL1/calldata_factor: {"builtin_instance_counter":{},"n_memory_holes":0,"n_steps":8}
++ /os_resources/execute_syscalls/SendMessageToL1/constant: {"builtin_instance_counter":{"range_check_builtin":1},"n_memory_holes":0,"n_steps":127}
+- /os_resources/execute_syscalls/SendMessageToL1/builtin_instance_counter
+- /os_resources/execute_syscalls/SendMessageToL1/n_memory_holes
+- /os_resources/execute_syscalls/SendMessageToL1/n_steps
 ~ /os_resources/execute_syscalls/Sha256ProcessBlock/n_steps: 1854
diff --git a/crates/blockifier/src/execution/deprecated_syscalls/hint_processor.rs b/crates/blockifier/src/execution/deprecated_syscalls/hint_processor.rs
@@ -815,6 +815,15 @@ impl DeprecatedSyscallExecutor for DeprecatedSyscallHintProcessor<'_> {
         if !execution_context.tx_context.block_context.chain_info.is_l3 {
             EthAddress::try_from(request.message.to_address)?;
         }
+
+        // Increment the SendMessageToL1 syscall's linear cost counter by the number of elements in
+        // the payload.
+        let syscall_usage = syscall_handler
+            .syscalls_usage
+            .get_mut(&DeprecatedSyscallSelector::SendMessageToL1)
+            .expect("syscalls_usage entry for SendMessageToL1 must be initialized");
+        syscall_usage.linear_factor += request.message.payload.0.len();
+
         let ordered_message_to_l1 = OrderedL2ToL1Message {
             order: execution_context.n_sent_messages_to_l1,
             message: request.message,
diff --git a/crates/blockifier/src/execution/native/syscall_handler.rs b/crates/blockifier/src/execution/native/syscall_handler.rs
@@ -623,11 +623,12 @@ impl StarknetSyscallHandler for &mut NativeSyscallHandler<'_> {
         payload: &[Felt],
         remaining_gas: &mut u64,
     ) -> SyscallResult<()> {
-        self.pre_execute_syscall(
-            remaining_gas,
-            self.gas_costs().syscalls.send_message_to_l1.base_syscall_cost(),
-            SyscallSelector::SendMessageToL1,
-        )?;
+        let total_gas_cost = self
+            .gas_costs()
+            .syscalls
+            .send_message_to_l1
+            .get_syscall_cost(u64_from_usize(payload.len()));
+        self.pre_execute_syscall(remaining_gas, total_gas_cost, SyscallSelector::SendMessageToL1)?;
 
         let to_address = L1Address::from(to_address);
         let message = MessageToL1 { to_address, payload: L2ToL1Payload(payload.to_vec()) };
diff --git a/crates/blockifier/src/execution/syscalls/syscall_base.rs b/crates/blockifier/src/execution/syscalls/syscall_base.rs
@@ -426,6 +426,10 @@ impl<'state> SyscallHandlerBase<'state> {
     }
 
     pub fn send_message_to_l1(&mut self, message: MessageToL1) -> SyscallResult<()> {
+        self.increment_syscall_linear_factor_by(
+            &SyscallSelector::SendMessageToL1,
+            message.payload.0.len(),
+        );
         if !self.context.tx_context.block_context.chain_info.is_l3 {
             EthAddress::try_from(message.to_address)?;
         }
diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs b/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: 23220,
+            gas_consumed: 25920,
         }
     "#]]
     .assert_debug_eq(&execution);
diff --git a/crates/blockifier/src/execution/syscalls/vm_syscall_utils.rs b/crates/blockifier/src/execution/syscalls/vm_syscall_utils.rs
@@ -414,6 +414,10 @@ impl SyscallRequest for SendMessageToL1Request {
 
         Ok(SendMessageToL1Request { message: MessageToL1 { to_address, payload } })
     }
+
+    fn get_linear_factor_length(&self) -> usize {
+        self.message.payload.0.len()
+    }
 }
 
 pub type SendMessageToL1Response = EmptyResponse;
diff --git a/crates/blockifier_test_utils/resources/feature_contracts/cairo1/os_resources_test_contract.cairo b/crates/blockifier_test_utils/resources/feature_contracts/cairo1/os_resources_test_contract.cairo
@@ -119,8 +119,7 @@ mod OsResourcesTestContract {
         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();
+        send_message_to_l1_syscall(100, array![5].span()).unwrap_syscall();
     }
 }
diff --git a/crates/central_systest_blobs/resources/blob_file_generation b/crates/central_systest_blobs/resources/blob_file_generation
@@ -1 +1 @@
-32
+34
diff --git a/crates/central_systest_blobs/resources/preconfirmed_block.json b/crates/central_systest_blobs/resources/preconfirmed_block.json
@@ -20,13 +20,13 @@
     "timestamp": 1013,
     "transaction_receipts": [
       {
-        "actual_fee": "0x106f19",
+        "actual_fee": "0x107365",
         "events": [
           {
             "data": [
               "0x3d3759cf036b96f8105f40dcf3fe0c209be3419154aa458d03336ad0443ce81",
               "0x1000",
-              "0x106f19",
+              "0x107365",
               "0x0"
             ],
             "from_address": "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33",
@@ -51,7 +51,7 @@
           "total_gas_consumed": {
             "l1_data_gas": 0,
             "l1_gas": 1652,
-            "l2_gas": 1075365
+            "l2_gas": 1076465
           }
         },
         "execution_status": "SUCCEEDED",
@@ -74,11 +74,11 @@
           "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33": [
             {
               "key": "0x2cbac7495ce24b399327e9282b09d029b1dd772b24b7e8dcd0467fedab5af58",
-              "value": "0xfffffffffffffffffffffffff98c2f53"
+              "value": "0xfffffffffffffffffffffffff98c26bb"
             },
             {
               "key": "0x723973208639b7839ce298f7ffea61e3f9533872defd7abdb91023db4658812",
-              "value": "0x673d0ac"
+              "value": "0x673d944"
             }
           ]
         }
diff --git a/crates/starknet_os_flow_tests/src/os_resources_test.rs b/crates/starknet_os_flow_tests/src/os_resources_test.rs
@@ -91,7 +91,12 @@ const UNMEASURABLE_SYSCALLS: [Selector; 23] = [
 /// Note: Keccak does not store the linear factor in the same entry in the versioned constants, but
 /// it does have a measurable linear factor stored under [Selector::KeccakRound].
 static SYSCALLS_WITH_LINEAR_FACTOR: LazyLock<HashMap<Selector, usize>> = LazyLock::new(|| {
-    HashMap::from([(Selector::Deploy, 1), (Selector::Keccak, 0), (Selector::MetaTxV0, 1)])
+    HashMap::from([
+        (Selector::Deploy, 1),
+        (Selector::Keccak, 0),
+        (Selector::MetaTxV0, 1),
+        (Selector::SendMessageToL1, 0),
+    ])
 });
 
 /// Syscalls that are implemented using virtual builtins. Such syscalls have their "heavy lifting"
@@ -286,12 +291,17 @@ async fn test_os_resources_regression() {
         }]),
     );
 
-    // Add the expected message to L1.
+    // Add the expected messages 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![]),
     });
+    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![Felt::from(5)]),
+    });
 
     // Run test. Grab the execution info from the runner (for later) before consuming it.
     let test_runner = test_builder.build().await;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "os": "0x444730bad97d2dd8c243fad2887bfd5ab98babaddaec38653bab90a41bf1fc2",`
`3`		`- "virtual_os": "0x531d387113cc4b96b8f5151c7b17515a2e909a15442f1f12fd113f7c10777cd",`
	`2`	`+ "os": "0x61152c9c3dd68d0a683b2a50c42c5d863b28e188f8efd35f71e52b67ede994b",`
	`3`	`+ "virtual_os": "0x26ed490d325bff4c3951ad418bc46e59536633b9a369bda562bf316be1de11f",`
`4`	`4`	`"aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",`
`5`	`5`	`"aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"`
`6`	`6`	`}`