cairo-lang 0.13.1a0__zip → 0.13.2a0__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.1a0
+Version: 0.13.2a0
 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.1)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
 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.1.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
 > docker rm -v ${container_id}
 ```
 

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/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.1)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
 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.1.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
 > docker rm -v ${container_id}
 ```
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cairo-lang
-Version: 0.13.1a0
+Version: 0.13.2a0
 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.1)
+[github](https://github.com/starkware-libs/cairo-lang/releases/tag/v0.13.2)
 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.1.zip .
+> docker cp ${container_id}:/app/cairo-lang-0.13.2.zip .
 > docker rm -v ${container_id}
 ```
 

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

@@ -36,6 +36,7 @@ services/external_api/utils.py
 starkware/__init__.py
 starkware/cairo/__init__.py
 starkware/cairo/bootloaders/__init__.py
+starkware/cairo/bootloaders/aggregator_utils.py
 starkware/cairo/bootloaders/compute_fact.py
 starkware/cairo/bootloaders/fact_topology.py
 starkware/cairo/bootloaders/generate_fact.py
@@ -70,6 +71,7 @@ starkware/cairo/common/memcpy.cairo
 starkware/cairo/common/memset.cairo
 starkware/cairo/common/merkle_multi_update.cairo
 starkware/cairo/common/merkle_update.cairo
+starkware/cairo/common/modulo.cairo
 starkware/cairo/common/patricia.cairo
 starkware/cairo/common/patricia_utils.cairo
 starkware/cairo/common/patricia_utils.py
@@ -83,6 +85,7 @@ starkware/cairo/common/registers.cairo
 starkware/cairo/common/segments.cairo
 starkware/cairo/common/serialize.cairo
 starkware/cairo/common/set.cairo
+starkware/cairo/common/sha256_state.cairo
 starkware/cairo/common/signature.cairo
 starkware/cairo/common/small_merkle_tree.cairo
 starkware/cairo/common/small_merkle_tree.py
@@ -112,6 +115,7 @@ starkware/cairo/common/cairo_secp/secp256r1_utils.py
 starkware/cairo/common/cairo_secp/secp_utils.py
 starkware/cairo/common/cairo_secp/signature.cairo
 starkware/cairo/common/cairo_sha256/__init__.py
+starkware/cairo/common/cairo_sha256/sha256_utils.cairo
 starkware/cairo/common/cairo_sha256/sha256_utils.py
 starkware/cairo/common/keccak_utils/__init__.py
 starkware/cairo/common/keccak_utils/keccak_utils.cairo
@@ -143,6 +147,9 @@ starkware/cairo/lang/builtins/hash/instance_def.py
 starkware/cairo/lang/builtins/keccak/__init__.py
 starkware/cairo/lang/builtins/keccak/instance_def.py
 starkware/cairo/lang/builtins/keccak/keccak_builtin_runner.py
+starkware/cairo/lang/builtins/modulo/__init__.py
+starkware/cairo/lang/builtins/modulo/instance_def.py
+starkware/cairo/lang/builtins/modulo/mod_builtin_runner.py
 starkware/cairo/lang/builtins/poseidon/__init__.py
 starkware/cairo/lang/builtins/poseidon/instance_def.py
 starkware/cairo/lang/builtins/poseidon/poseidon_builtin_runner.py
@@ -369,6 +376,7 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/boolean.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/box.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/byte_array.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/bytes_31.cairo
+starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/circuit.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/clone.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/cmp.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/debug.cairo
@@ -381,12 +389,14 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/gas.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/hash.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/integer.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/internal.cairo
+starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/iter.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/keccak.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/lib.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/math.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/metaprogramming.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/nullable.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/num.cairo
+starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/ops.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/option.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/panics.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/pedersen.cairo
@@ -394,6 +404,7 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/poseidon.cair
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/prelude.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/result.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/serde.cairo
+starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/sha256.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/string.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/test.cairo
@@ -402,6 +413,7 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/to_byte_array
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/traits.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/zeroable.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/account.cairo
+starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/address_helper.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/class_hash.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/contract_address.cairo
 starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/eth_address.cairo
@@ -418,6 +430,7 @@ starkware/starknet/compiler/v1/sierra-compiler-major-1/corelib/src/starknet/test
 starkware/starknet/core/__init__.py
 starkware/starknet/core/os/__init__.py
 starkware/starknet/core/os/deprecated_syscall_handler.py
+starkware/starknet/core/os/kzg_manager.py
 starkware/starknet/core/os/os_logger.py
 starkware/starknet/core/os/os_utils.py
 starkware/starknet/core/os/segment_utils.py
@@ -450,6 +463,7 @@ starkware/starknet/core/test_contract/delegate_proxy.json
 starkware/starknet/core/test_contract/dummy_account.json
 starkware/starknet/core/test_contract/test_utils.py
 starkware/starknet/definitions/__init__.py
+starkware/starknet/definitions/blockifier_types.py
 starkware/starknet/definitions/chain_ids.py
 starkware/starknet/definitions/constants.py
 starkware/starknet/definitions/data_availability_mode.py
@@ -460,7 +474,6 @@ starkware/starknet/definitions/general_config.py
 starkware/starknet/definitions/general_config.yml
 starkware/starknet/definitions/l1_da_mode.py
 starkware/starknet/definitions/transaction_type.py
-starkware/starknet/definitions/types.py
 starkware/starknet/definitions/versioned_constants.json
 starkware/starknet/public/__init__.py
 starkware/starknet/public/abi.py

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/services/config/general_config.py

@@ -3,6 +3,6 @@ import marshmallow_dataclass
 from starkware.starkware_utils.config_base import Config
 
 
-@marshmallow_dataclass.dataclass(frozen=True)
+@marshmallow_dataclass.dataclass
 class GeneralConfigBase(Config):
     pass

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/services/everest/definitions/fields.py

@@ -13,7 +13,11 @@ from starkware.python.utils import initialize_random
 from starkware.starkware_utils.error_handling import StarkErrorCode
 from starkware.starkware_utils.field_validators import validate_non_negative
 from starkware.starkware_utils.marshmallow_dataclass_fields import StrictRequiredInteger
-from starkware.starkware_utils.validated_fields import RangeValidatedField, ValidatedField
+from starkware.starkware_utils.validated_fields import (
+    OptionalField,
+    RangeValidatedField,
+    ValidatedField,
+)
 
 # Fields data: validation data, dataclass metadata.
 tx_id_marshmallow_field = StrictRequiredInteger(validate=validate_non_negative("tx_id"))
@@ -74,6 +78,8 @@ EthAddressIntField = RangeValidatedField(
     formatter=None,
 )
 
+EthAddressHexField = dataclasses.replace(EthAddressIntField, formatter=hex)
+
 FeltField = RangeValidatedField(
     lower_bound=0,
     upper_bound=FIELD_PRIME,
@@ -82,6 +88,8 @@ FeltField = RangeValidatedField(
     formatter=hex,
 )
 
+OptionalFeltField = OptionalField(field=FeltField, none_probability=0)
+
 felt_as_hex_list_metadata = dict(marshmallow_field=mfields.List(FeltField.get_marshmallow_field()))
 
 

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/services/everest/definitions/general_config.py

@@ -3,6 +3,6 @@ import marshmallow_dataclass
 from services.config.general_config import GeneralConfigBase
 
 
-@marshmallow_dataclass.dataclass(frozen=True)
+@marshmallow_dataclass.dataclass
 class EverestGeneralConfig(GeneralConfigBase):
     pass

cairo-lang-0.13.2a0/starkware/cairo/bootloaders/aggregator_utils.py

@@ -0,0 +1,28 @@
+from typing import List
+
+from starkware.cairo.lang.vm.crypto import pedersen_hash
+from starkware.python.utils import from_bytes
+
+
+def get_aggregator_input_size(program_output: List[int]) -> int:
+    """
+    Returns the size of the input to an aggregator program.
+    """
+    assert len(program_output) > 0, "Invalid program output for an aggregator program."
+    n_tasks = program_output[0]
+
+    offset = 1
+    for _ in range(n_tasks):
+        assert len(program_output) > offset, "Invalid program output for an aggregator program."
+        task_size = program_output[offset]
+        offset += task_size
+
+    return offset
+
+
+def add_aggregator_prefix(program_hash: int) -> int:
+    """
+    Computes H("AGGREGATOR", program_hash) which indicates that the program was treated by the
+    bootloader as an aggregator program.
+    """
+    return pedersen_hash(from_bytes(b"AGGREGATOR"), program_hash)

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/starkware/cairo/bootloaders/generate_fact.py

@@ -1,5 +1,10 @@
+import dataclasses
 from typing import List, Optional
 
+from starkware.cairo.bootloaders.aggregator_utils import (
+    add_aggregator_prefix,
+    get_aggregator_input_size,
+)
 from starkware.cairo.bootloaders.compute_fact import generate_program_fact
 from starkware.cairo.bootloaders.fact_topology import (
     FactInfo,
@@ -29,7 +34,9 @@ def get_program_output(cairo_pie: CairoPie) -> List[int]:
     ]
 
 
-def get_cairo_pie_fact_info(cairo_pie: CairoPie, program_hash: Optional[int] = None) -> FactInfo:
+def get_cairo_pie_fact_info(
+    cairo_pie: CairoPie, program_hash: Optional[int] = None, aggregator: bool = False
+) -> FactInfo:
     """
     Generates the fact of the Cairo program of cairo_pie. Returns the cairo-pie fact info.
     """
@@ -38,8 +45,29 @@ def get_cairo_pie_fact_info(cairo_pie: CairoPie, program_hash: Optional[int] = N
         output_size=len(program_output),
         output_builtin_additional_data=cairo_pie.additional_data["output_builtin"],
     )
+
     if program_hash is None:
         program_hash = get_program_hash(cairo_pie)
+
+    if aggregator:
+        # The aggregator program output is composed of the aggregator input (output of the
+        # bootloader) and the actual output.
+        # The fact is computed based on the actual output, where the aggregator input is ignored.
+        aggregator_input_size = get_aggregator_input_size(program_output=program_output)
+        program_output = program_output[aggregator_input_size:]
+        assert (
+            fact_topology.page_sizes[0] >= aggregator_input_size
+        ), "Aggregator input must be contained in page 0."
+        # Subtract the aggregator input size from the size of page 0.
+        fact_topology = dataclasses.replace(
+            fact_topology,
+            page_sizes=[
+                fact_topology.page_sizes[0] - aggregator_input_size,
+                *fact_topology.page_sizes[1:],
+            ],
+        )
+        program_hash = add_aggregator_prefix(program_hash)
+
     fact = generate_program_fact(program_hash, program_output, fact_topology=fact_topology)
     return FactInfo(program_output=program_output, fact_topology=fact_topology, fact=fact)
 

cairo-lang-0.13.2a0/starkware/cairo/bootloaders/program_hash_test_utils.py

@@ -0,0 +1,61 @@
+import json
+from typing import Any, Callable, Optional
+
+from starkware.cairo.bootloaders.hash_program import compute_program_hash_chain
+from starkware.cairo.lang.compiler.program import Program
+
+
+def run_generate_hash_test(
+    fix: bool,
+    program_path: str,
+    hash_path: str,
+    command: str,
+    post_process: Optional[Callable[[Any], Any]] = None,
+):
+    """
+    Compares the JSON content of 'hash_path' with the program hash of the given program.
+    If post_process is given, it may add additional fields to the expected JSON.
+    """
+    compiled_program = Program.Schema().load(json.load(open(program_path)))
+    program_hash = hex(compute_program_hash_chain(program=compiled_program, use_poseidon=False))
+    program_hash_key = "program_hash"
+
+    expected_json = {program_hash_key: program_hash}
+    if post_process is not None:
+        expected_json = post_process(expected_json)
+
+    if fix:
+        with open(hash_path, "w") as fp:
+            fp.write(json.dumps(expected_json, indent=4) + "\n")
+        return
+
+    with open(hash_path) as fp:
+        actual_json = json.load(fp)
+    assert expected_json == actual_json, (
+        "Wrong value in program_hash.json. Found:\n"
+        f"{json.dumps(actual_json, indent=4)}\n"
+        "Expected:\n"
+        f"{json.dumps(expected_json, indent=4)}\n"
+        f"Please run {command}."
+    )
+
+
+def program_hash_test_main(
+    program_path: str,
+    hash_path: str,
+    command: str,
+    post_process: Optional[Callable[[Any], Any]] = None,
+):
+    import argparse
+
+    parser = argparse.ArgumentParser(description="Create or test the program hash.")
+    parser.add_argument("--fix", action="store_true", help="Fix the value of the program hash.")
+
+    args = parser.parse_args()
+    run_generate_hash_test(
+        fix=args.fix,
+        program_path=program_path,
+        hash_path=hash_path,
+        command=command,
+        post_process=post_process,
+    )

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/starkware/cairo/common/cairo_builtins.cairo

@@ -43,3 +43,25 @@ struct PoseidonBuiltin {
     input: PoseidonBuiltinState,
     output: PoseidonBuiltinState,
 }
+
+// Represents a 384-bit unsigned integer d0 + 2**96 * d1 + 2**192 * d2 + 2**288 * d3
+// where each di is in [0, 2**96).
+struct UInt384 {
+    d0: felt,
+    d1: felt,
+    d2: felt,
+    d3: felt,
+}
+
+// Specifies the Add and Mul Mod builtins memory structure.
+struct ModBuiltin {
+    // The modulus.
+    p: UInt384,
+    // A pointer to input values, the intermediate results and the output.
+    values_ptr: UInt384*,
+    // A pointer to offsets inside the values array, defining the circuit.
+    // The offsets array should contain 3 * n elements.
+    offsets_ptr: felt*,
+    // The number of operations to perform.
+    n: felt,
+}

{cairo-lang-0.13.1a0 → cairo-lang-0.13.2a0}/starkware/cairo/common/cairo_function_runner.py

@@ -9,6 +9,11 @@ from starkware.cairo.lang.builtins.ec.instance_def import EcOpInstanceDef
 from starkware.cairo.lang.builtins.hash.hash_builtin_runner import HashBuiltinRunner
 from starkware.cairo.lang.builtins.keccak.instance_def import KeccakInstanceDef
 from starkware.cairo.lang.builtins.keccak.keccak_builtin_runner import KeccakBuiltinRunner
+from starkware.cairo.lang.builtins.modulo.instance_def import AddModInstanceDef, MulModInstanceDef
+from starkware.cairo.lang.builtins.modulo.mod_builtin_runner import (
+    AddModBuiltinRunner,
+    MulModBuiltinRunner,
+)
 from starkware.cairo.lang.builtins.poseidon.instance_def import PoseidonInstanceDef
 from starkware.cairo.lang.builtins.poseidon.poseidon_builtin_runner import PoseidonBuiltinRunner
 from starkware.cairo.lang.builtins.range_check.range_check_builtin_runner import (
@@ -37,7 +42,12 @@ class CairoFunctionRunner(CairoRunner):
         )
         self.builtin_runners["pedersen_builtin"] = pedersen_builtin
         range_check_builtin = RangeCheckBuiltinRunner(
-            name="range_check", included=True, ratio=1, inner_rc_bound=2**16, n_parts=8
+            name="range_check",
+            included=True,
+            ratio=1,
+            ratio_den=1,
+            inner_rc_bound=2**16,
+            n_parts=8,
         )
         self.builtin_runners["range_check_builtin"] = range_check_builtin
         output_builtin = OutputBuiltinRunner(included=True)
@@ -82,9 +92,28 @@ class CairoFunctionRunner(CairoRunner):
         )
         self.builtin_runners["poseidon_builtin"] = poseidon_builtin
         range_check96_builtin = RangeCheckBuiltinRunner(
-            name="range_check96", included=True, ratio=1, inner_rc_bound=2**16, n_parts=6
+            name="range_check96",
+            included=True,
+            ratio=1,
+            ratio_den=1,
+            inner_rc_bound=2**16,
+            n_parts=6,
         )
         self.builtin_runners["range_check96_builtin"] = range_check96_builtin
+        add_mod_builtin = AddModBuiltinRunner(
+            included=True,
+            instance_def=AddModInstanceDef(
+                word_bit_len=96, n_words=4, batch_size=1, ratio=1, ratio_den=1
+            ),
+        )
+        self.builtin_runners["add_mod_builtin"] = add_mod_builtin
+        mul_mod_builtin = MulModBuiltinRunner(
+            included=True,
+            instance_def=MulModInstanceDef(
+                word_bit_len=96, n_words=4, batch_size=1, ratio=1, ratio_den=1
+            ),
+        )
+        self.builtin_runners["mul_mod_builtin"] = mul_mod_builtin
 
         self.initialize_segments()
 
@@ -124,6 +153,14 @@ class CairoFunctionRunner(CairoRunner):
     def range_check96_builtin(self) -> RangeCheckBuiltinRunner:
         return cast(RangeCheckBuiltinRunner, self.builtin_runners["range_check96_builtin"])
 
+    @property
+    def add_mod_builtin(self) -> AddModBuiltinRunner:
+        return cast(AddModBuiltinRunner, self.builtin_runners["add_mod_builtin"])
+
+    @property
+    def mul_mod_builtin(self) -> MulModBuiltinRunner:
+        return cast(MulModBuiltinRunner, self.builtin_runners["mul_mod_builtin"])
+
     def assert_eq(self, arg: MaybeRelocatable, expected_value, apply_modulo: bool = True):
         """
         Asserts that arg is the Cairo representation of expected_value.
@@ -154,6 +191,7 @@ class CairoFunctionRunner(CairoRunner):
         apply_modulo_to_args: Optional[bool] = None,
         use_full_name: bool = False,
         verify_implicit_args_segment: bool = False,
+        allow_tmp_segments: bool = False,
         **kwargs,
     ) -> Tuple[Tuple[MaybeRelocatable, ...], Tuple[MaybeRelocatable, ...]]:
         """
@@ -191,6 +229,7 @@ class CairoFunctionRunner(CairoRunner):
                 static_locals=static_locals,
                 verify_secure=verify_secure,
                 apply_modulo_to_args=apply_modulo_to_args,
+                allow_tmp_segments=allow_tmp_segments,
             )
         except (VmException, SecurityError, AssertionError) as ex:
             if trace_on_failure: