cairo-lang 0.13.2a0__zip → 0.13.3__zip

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.2a0
+Version: 0.13.3
 Summary: Compiler and runner for the Cairo language
 Home-page: https://cairo-lang.org/
 Author: Starkware
@@ -22,7 +22,7 @@ We recommend starting from [Setting up the environment](https://cairo-lang.org/d
 # Installation instructions
 
 You should be able to download the python package zip file directly from
-[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.3)
 and install it using ``pip``.
 See [Setting up the environment](https://cairo-lang.org/docs/quickstart.html).
 
@@ -64,7 +64,7 @@ Once the docker image is built, you can fetch the python package zip file using:
 
 ```bash
 > container_id=$(docker create cairo)
-> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.3.zip .
 > docker rm -v ${container_id}
 ```
 

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/README.md

@@ -12,7 +12,7 @@ We recommend starting from [Setting up the environment](https://cairo-lang.org/d
 # Installation instructions
 
 You should be able to download the python package zip file directly from
-[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.3)
 and install it using ``pip``.
 See [Setting up the environment](https://cairo-lang.org/docs/quickstart.html).
 
@@ -54,7 +54,7 @@ Once the docker image is built, you can fetch the python package zip file using:
 
 ```bash
 > container_id=$(docker create cairo)
-> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.3.zip .
 > docker rm -v ${container_id}
 ```
 

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/cairo_lang.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.2a0
+Version: 0.13.3
 Summary: Compiler and runner for the Cairo language
 Home-page: https://cairo-lang.org/
 Author: Starkware
@@ -22,7 +22,7 @@ We recommend starting from [Setting up the environment](https://cairo-lang.org/d
 # Installation instructions
 
 You should be able to download the python package zip file directly from
-[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.3)
 and install it using ``pip``.
 See [Setting up the environment](https://cairo-lang.org/docs/quickstart.html).
 
@@ -64,7 +64,7 @@ Once the docker image is built, you can fetch the python package zip file using:
 
 ```bash
 > container_id=$(docker create cairo)
-> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.3.zip .
 > docker rm -v ${container_id}
 ```
 

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/cairo_lang.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ starkware/cairo/common/bitwise.cairo
 starkware/cairo/common/bool.cairo
 starkware/cairo/common/cairo_builtins.cairo
 starkware/cairo/common/cairo_function_runner.py
+starkware/cairo/common/copy_indices.cairo
 starkware/cairo/common/default_dict.cairo
 starkware/cairo/common/dict.cairo
 starkware/cairo/common/dict.py
@@ -64,6 +65,7 @@ starkware/cairo/common/hash_state_poseidon.cairo
 starkware/cairo/common/invoke.cairo
 starkware/cairo/common/keccak.cairo
 starkware/cairo/common/keccak_state.cairo
+starkware/cairo/common/log2_ceil.cairo
 starkware/cairo/common/math.cairo
 starkware/cairo/common/math_cmp.cairo
 starkware/cairo/common/math_utils.py
@@ -428,11 +430,19 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/stor
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/syscalls.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/testing.cairo
 starkware/starknet/core/__init__.py
+starkware/starknet/core/aggregator/__init__.py
+starkware/starknet/core/aggregator/output_parser.py
+starkware/starknet/core/aggregator/utils.py
 starkware/starknet/core/os/__init__.py
+starkware/starknet/core/os/block_context.cairo
+starkware/starknet/core/os/builtins.cairo
+starkware/starknet/core/os/constants.cairo
 starkware/starknet/core/os/deprecated_syscall_handler.py
 starkware/starknet/core/os/kzg_manager.py
+starkware/starknet/core/os/os.cairo
 starkware/starknet/core/os/os_logger.py
 starkware/starknet/core/os/os_utils.py
+starkware/starknet/core/os/output.cairo
 starkware/starknet/core/os/segment_utils.py
 starkware/starknet/core/os/starknet_builtins.json
 starkware/starknet/core/os/starknet_new_syscalls.json
@@ -455,8 +465,25 @@ starkware/starknet/core/os/contract_class/contract_class.cairo
 starkware/starknet/core/os/contract_class/deprecated_class_hash.py
 starkware/starknet/core/os/contract_class/deprecated_compiled_class.cairo
 starkware/starknet/core/os/contract_class/utils.py
+starkware/starknet/core/os/data_availability/__init__.py
+starkware/starknet/core/os/data_availability/bls_field.cairo
+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/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/os_config/os_config.cairo
+starkware/starknet/core/os/state/commitment.cairo
+starkware/starknet/core/os/state/output.cairo
+starkware/starknet/core/os/state/squash.cairo
+starkware/starknet/core/os/state/state.cairo
 starkware/starknet/core/os/transaction_hash/__init__.py
 starkware/starknet/core/os/transaction_hash/deprecated_transaction_hash.py
+starkware/starknet/core/os/transaction_hash/transaction_hash.cairo
 starkware/starknet/core/os/transaction_hash/transaction_hash.py
 starkware/starknet/core/test_contract/__init__.py
 starkware/starknet/core/test_contract/delegate_proxy.json
@@ -473,6 +500,7 @@ starkware/starknet/definitions/fields.py
 starkware/starknet/definitions/general_config.py
 starkware/starknet/definitions/general_config.yml
 starkware/starknet/definitions/l1_da_mode.py
+starkware/starknet/definitions/overridable_versioned_constants.py
 starkware/starknet/definitions/transaction_type.py
 starkware/starknet/definitions/versioned_constants.json
 starkware/starknet/public/__init__.py

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/cairo_lang.egg-info/requires.txt

@@ -7,7 +7,7 @@ fastecdsa
 frozendict
 gprof2dot
 lark
-marshmallow-dataclass>=7.1.0
+marshmallow-dataclass==8.6.1
 marshmallow-enum
 marshmallow-oneofschema
 marshmallow>=3.2.1

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/requirements.txt

@@ -7,7 +7,7 @@ fastecdsa
 frozendict
 gprof2dot
 lark
-marshmallow-dataclass>=7.1.0
+marshmallow-dataclass==8.6.1
 marshmallow-enum
 marshmallow-oneofschema
 marshmallow>=3.2.1

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/cairo/common/cairo_sha256/sha256_utils.cairo

@@ -480,7 +480,7 @@ func finalize_sha256{range_check_ptr, bitwise_ptr: BitwiseBuiltin*}(
             sha2_compress_function,
         )
 
-        number_of_missing_blocks = -ids.n % ids.BATCH_SIZE
+        number_of_missing_blocks = (-ids.n) % ids.BATCH_SIZE
         assert 0 <= number_of_missing_blocks < 20
         _sha256_input_chunk_size_felts = ids.SHA256_INPUT_CHUNK_SIZE_FELTS
         assert 0 <= _sha256_input_chunk_size_felts < 100
@@ -488,7 +488,7 @@ func finalize_sha256{range_check_ptr, bitwise_ptr: BitwiseBuiltin*}(
         message = [0] * _sha256_input_chunk_size_felts
         w = compute_message_schedule(message)
         output = sha2_compress_function(IV, w)
-        padding = (message + IV + output) * (number_of_missing_blocks)
+        padding = (message + IV + output) * number_of_missing_blocks
         segments.write_arg(ids.sha256_ptr_end, padding)
     %}
 

cairo-lang-0.13.3/starkware/cairo/common/copy_indices.cairo

@@ -0,0 +1,36 @@
+// Copies len field elements from src to dst at the given indices.
+// I.e., dst = [src[i] for i in indices].
+func copy_indices(dst: felt*, src: felt*, indices: felt*, len: felt) {
+    struct LoopFrame {
+        dst: felt*,
+        indices: felt*,
+    }
+
+    if (len == 0) {
+        return ();
+    }
+
+    %{ vm_enter_scope({'n': ids.len}) %}
+    tempvar frame = LoopFrame(dst=dst, indices=indices);
+
+    loop:
+    let frame = [cast(ap - LoopFrame.SIZE, LoopFrame*)];
+    assert [frame.dst] = src[[frame.indices]];
+
+    let continue_copying = [ap];
+    // Reserve space for continue_copying.
+    let next_frame = cast(ap + 1, LoopFrame*);
+    next_frame.dst = frame.dst + 1, ap++;
+    next_frame.indices = frame.indices + 1, ap++;
+    %{
+        n -= 1
+        ids.continue_copying = 1 if n > 0 else 0
+    %}
+    static_assert next_frame + LoopFrame.SIZE == ap + 1;
+    jmp loop if continue_copying != 0, ap++;
+    // Assert that the loop executed len times.
+    len = cast(next_frame.indices, felt) - cast(indices, felt);
+
+    %{ vm_exit_scope() %}
+    return ();
+}

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/cairo/common/ec.cairo

@@ -137,6 +137,7 @@ func ec_op{ec_op_ptr: EcOpBuiltin*}(p: EcPoint, m: felt, q: EcPoint) -> (r: EcPo
         seed = b"".join(map(to_bytes, [ids.p.x, ids.p.y, ids.m, ids.q.x, ids.q.y]))
         ids.s.x, ids.s.y = random_ec_point(FIELD_PRIME, ALPHA, BETA, seed)
     %}
+    assert_on_curve(s);
     let p_plus_s: EcPoint = ec_add(p, s);
 
     assert ec_op_ptr.p = p_plus_s;
@@ -217,6 +218,7 @@ func chained_ec_op{ec_op_ptr: EcOpBuiltin*}(p: EcPoint, m: felt*, q: EcPoint*, l
         )
         ids.s.x, ids.s.y = random_ec_point(FIELD_PRIME, ALPHA, BETA, seed)
     %}
+    assert_on_curve(s);
     let p_plus_s: EcPoint = ec_add(p, s);
     let r_plus_s: EcPoint = _chained_ec_op_inner(p=p_plus_s, m=m, q=q, len=len);
     let r: EcPoint = ec_add(r_plus_s, EcPoint(x=s.x, y=-s.y));

cairo-lang-0.13.3/starkware/cairo/common/log2_ceil.cairo

@@ -0,0 +1,28 @@
+from starkware.cairo.common.math import assert_in_range, assert_not_zero
+from starkware.cairo.common.pow import pow
+
+// Returns the ceil value of the log2 of the given value.
+// Enforces that 1 <= value <= RANGE_CHECK_BOUND.
+func log2_ceil{range_check_ptr}(value: felt) -> felt {
+    alloc_locals;
+    assert_not_zero(value);
+    if (value == 1) {
+        return 0;
+    }
+
+    local res;
+    %{
+        from starkware.python.math_utils import log2_ceil
+        ids.res = log2_ceil(ids.value)
+    %}
+
+    // Verify that 1 <= 2**(res - 1) < value <= 2**res <= RANGE_CHECK_BOUND.
+    // The RANGE_CHECK_BOUND bound is required by the `assert_in_range` function.
+    assert_in_range(res, 1, 128 + 1);
+    let (lower_bound) = pow(2, res - 1);
+    let min = lower_bound + 1;
+    let max = 2 * lower_bound;
+    assert_in_range(value, min, max + 1);
+
+    return res;
+}

cairo-lang-0.13.3/starkware/cairo/lang/VERSION

@@ -0,0 +1 @@
+0.13.3

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/cairo/lang/builtins/modulo/mod_builtin_runner.py

@@ -129,13 +129,6 @@ class ModBuiltinRunner(SimpleBuiltinRunnerWithLowRatio):
     def finalize_segments(self, runner):
         super().finalize_segments(runner)
 
-    def get_additional_data(self):
-        assert self.zero_value is not None, "Uninitialized self.zero_value."
-        return [list(RelocatableValue.to_tuple(self.zero_value))]
-
-    def extend_additional_data(self, data, relocate_callback, data_is_trusted=True):
-        self.zero_value = relocate_callback(RelocatableValue.from_tuple(data[0]))
-
     # The structure of the values in the returned dictionary is of the form:
     # {keys = INPUT_NAMES, "batch": {index_in_batch: {keys = MEMORY_VAR_NAMES}}}.
     def air_private_input(self, runner) -> Dict[str, Any]:

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/starknet/business_logic/execution/execute_entry_point.py

@@ -40,7 +40,7 @@ from starkware.starknet.core.os import os_utils, syscall_utils
 from starkware.starknet.core.os.deprecated_syscall_handler import DeprecatedBlSyscallHandler
 from starkware.starknet.core.os.syscall_handler import BusinessLogicSyscallHandler
 from starkware.starknet.definitions import fields
-from starkware.starknet.definitions.constants import GasCost
+from starkware.starknet.definitions.constants import VERSIONED_CONSTANTS, GasCost
 from starkware.starknet.definitions.error_codes import StarknetErrorCode
 from starkware.starknet.definitions.execution_mode import ExecutionMode
 from starkware.starknet.definitions.general_config import (
@@ -133,7 +133,7 @@ class ExecuteEntryPoint(ExecuteEntryPointBase):
             state=state,
             resources_manager=ExecutionResourcesManager.empty(),
             tx_execution_context=TransactionExecutionContext.create_for_testing(
-                n_steps=general_config.invoke_tx_max_n_steps
+                n_steps=VERSIONED_CONSTANTS.invoke_tx_max_n_steps,
             ),
             general_config=general_config,
             support_reverted=support_reverted,
@@ -146,10 +146,13 @@ class ExecuteEntryPoint(ExecuteEntryPointBase):
         resources_manager: Optional[ExecutionResourcesManager] = None,
         tx_execution_context: Optional[TransactionExecutionContext] = None,
         execution_mode: ExecutionMode = ExecutionMode.EXECUTE,
+        invoke_tx_max_n_steps: Optional[int] = None,
     ) -> CallInfo:
+        if invoke_tx_max_n_steps is None:
+            invoke_tx_max_n_steps = VERSIONED_CONSTANTS.invoke_tx_max_n_steps
         if tx_execution_context is None:
             tx_execution_context = TransactionExecutionContext.create_for_testing(
-                n_steps=general_config.invoke_tx_max_n_steps, execution_mode=execution_mode
+                n_steps=invoke_tx_max_n_steps, execution_mode=execution_mode
             )
 
         if resources_manager is None:

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/starknet/business_logic/fact_state/contract_state_objects.py

@@ -138,9 +138,14 @@ class ContractState(ValidatedMarshmallowDataclass, LeafFact):
             nonce=nonce,
         )
 
-    async def fetch_witnesses(self, ffc: FactFetchingContext, updates: Mapping[int, int]):
+    async def fetch_storage_witnesses(
+        self, ffc: FactFetchingContext, updates: Mapping[int, int], get_leaves: bool
+    ):
         await self.storage_commitment_tree.fetch_witnesses(
-            ffc=ffc, sorted_leaf_indices=sorted(updates.keys()), fact_cls=StorageLeaf
+            ffc=ffc,
+            sorted_leaf_indices=sorted(updates.keys()),
+            fact_cls=StorageLeaf if get_leaves else None,
+            empty_leaf=StorageLeaf.empty(),
         )
 
 

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/starknet/business_logic/fact_state/state.py

@@ -35,6 +35,7 @@ from starkware.starknet.business_logic.fact_state.utils import (
 from starkware.starknet.business_logic.state.state import CachedState
 from starkware.starknet.business_logic.state.state_api import StateReader
 from starkware.starknet.business_logic.state.state_api_objects import BlockInfo
+from starkware.starknet.core.aggregator.output_parser import ContractChanges, OsStateDiff
 from starkware.starknet.definitions import constants, fields
 from starkware.starknet.definitions.data_availability_mode import DataAvailabilityMode
 from starkware.starknet.definitions.general_config import StarknetGeneralConfig
@@ -224,10 +225,7 @@ class SharedState(SharedStateBase):
         return cls(
             contract_states=empty_contract_states,
             contract_classes=empty_contract_classes,
-            block_info=BlockInfo.empty(
-                sequencer_address=general_config.sequencer_address,
-                use_kzg_da=general_config.use_kzg_da,
-            ),
+            block_info=BlockInfo.empty(sequencer_address=general_config.sequencer_address),
         )
 
     async def get_contract_class_tree(
@@ -388,7 +386,12 @@ class SharedState(SharedStateBase):
             block_info=block_info,
         )
 
-    async def fetch_witnesses(self, cached_ffc: FactFetchingContext, state_diff: "StateDiff"):
+    async def fetch_all_witnesses(
+        self,
+        cached_ffc: FactFetchingContext,
+        state_diff: "StateDiff",
+        get_leaves: bool,
+    ):
         """
         Fetches the necessary witnesses from storage to update the state with the provided diff.
         """
@@ -400,34 +403,42 @@ class SharedState(SharedStateBase):
         accessed_addresses = (
             address_to_class_hash.keys() | address_to_nonce.keys() | storage_updates.keys()
         )
-        current_contract_states = await self.contract_states.get_leaves(
-            ffc=cached_ffc, indices=accessed_addresses, fact_cls=ContractState
+
+        # Fetch global tree's witnesses.
+        contract_states = await self.contract_states.fetch_witnesses(
+            ffc=cached_ffc,
+            sorted_leaf_indices=sorted(accessed_addresses),
+            fact_cls=ContractState,
+            empty_leaf=await ContractState.empty(
+                storage_commitment_tree_height=constants.CONTRACT_STATES_COMMITMENT_TREE_HEIGHT,
+                ffc=cached_ffc,
+            ),
+        )
+
+        # Fetch classes tree's witnesses.
+        classes_tree_awaitable = (
+            [
+                self.contract_classes.fetch_witnesses(
+                    ffc=cached_ffc,
+                    sorted_leaf_indices=sorted(class_hash_to_compiled_class_hash.keys()),
+                    fact_cls=ContractClassLeaf if get_leaves else None,
+                    empty_leaf=ContractClassLeaf.empty(),
+                )
+            ]
+            if self.contract_classes is not None
+            else []
         )
 
         await gather_in_chunks(
             awaitables=[
-                current_contract_states[address].fetch_witnesses(ffc=cached_ffc, updates=updates)
+                contract_states[address].fetch_storage_witnesses(
+                    ffc=cached_ffc, updates=updates, get_leaves=get_leaves
+                )
                 for address, updates in storage_updates.items()
             ]
+            + classes_tree_awaitable
         )
 
-        # Fetch global tree's witnesses.
-        await self.contract_states.fetch_witnesses(
-            ffc=cached_ffc, sorted_leaf_indices=sorted(accessed_addresses), fact_cls=ContractState
-        )
-
-        # Fetch classes tree's witnesses.
-        if self.contract_classes is not None:
-            await self.contract_classes.fetch_witnesses(
-                ffc=cached_ffc,
-                sorted_leaf_indices=sorted(class_hash_to_compiled_class_hash.keys()),
-                fact_cls=ContractClassLeaf,
-            )
-        else:
-            assert (
-                len(class_hash_to_compiled_class_hash) == 0
-            ), "contract_classes must be concrete before fetch."
-
 
 @marshmallow_dataclass.dataclass(frozen=True)
 class StateDiff(EverestStateDiff, DBObject):
@@ -445,6 +456,7 @@ class StateDiff(EverestStateDiff, DBObject):
     declared_classes: Mapping[int, int] = field(
         metadata=fields.state_diff_declared_classes_metadata
     )
+    # The block after this StateDiff is applied.
     block_info: BlockInfo
 
     @marshmallow.pre_load
@@ -468,14 +480,6 @@ class StateDiff(EverestStateDiff, DBObject):
 
         return data
 
-    async def write(self, storage: Storage) -> bytes:
-        """
-        Writes an entry containing the state diff to the storage under its hash, as a fact object.
-        """
-        hash_value = self.calculate_hash()
-        await self.set(storage=storage, suffix=hash_value)
-        return hash_value
-
     @classmethod
     def empty(cls, block_info: BlockInfo):
         """
@@ -489,6 +493,32 @@ class StateDiff(EverestStateDiff, DBObject):
             block_info=block_info,
         )
 
+    async def write(self, storage: Storage, batch_id: int) -> bytes:
+        """
+        Writes the state diff to the storage under the given batch_id.
+        Returns the key suffix (serialized batch_id).
+        """
+        suffix = str(batch_id).encode("ascii")
+        await self.set(storage=storage, suffix=suffix)
+        return suffix
+
+    @classmethod
+    def create_l1_da_mode(
+        cls,
+        address_to_class_hash: Mapping[int, int],
+        nonces: Mapping[int, int],
+        storage_updates: Mapping[int, Mapping[int, int]],
+        declared_classes: Mapping[int, int],
+        block_info: BlockInfo,
+    ) -> "StateDiff":
+        return cls(
+            address_to_class_hash=address_to_class_hash,
+            nonces={DataAvailabilityMode.L1: nonces},
+            storage_updates={DataAvailabilityMode.L1: storage_updates},
+            declared_classes=declared_classes,
+            block_info=block_info,
+        )
+
     @classmethod
     def from_cached_state(cls, cached_state: CachedState) -> "StateDiff":
         state_cache = cached_state.cache
@@ -571,6 +601,91 @@ class StateDiff(EverestStateDiff, DBObject):
             block_info=self.block_info,
         )
 
+    def get_os_encoded_length(self) -> int:
+        """
+        Returns the length of the OS encoded representation of the state diff.
+        See src/starkware/starknet/core/os/state/output.cairo.
+        """
+        return len(self.to_os_state_diff().encode())
+
+    def get_marginal_os_encoded_length(self, previous_state_diff: Optional["StateDiff"]) -> int:
+        """
+        Returns the marginal addition of self to the given state diff's length.
+
+        E.g., the following are equivalent:
+          * (a + b).get_os_encoded_length()
+          * a.get_os_encoded_length() + b.get_marginal_os_encoded_length(a)
+        """
+        if previous_state_diff is None:
+            return self.get_os_encoded_length()
+
+        pre_squash_size = previous_state_diff.get_os_encoded_length()
+        post_squash_size = previous_state_diff.squash(other=self).get_os_encoded_length()
+        return post_squash_size - pre_squash_size
+
+    def to_os_state_diff(self) -> OsStateDiff:
+        self.assert_l1_da_mode()
+        nonces = self.nonces.get(DataAvailabilityMode.L1, {})
+        storage_updates = self.storage_updates.get(DataAvailabilityMode.L1, {})
+        modified_contracts = sorted(
+            self.address_to_class_hash.keys() | nonces.keys() | storage_updates.keys()
+        )
+        return OsStateDiff(
+            contracts=[
+                ContractChanges(
+                    addr=addr,
+                    new_nonce=nonces.get(addr, None),
+                    new_class_hash=self.address_to_class_hash.get(addr, None),
+                    storage_changes={
+                        key: (None, value) for key, value in storage_updates.get(addr, {}).items()
+                    },
+                    # Only relevant for `full_output` mode.
+                    prev_nonce=None,
+                    prev_class_hash=None,
+                )
+                for addr in modified_contracts
+            ],
+            classes={
+                class_hash: (None, compiled_class_hash)
+                for class_hash, compiled_class_hash in self.declared_classes.items()
+            },
+        )
+
+    @classmethod
+    def from_os_state_diff(cls, os_state_diff: OsStateDiff, block_info: BlockInfo) -> "StateDiff":
+        contracts = os_state_diff.contracts
+        return cls.create_l1_da_mode(
+            address_to_class_hash={
+                contract.addr: contract.new_class_hash
+                for contract in contracts
+                if contract.new_class_hash is not None
+            },
+            nonces={
+                contract.addr: contract.new_nonce
+                for contract in contracts
+                if contract.new_nonce is not None
+            },
+            storage_updates={
+                contract.addr: {
+                    key: value for key, (_prev, value) in contract.storage_changes.items()
+                }
+                for contract in contracts
+                if len(contract.storage_changes) > 0
+            },
+            declared_classes={
+                class_hash: compiled_class_hash
+                for class_hash, (_prev, compiled_class_hash) in os_state_diff.classes.items()
+            },
+            block_info=block_info,
+        )
+
+    def assert_l1_da_mode(self):
+        supported_da_modes = {DataAvailabilityMode.L1}
+        unsupported_da_modes = (
+            set(self.nonces.keys() | self.storage_updates.keys()) - supported_da_modes
+        )
+        assert len(unsupported_da_modes) == 0, f"Unsupported DA modes: {unsupported_da_modes}."
+
 
 @marshmallow_dataclass.dataclass(frozen=True)
 class DeprecatedStateDiff(EverestStateDiff, DBObject):

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/starknet/business_logic/state/state_api_objects.py

@@ -92,7 +92,7 @@ class BlockInfo(ValidatedMarshmallowDataclass):
     # The sequencer address of this block.
     sequencer_address: Optional[int] = field(metadata=fields.optional_sequencer_address_metadata)
 
-    # The version of Starknet system (e.g., "0.13.2").
+    # The version of Starknet system (e.g., "0.13.3").
     starknet_version: Optional[str] = field(metadata=fields.starknet_version_metadata)
 
     # Indicates whether to use KZG commitment scheme for the block's Data Avilability.
@@ -105,19 +105,19 @@ class BlockInfo(ValidatedMarshmallowDataclass):
         return rename_old_gas_price_fields(data=data)
 
     @classmethod
-    def empty(cls, sequencer_address: Optional[int], use_kzg_da: bool) -> "BlockInfo":
+    def empty(cls, sequencer_address: Optional[int], block_number: int = -1) -> "BlockInfo":
         """
         Returns an empty BlockInfo object; i.e., the one before the first in the chain.
         """
         return cls(
-            block_number=-1,
+            block_number=block_number,
             block_timestamp=0,
             # As gas prices must be non-zero, just use 1 for all prices.
             l1_gas_price=ResourcePrice(price_in_wei=1, price_in_fri=1),
             l1_data_gas_price=ResourcePrice(price_in_wei=1, price_in_fri=1),
             sequencer_address=sequencer_address,
             starknet_version=STARKNET_VERSION,
-            use_kzg_da=use_kzg_da,
+            use_kzg_da=True,  # Value is ignored for an empty block.
         )
 
     @classmethod

{cairo-lang-0.13.2a0 → cairo-lang-0.13.3}/starkware/starknet/business_logic/transaction/deprecated_objects.py

@@ -282,7 +282,8 @@ class DeprecatedInternalAccountTransaction(DeprecatedInternalTransaction):
             resources_manager=resources_manager,
             general_config=general_config,
             tx_execution_context=self.get_execution_context(
-                n_steps=general_config.validate_max_n_steps, execution_mode=ExecutionMode.VALIDATE
+                n_steps=general_config.get_validate_max_n_steps(),
+                execution_mode=ExecutionMode.VALIDATE,
             ),
         )
 
@@ -336,7 +337,8 @@ class DeprecatedInternalAccountTransaction(DeprecatedInternalTransaction):
             general_config=general_config,
             state=state,
             tx_execution_context=self.get_execution_context(
-                n_steps=general_config.invoke_tx_max_n_steps, execution_mode=ExecutionMode.EXECUTE
+                n_steps=constants.VERSIONED_CONSTANTS.invoke_tx_max_n_steps,
+                execution_mode=ExecutionMode.EXECUTE,
             ),
             actual_fee=actual_fee,
         )
@@ -885,7 +887,8 @@ class DeprecatedInternalDeployAccount(DeprecatedInternalAccountTransaction):
             resources_manager=resources_manager,
             general_config=general_config,
             tx_execution_context=self.get_execution_context(
-                n_steps=general_config.validate_max_n_steps, execution_mode=ExecutionMode.VALIDATE
+                n_steps=general_config.get_validate_max_n_steps(),
+                execution_mode=ExecutionMode.VALIDATE,
             ),
         )
 
@@ -1098,7 +1101,7 @@ class InternalDeploy(DeprecatedInternalTransaction):
             signature=[],
             max_fee=0,
             nonce=0,
-            n_steps=general_config.invoke_tx_max_n_steps,
+            n_steps=constants.VERSIONED_CONSTANTS.invoke_tx_max_n_steps,
             version=self.version,
             execution_mode=ExecutionMode.EXECUTE,
         )
@@ -1384,7 +1387,7 @@ class DeprecatedInternalInvokeFunction(DeprecatedInternalAccountTransaction):
             resources_manager=resources_manager,
             general_config=general_config,
             tx_execution_context=self.get_execution_context(
-                n_steps=general_config.invoke_tx_max_n_steps,
+                n_steps=constants.VERSIONED_CONSTANTS.invoke_tx_max_n_steps,
                 execution_mode=ExecutionMode.EXECUTE,
             ),
         )
@@ -1510,7 +1513,7 @@ class InternalL1Handler(DeprecatedInternalTransaction):
             resources_manager=resources_manager,
             general_config=general_config,
             tx_execution_context=self.get_execution_context(
-                n_steps=general_config.invoke_tx_max_n_steps
+                n_steps=constants.VERSIONED_CONSTANTS.invoke_tx_max_n_steps,
             ),
         )