cairo-lang 0.13.4a1__zip → 0.13.5__zip

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.4a1
+Version: 0.13.5
 Summary: Compiler and runner for the Cairo language
 Home-page: https://cairo-lang.org/
 Author: Starkware
@@ -67,4 +67,3 @@ Once the docker image is built, you can fetch the python package zip file using:
 > docker cp ${container_id}:/app/cairo-lang-0.13.4.zip .
 > docker rm -v ${container_id}
 ```
-

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/README.md

@@ -57,4 +57,3 @@ Once the docker image is built, you can fetch the python package zip file using:
 > docker cp ${container_id}:/app/cairo-lang-0.13.4.zip .
 > docker rm -v ${container_id}
 ```
-

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/cairo_lang.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.4a1
+Version: 0.13.5
 Summary: Compiler and runner for the Cairo language
 Home-page: https://cairo-lang.org/
 Author: Starkware
@@ -67,4 +67,3 @@ Once the docker image is built, you can fetch the python package zip file using:
 > docker cp ${container_id}:/app/cairo-lang-0.13.4.zip .
 > docker rm -v ${container_id}
 ```
-

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/cairo_lang.egg-info/SOURCES.txt

@@ -470,12 +470,15 @@ starkware/starknet/core/os/data_availability/bls_utils.py
 starkware/starknet/core/os/data_availability/commitment.cairo
 starkware/starknet/core/os/data_availability/compression.cairo
 starkware/starknet/core/os/data_availability/compression.py
+starkware/starknet/core/os/execution/__init__.py
 starkware/starknet/core/os/execution/deprecated_execute_entry_point.cairo
 starkware/starknet/core/os/execution/deprecated_execute_syscalls.cairo
 starkware/starknet/core/os/execution/execute_entry_point.cairo
 starkware/starknet/core/os/execution/execute_syscalls.cairo
 starkware/starknet/core/os/execution/execute_transactions.cairo
 starkware/starknet/core/os/execution/revert.cairo
+starkware/starknet/core/os/execution/version_bound_accounts.cairo
+starkware/starknet/core/os/execution/version_bound_accounts.py
 starkware/starknet/core/os/os_config/os_config.cairo
 starkware/starknet/core/os/state/aliases.cairo
 starkware/starknet/core/os/state/commitment.cairo

cairo-lang-0.13.5/starkware/cairo/lang/VERSION

@@ -0,0 +1 @@
+0.13.5

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/cairo/lang/vm/cairo_pie.py

@@ -23,6 +23,7 @@ from starkware.cairo.lang.vm.memory_segments import is_valid_memory_addr, is_val
 from starkware.cairo.lang.vm.relocatable import MaybeRelocatable, RelocatableValue, relocate_value
 from starkware.python.utils import add_counters, multiply_counter_by_scalar, sub_counters
 from starkware.starkware_utils.marshmallow_dataclass_fields import additional_metadata
+from starkware.starkware_utils.validated_dataclass import ValidatedMarshmallowDataclass
 
 DEFAULT_CAIRO_PIE_VERSION = "1.0"
 CURRENT_CAIRO_PIE_VERSION = "1.1"
@@ -124,7 +125,7 @@ class CairoPieMetadata:
 
 
 @marshmallow_dataclass.dataclass
-class ExecutionResources:
+class ExecutionResources(ValidatedMarshmallowDataclass):
     """
     Indicates how many steps the program should run, how many memory cells are used from each
     builtin, and how many holes there are in the memory address space.

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/business_logic/execution/os_usage.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import Any, Dict, Mapping
 
 import marshmallow_dataclass
+from marshmallow.decorators import post_dump, pre_load
 
 from starkware.cairo.lang.vm.cairo_pie import ExecutionResources
 from starkware.python.utils import snake_to_camel_case
@@ -20,6 +21,43 @@ class ResourcesParams(ValidatedMarshmallowDataclass):
     constant: ExecutionResources
     calldata_factor: ExecutionResources
 
+    @pre_load
+    def add_constant_and_calldata_factor_fields(
+        self, data: Dict[str, Any], many: bool, **kwargs
+    ) -> Dict[str, Any]:
+        """
+        If only raw resources are provided (without constant and calldata factor structure),
+        converts them into resource params format where:
+        - constant = provided resources
+        - calldata factor = empty resources
+        """
+
+        if "calldata_factor" not in data and "constant" not in data:
+            new_data = dict()
+            new_data["calldata_factor"] = ExecutionResources.empty().dump()
+            new_data["constant"] = data
+            return new_data
+        elif ("calldata_factor" in data) ^ ("constant" in data):
+            raise ValueError(
+                "Either both 'calldata_factor' and 'constant' should be provided or neither."
+                f"data = {data}"
+            )
+        else:
+            return data
+
+    @post_dump
+    def remove_trivial_calldata_factor(
+        self, data: Dict[str, Any], many: bool, **kwargs
+    ) -> Dict[str, Any]:
+        """
+        Ensures `dump` behaves like `load`:
+        - If `calldata_factor` is empty, remove it.
+        - Otherwise, return the full dictionary.
+        """
+        if data["calldata_factor"] == ExecutionResources.empty().dump():
+            return data["constant"]
+        return data
+
 
 @marshmallow_dataclass.dataclass(frozen=True)
 class ResourcesByVersion(ValidatedMarshmallowDataclass):
@@ -30,7 +68,7 @@ class ResourcesByVersion(ValidatedMarshmallowDataclass):
 @marshmallow_dataclass.dataclass(frozen=True)
 class OsResources(ValidatedMarshmallowDataclass):
     # Mapping from every syscall to its execution resources in the OS (e.g., amount of Cairo steps).
-    execute_syscalls: Mapping[str, ExecutionResources]
+    execute_syscalls: Mapping[str, ResourcesParams]
     # Mapping from every transaction to its extra execution resources in the OS,
     # i.e., resources that don't count during the execution itself.
     execute_txs_inner: Mapping[TransactionType, ResourcesByVersion]
@@ -78,7 +116,7 @@ def get_tx_additional_os_resources(
     os_additional_resources = functools.reduce(
         ExecutionResources.__add__,
         (
-            os_resources.execute_syscalls[syscall_name] * syscall_counter[syscall_name]
+            os_resources.execute_syscalls[syscall_name].constant * syscall_counter[syscall_name]
             for syscall_name in syscall_counter.keys()
         ),
         ExecutionResources.empty(),

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/constants.cairo

@@ -58,6 +58,7 @@ const STORED_BLOCK_HASH_BUFFER = 10;
 // Gas constants.
 const STEP_GAS_COST = 100;
 const RANGE_CHECK_GAS_COST = 70;
+const RANGE_CHECK96_GAS_COST = 56;
 const KECCAK_BUILTIN_GAS_COST = 136189;
 const PEDERSEN_GAS_COST = 4050;
 const BITWISE_BUILTIN_GAS_COST = 583;
@@ -85,6 +86,7 @@ const SYSCALL_BASE_GAS_COST = 100 * STEP_GAS_COST;
 // Syscall gas costs.
 const CALL_CONTRACT_GAS_COST = 15 * RANGE_CHECK_GAS_COST + 866 * STEP_GAS_COST;
 const DEPLOY_GAS_COST = 7 * PEDERSEN_GAS_COST + 18 * RANGE_CHECK_GAS_COST + 1132 * STEP_GAS_COST;
+const DEPLOY_CALLDATA_FACTOR_GAS_COST = 8 * STEP_GAS_COST + 1 * PEDERSEN_GAS_COST;
 const GET_BLOCK_HASH_GAS_COST = 2 * RANGE_CHECK_GAS_COST + 104 * STEP_GAS_COST;
 const GET_CLASS_HASH_AT_GAS_COST = 1 * SYSCALL_BASE_GAS_COST;
 const GET_EXECUTION_INFO_GAS_COST = 1 * SYSCALL_BASE_GAS_COST;
@@ -135,3 +137,45 @@ const L1_DATA_GAS_INDEX = 2;
 // Round down the block number and timestamp when queried inside `__validate__`.
 const VALIDATE_BLOCK_NUMBER_ROUNDING = 100;
 const VALIDATE_TIMESTAMP_ROUNDING = 3600;
+
+// List of CairoZero account contracts that require the transaction version to be 1.
+const V1_BOUND_ACCOUNTS_CAIRO0_0 = (
+    0x06d706cfbac9b8262d601c38251c5fbe0497c3a96cc91a92b08d91b61d9e70c4
+);
+const V1_BOUND_ACCOUNTS_CAIRO0_1 = (
+    0x0309c042d3729173c7f2f91a34f04d8c509c1b292d334679ef1aabf8da0899cc
+);
+const V1_BOUND_ACCOUNTS_CAIRO0_2 = (
+    0x01a7820094feaf82d53f53f214b81292d717e7bb9a92bb2488092cd306f3993f
+);
+const V1_BOUND_ACCOUNTS_CAIRO0_3 = (
+    0x033434ad846cdd5f23eb73ff09fe6fddd568284a0fb7d1be20ee482f044dabe2
+);
+const V1_BOUND_ACCOUNTS_CAIRO0_LEN = 4;
+
+// List of Cairo1 account contracts that require the transaction version to be 1.
+const V1_BOUND_ACCOUNTS_CAIRO1_0 = (
+    0x01a736d6ed154502257f02b1ccdf4d9d1089f80811cd6acad48e6b6a9d1f2003
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_1 = (
+    0x0737ee2f87ce571a58c6c8da558ec18a07ceb64a6172d5ec46171fbc80077a48
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_2 = (
+    0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_3 = (
+    0x04c6d6cf894f8bc96bb9c525e6853e5483177841f7388f74a46cfda6f028c755
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_4 = (
+    0x01c0bb51e2ce73dc007601a1e7725453627254016c28f118251a71bbb0507fcb
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_5 = (
+    0x0251830adc3d8b4d818c2c309d71f1958308e8c745212480c26e01120c69ee49
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_6 = (
+    0x0251cac7b2f45d255b83b7a06dcdef70c8a8752f00ea776517c1c2243c7a06e5
+);
+const V1_BOUND_ACCOUNTS_CAIRO1_LEN = 7;
+
+// Max transaction tip for which a v3 transaction can be replaced with a v1 transaction.
+const V1_BOUND_ACCOUNTS_MAX_TIP = 0x746a5288000;

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/deprecated_syscall_handler.py

@@ -24,6 +24,10 @@ from starkware.starknet.business_logic.state.state_api_objects import BlockInfo
 from starkware.starknet.core.os.contract_address.contract_address import (
     calculate_contract_address_from_hash,
 )
+from starkware.starknet.core.os.execution.version_bound_accounts import (
+    get_v1_bound_accounts_cairo0,
+    get_v1_bound_accounts_max_tip,
+)
 from starkware.starknet.core.os.os_logger import OptionalSegmentManager
 from starkware.starknet.core.os.syscall_handler import OsExecutionHelper
 from starkware.starknet.core.os.syscall_utils import (
@@ -90,7 +94,9 @@ class DeprecatedSysCallHandlerBase(ABC):
         )
 
     def emit_event(self, segments: MemorySegmentManager, syscall_ptr: RelocatableValue):
-        return
+        """
+        Handles the emit_event system call.
+        """
 
     def get_caller_address(self, segments: MemorySegmentManager, syscall_ptr: RelocatableValue):
         """
@@ -609,9 +615,6 @@ class DeprecatedBlSyscallHandler(DeprecatedSysCallHandlerBase):
         return call_info.result()
 
     def emit_event(self, segments: MemorySegmentManager, syscall_ptr: RelocatableValue):
-        """
-        Handles the emit_event system call.
-        """
         request = self._read_and_validate_syscall_request(
             syscall_name="emit_event", syscall_ptr=syscall_ptr
         )
@@ -800,12 +803,17 @@ class DeprecatedOsSysCallHandler(DeprecatedSysCallHandlerBase):
         return segment_start
 
     def _call_contract(self, syscall_ptr: RelocatableValue, syscall_name: str) -> CallResult:
+        self._count_syscall(syscall_name)
         return next(self.execution_helper.result_iterator)
 
     def _deploy(self, syscall_ptr: RelocatableValue) -> int:
+        self._count_syscall("deploy")
         next(self.execution_helper.result_iterator)
         return next(self.execution_helper.deployed_contracts_iterator)
 
+    def emit_event(self, segments: MemorySegmentManager, syscall_ptr: RelocatableValue):
+        self._count_syscall(syscall_name="emit_event")
+
     def _get_block_number(self) -> int:
         return self.execution_helper.call_cairo_execution_info.block_info.block_number
 
@@ -823,7 +831,22 @@ class DeprecatedOsSysCallHandler(DeprecatedSysCallHandlerBase):
 
     def _get_tx_info_ptr(self) -> RelocatableValue:
         assert self.execution_helper.tx_info_ptr is not None
-        return self.execution_helper.tx_info_ptr
+        tx_info = self.syscall_structs.TxInfo.from_ptr(
+            memory=self.segments.memory, addr=self.execution_helper.tx_info_ptr
+        )
+        class_hash = self.execution_helper.call_info.class_hash
+        tip = self.execution_helper.call_cairo_execution_info.tx_info.tip
+        if (
+            tx_info.version == 3
+            and class_hash in get_v1_bound_accounts_cairo0()
+            and tip <= get_v1_bound_accounts_max_tip()
+        ):
+            # Return version=1 for version-bound accounts.
+            res = self.segments.gen_arg(arg=tx_info._replace(version=1))
+            assert isinstance(res, RelocatableValue)
+            return res
+        else:
+            return self.execution_helper.tx_info_ptr
 
     def _replace_class(self, class_hash: int):
         return

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/execution/deprecated_execute_syscalls.cairo

@@ -1,4 +1,5 @@
 from starkware.cairo.common.alloc import alloc
+from starkware.cairo.common.bool import FALSE
 from starkware.cairo.common.cairo_builtins import KeccakBuiltin
 from starkware.cairo.common.dict import dict_read, dict_update
 from starkware.cairo.common.dict_access import DictAccess
@@ -51,6 +52,7 @@ from starkware.starknet.common.syscalls import (
     SendMessageToL1SysCall,
     StorageRead,
     StorageWrite,
+    TxInfo,
 )
 from starkware.starknet.core.os.block_context import BlockContext
 from starkware.starknet.core.os.builtins import (
@@ -78,6 +80,10 @@ from starkware.starknet.core.os.execution.revert import (
     CHANGE_CONTRACT_ENTRY,
     RevertLogEntry,
 )
+from starkware.starknet.core.os.execution.version_bound_accounts import (
+    check_tip_for_v1_bound_accounts,
+    is_v1_bound_account_cairo0,
+)
 from starkware.starknet.core.os.output import (
     MessageToL1Header,
     OsCarriedOutputs,
@@ -213,6 +219,32 @@ func execute_library_call_syscall{
     );
 }
 
+func execute_get_tx_info_syscall{range_check_ptr}(
+    execution_context: ExecutionContext*, syscall_ptr: GetTxInfo*
+) {
+    tempvar tx_info: TxInfo* = execution_context.deprecated_tx_info;
+    tempvar class_hash = execution_context.class_hash;
+    let v1_bound = is_v1_bound_account_cairo0(class_hash);
+    let check_tip = check_tip_for_v1_bound_accounts(execution_context.execution_info.tx_info.tip);
+    if (tx_info.version == 3 and v1_bound != FALSE and check_tip != FALSE) {
+        static_assert GetTxInfoResponse.SIZE == 1;
+        assert [syscall_ptr.response.tx_info] = TxInfo(
+            version=1,
+            account_contract_address=tx_info.account_contract_address,
+            max_fee=tx_info.max_fee,
+            signature_len=tx_info.signature_len,
+            signature=tx_info.signature,
+            transaction_hash=tx_info.transaction_hash,
+            chain_id=tx_info.chain_id,
+            nonce=tx_info.nonce,
+        );
+        return ();
+    }
+
+    assert syscall_ptr.response = GetTxInfoResponse(tx_info=tx_info);
+    return ();
+}
+
 func execute_deploy_syscall{
     range_check_ptr,
     builtin_ptrs: BuiltinPointers*,
@@ -551,8 +583,8 @@ func execute_deprecated_syscalls{
     }
 
     if (selector == GET_TX_INFO_SELECTOR) {
-        assert cast(syscall_ptr, GetTxInfo*).response = GetTxInfoResponse(
-            tx_info=execution_context.deprecated_tx_info
+        execute_get_tx_info_syscall(
+            execution_context=execution_context, syscall_ptr=cast(syscall_ptr, GetTxInfo*)
         );
         %{ exit_syscall(selector=ids.GET_TX_INFO_SELECTOR) %}
         return execute_deprecated_syscalls(

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/execution/execute_syscalls.cairo

@@ -109,6 +109,7 @@ from starkware.starknet.common.new_syscalls import (
     StorageReadRequest,
     StorageReadResponse,
     StorageWriteRequest,
+    TxInfo,
 )
 from starkware.starknet.core.os.block_context import BlockContext
 from starkware.starknet.core.os.builtins import (
@@ -120,6 +121,7 @@ from starkware.starknet.core.os.constants import (
     BLOCK_HASH_CONTRACT_ADDRESS,
     CALL_CONTRACT_GAS_COST,
     CONSTRUCTOR_ENTRY_POINT_SELECTOR,
+    DEPLOY_CALLDATA_FACTOR_GAS_COST,
     DEPLOY_GAS_COST,
     EMIT_EVENT_GAS_COST,
     ENTRY_POINT_TYPE_CONSTRUCTOR,
@@ -164,6 +166,10 @@ from starkware.starknet.core.os.execution.revert import (
     CHANGE_CONTRACT_ENTRY,
     RevertLogEntry,
 )
+from starkware.starknet.core.os.execution.version_bound_accounts import (
+    check_tip_for_v1_bound_accounts,
+    is_v1_bound_account_cairo1,
+)
 from starkware.starknet.core.os.output import (
     MessageToL1Header,
     OsCarriedOutputs,
@@ -231,7 +237,7 @@ func execute_syscalls{
     }
 
     if (selector == GET_EXECUTION_INFO_SELECTOR) {
-        execute_get_execution_info(execution_info=execution_context.execution_info);
+        execute_get_execution_info(execution_context=execution_context);
         %{ exit_syscall(selector=ids.GET_EXECUTION_INFO_SELECTOR) %}
         return execute_syscalls(
             block_context=block_context,
@@ -631,8 +637,13 @@ func execute_deploy{
 }(block_context: BlockContext*, caller_execution_context: ExecutionContext*) {
     alloc_locals;
     let request = cast(syscall_ptr + RequestHeader.SIZE, DeployRequest*);
+    local constructor_calldata_start: felt* = request.constructor_calldata_start;
+    local constructor_calldata_size = request.constructor_calldata_end - constructor_calldata_start;
+
+    let specific_base_gas_cost = DEPLOY_GAS_COST + DEPLOY_CALLDATA_FACTOR_GAS_COST *
+        constructor_calldata_size;
     let (success, remaining_gas) = reduce_syscall_base_gas(
-        specific_base_gas_cost=DEPLOY_GAS_COST, request_struct_size=DeployRequest.SIZE
+        specific_base_gas_cost=specific_base_gas_cost, request_struct_size=DeployRequest.SIZE
     );
     if (success == FALSE) {
         // Not enough gas to execute the syscall.
@@ -648,9 +659,6 @@ func execute_deploy{
     // Set deployer_address to 0 if request.deploy_from_zero is TRUE.
     let deployer_address = (1 - deploy_from_zero) * caller_address;
 
-    tempvar constructor_calldata_start = request.constructor_calldata_start;
-    tempvar constructor_calldata_size = request.constructor_calldata_end -
-        constructor_calldata_start;
     let selectable_builtins = &builtin_ptrs.selectable;
     let hash_ptr = selectable_builtins.pedersen;
     with hash_ptr {
@@ -956,8 +964,10 @@ func execute_get_block_hash{
 
 // Gets the execution info.
 func execute_get_execution_info{range_check_ptr, syscall_ptr: felt*}(
-    execution_info: ExecutionInfo*
+    execution_context: ExecutionContext*
 ) {
+    alloc_locals;
+
     // Reduce gas.
     let success = reduce_syscall_gas_and_write_response_header(
         total_gas_cost=GET_EXECUTION_INFO_GAS_COST, request_struct_size=0
@@ -967,12 +977,49 @@ func execute_get_execution_info{range_check_ptr, syscall_ptr: felt*}(
         return ();
     }
 
-    assert [cast(syscall_ptr, GetExecutionInfoResponse*)] = GetExecutionInfoResponse(
-        execution_info=execution_info
-    );
+    let response = cast(syscall_ptr, GetExecutionInfoResponse*);
     // Advance syscall pointer to the next syscall.
     let syscall_ptr = syscall_ptr + GetExecutionInfoResponse.SIZE;
 
+    local execution_info: ExecutionInfo* = execution_context.execution_info;
+    local tx_info: TxInfo* = execution_info.tx_info;
+    let v1_bound = is_v1_bound_account_cairo1(execution_context.class_hash);
+    let check_tip = check_tip_for_v1_bound_accounts(tx_info.tip);
+    if (tx_info.version == 3 and v1_bound != FALSE and check_tip != FALSE) {
+        tempvar response_tx_info = response.execution_info.tx_info;
+
+        assert [response_tx_info] = TxInfo(
+            version=1,
+            account_contract_address=tx_info.account_contract_address,
+            max_fee=tx_info.max_fee,
+            signature_start=tx_info.signature_start,
+            signature_end=tx_info.signature_end,
+            transaction_hash=tx_info.transaction_hash,
+            chain_id=tx_info.chain_id,
+            nonce=tx_info.nonce,
+            resource_bounds_start=tx_info.resource_bounds_start,
+            resource_bounds_end=tx_info.resource_bounds_end,
+            tip=tx_info.tip,
+            paymaster_data_start=tx_info.paymaster_data_start,
+            paymaster_data_end=tx_info.paymaster_data_end,
+            nonce_data_availability_mode=tx_info.nonce_data_availability_mode,
+            fee_data_availability_mode=tx_info.fee_data_availability_mode,
+            account_deployment_data_start=tx_info.account_deployment_data_start,
+            account_deployment_data_end=tx_info.account_deployment_data_end,
+        );
+
+        static_assert GetExecutionInfoResponse.SIZE == 1;
+        assert [response.execution_info] = ExecutionInfo(
+            block_info=execution_info.block_info,
+            tx_info=response_tx_info,
+            caller_address=execution_info.caller_address,
+            contract_address=execution_info.contract_address,
+            selector=execution_info.selector,
+        );
+        return ();
+    }
+
+    assert [response] = GetExecutionInfoResponse(execution_info=execution_info);
     return ();
 }
 

cairo-lang-0.13.5/starkware/starknet/core/os/execution/version_bound_accounts.cairo

@@ -0,0 +1,51 @@
+from starkware.cairo.common.bool import FALSE, TRUE
+from starkware.cairo.common.math_cmp import is_le
+from starkware.starknet.core.os.constants import (
+    V1_BOUND_ACCOUNTS_CAIRO0_0,
+    V1_BOUND_ACCOUNTS_CAIRO0_1,
+    V1_BOUND_ACCOUNTS_CAIRO0_2,
+    V1_BOUND_ACCOUNTS_CAIRO0_3,
+    V1_BOUND_ACCOUNTS_CAIRO0_LEN,
+    V1_BOUND_ACCOUNTS_CAIRO1_0,
+    V1_BOUND_ACCOUNTS_CAIRO1_1,
+    V1_BOUND_ACCOUNTS_CAIRO1_2,
+    V1_BOUND_ACCOUNTS_CAIRO1_3,
+    V1_BOUND_ACCOUNTS_CAIRO1_4,
+    V1_BOUND_ACCOUNTS_CAIRO1_5,
+    V1_BOUND_ACCOUNTS_CAIRO1_6,
+    V1_BOUND_ACCOUNTS_CAIRO1_LEN,
+    V1_BOUND_ACCOUNTS_MAX_TIP,
+)
+
+// Returns TRUE for the hard-coded list of CairoZero class hashes that are version-bound to v1
+// transactions.
+func is_v1_bound_account_cairo0(class_hash: felt) -> felt {
+    static_assert V1_BOUND_ACCOUNTS_CAIRO0_LEN == 4;
+    if ((class_hash - V1_BOUND_ACCOUNTS_CAIRO0_0) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO0_1) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO0_2) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO0_3) == 0) {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+// Returns TRUE for the hard-coded list of Cairo1 class hashes that are version-bound to v1
+// transactions.
+func is_v1_bound_account_cairo1(class_hash: felt) -> felt {
+    static_assert V1_BOUND_ACCOUNTS_CAIRO1_LEN == 7;
+    if ((class_hash - V1_BOUND_ACCOUNTS_CAIRO1_0) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_1) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_2) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_3) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_4) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_5) *
+        (class_hash - V1_BOUND_ACCOUNTS_CAIRO1_6) == 0) {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+func check_tip_for_v1_bound_accounts{range_check_ptr}(tip: felt) -> felt {
+    return is_le(tip, V1_BOUND_ACCOUNTS_MAX_TIP);
+}

cairo-lang-0.13.5/starkware/starknet/core/os/execution/version_bound_accounts.py

@@ -0,0 +1,23 @@
+import functools
+from typing import FrozenSet
+
+from starkware.starknet.definitions.constants import get_versioned_constants_json
+
+
+@functools.lru_cache()
+def get_v1_bound_accounts_cairo0() -> FrozenSet[int]:
+    hex_list = get_versioned_constants_json()["os_constants"]["v1_bound_accounts_cairo0"]
+    return frozenset(int(x, 16) for x in hex_list)
+
+
+@functools.lru_cache()
+def get_v1_bound_accounts_cairo1() -> FrozenSet[int]:
+    hex_list = get_versioned_constants_json()["os_constants"]["v1_bound_accounts_cairo1"]
+    return frozenset(int(x, 16) for x in hex_list)
+
+
+@functools.lru_cache()
+def get_v1_bound_accounts_max_tip() -> int:
+    hex_val = get_versioned_constants_json()["os_constants"]["v1_bound_accounts_max_tip"]
+    assert hex_val.startswith("0x")
+    return int(hex_val, 16)

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/os_logger.py

@@ -1,3 +1,4 @@
+from collections import Counter
 from typing import Dict, List, Optional
 
 import cachetools
@@ -34,6 +35,7 @@ CALL_CONTRACT_SYSCALLS = {
     *DEPRECATED_CALL_CONTRACT_SYSCALLS,
 }
 
+
 DEPRECATED_SYSCALL_NAMES = {
     "delegate_call",
     "delegate_l1_handler",
@@ -139,10 +141,10 @@ class SyscallTrace:
             if len(self.resources.builtin_instance_counter) > 0
             else ""
         )
-        syscall_name_set = set(syscall.name for syscall in self.inner_syscalls)
+        syscall_name_counter = Counter(syscall.name for syscall in self.inner_syscalls)
         inner_syscalls = (
-            f"\n{'  '*(self.tab_count+1)}Inner syscalls: {syscall_name_set}"
-            if len(syscall_name_set) > 0
+            f"\n{'  '*(self.tab_count+1)}Inner syscalls: {syscall_name_counter}"
+            if len(syscall_name_counter) > 0
             else ""
         )
         return f"""\
@@ -292,7 +294,8 @@ class OsLogger:
         )
         self.syscall_stack.append(syscall)
         deprecated_str = "deprecated " if deprecated else ""
-        self.log(msg=f"Entering {deprecated_str}{syscall.name}.", enter=True)
+        if syscall.name in CALL_CONTRACT_SYSCALLS:
+            self.log(msg=f"Entering {deprecated_str}{syscall.name}.", enter=True)
 
     def exit_syscall(
         self,
@@ -316,8 +319,8 @@ class OsLogger:
         current_syscall.finalize_resources(
             resources=exit_resources_counter.sub_counter(enter_counter=enter_resources_counter)
         )
-
-        self.log(msg=f"Exiting {current_syscall}.\n", enter=False)
+        if current_syscall.name in CALL_CONTRACT_SYSCALLS:
+            self.log(msg=f"Exiting {current_syscall}.\n", enter=False)
         if len(self.syscall_stack) > 0:
             # Handle the case of inner syscalls.
             self.syscall_stack[-1].inner_syscalls.append(current_syscall)
@@ -349,7 +352,7 @@ class OsLogger:
         builtin_ptrs: VmConstsReference,
         range_check_ptr: RelocatableValue,
     ):
-        assert self.current_tx is not None, "No transaction sould exit without entering."
+        assert self.current_tx is not None, "No transaction should exit without entering."
         assert len(self.syscall_stack) == 0, "All Syscalls should end when exiting a transaction."
         enter_resources_counter = self.resource_counter_stack.pop()
         exit_resources_counter = ResourceCounter(

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/starknet_builtins.json

@@ -1,7 +1,7 @@
 {
     "attributes": [],
     "builtins": [],
-    "compiler_version": "0.13.4a1",
+    "compiler_version": "0.13.5",
     "data": [
         "0x208b7fff7fff7ffe",
         "0x20780017fff7ffd",

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/starknet_new_syscalls.json

@@ -1,7 +1,7 @@
 {
     "attributes": [],
     "builtins": [],
-    "compiler_version": "0.13.4a1",
+    "compiler_version": "0.13.5",
     "data": [],
     "debug_info": {
         "file_contents": {

{cairo-lang-0.13.4a1 → cairo-lang-0.13.5}/starkware/starknet/core/os/starknet_syscalls.json

@@ -1,7 +1,7 @@
 {
     "attributes": [],
     "builtins": [],
-    "compiler_version": "0.13.4a1",
+    "compiler_version": "0.13.5",
     "data": [
         "0x480680017fff8000",
         "0x43616c6c436f6e7472616374",