Cairo v0.13.1a0 (pre).

LICENSE.txt

@@ -1,34 +1,201 @@
-Cairo Toolchain License (Source Available)
-
-Version 1.1 dated January 18, 2022
-
-This license contains the terms and conditions under which StarkWare
-Industries, Ltd ("StarkWare") makes available its Cairo Toolchain
-("Toolchain"). Your use of the Toolchain is subject to these terms and
-conditions.
-
-StarkWare grants you ("Licensee") a license to use the Toolchain, only
-for the purpose of developing and compiling Cairo programs. Licensee's other
-use of the Toolchain is limited to non-commercial use, which means academic,
-scientific, or research use, or evaluating the Cairo language and Toolchain.
-
-StarkWare grants Licensee a license to modify the Toolchain, only as
-necessary to fix errors. Licensee may, but is not obligated to, provide
-any of Licensee's modifications to StarkWare. This license grants Licensee no
-right to distribute the Toolchain or make copies of the Toolchain available
-to others.
-
-These terms do not allow Licensee to sublicense or transfer any of Licensee's
-rights to anyone else. These terms do not imply any other licenses not
-expressly granted in this license.
-
-If Licensee violates any of these terms, or uses the Toolchain in a way not
-authorized under this license, the license granted to Licensee ends immediately.
-If Licensee makes, or authorizes any other person to make, any written claim
-that the Toolchain infringes or contributes to infringement of any patent, all
-rights granted to Licensee under this license end immediately.
-
-As far as the law allows, the Toolchain is provided AS IS, without any warranty
-or condition, and StarkWare will not be liable to Licensee for any damages
-arising out of these terms or the use or nature of the Toolchain, under any kind
-of legal claim.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2024 StarkWare Industries Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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

WORKSPACE

@@ -52,7 +52,7 @@ http_archive(
         "//src/starkware/starknet/compiler/v1:BUILD." + CAIRO_COMPILER_ARCHIVE,
     ),
     strip_prefix = "cairo",
-    url = "https://github.com/starkware-libs/cairo/releases/download/v2.4.0/release-x86_64-unknown-linux-musl.tar.gz",
+    url = "https://github.com/starkware-libs/cairo/releases/download/v2.6.0-rc.0/release-x86_64-unknown-linux-musl.tar.gz",
 )
 
 http_archive(

bazel_utils/solidity.bzl

@@ -48,13 +48,15 @@ def _sol_contract_impl(ctx):
             inputs = srcs_list + ctx.files.solc_exe,
             outputs = [combined_json],
         )
-    else:  # solc-0.8.16
+    else:  # solc-0.8.x
         ctx.actions.run(
             executable = ctx.executable.solc_exe,
             arguments = [
                 "--optimize",
                 "--optimize-runs",
                 str(ctx.attr.optimize_runs),
+                "--evm-version",
+                ctx.attr.evm_version,
                 "--combined-json",
                 "abi,bin",
                 "--base-path",
@@ -97,6 +99,7 @@ sol_contract = rule(
         "deps": attr.label_list(),
         "contracts": attr.string_list(mandatory = True, allow_empty = False),
         "optimize_runs": attr.int(default = 200),
+        "evm_version": attr.string(default = "london"),
         "include_path": attr.string(default = "src"),
         "solc_exe": attr.label(
             default = Label("//bazel_utils:solc-0.6.12"),

src/demo/amm_demo/demo.py

@@ -65,7 +65,7 @@ def deploy_contract(batch_prover: BatchProver, w3: Web3, operator: BaseAccount)
     account_tree_root = get_merkle_root(batch_prover.accounts)
     amount_token_a = batch_prover.balance.a
     amount_token_b = batch_prover.balance.b
-    program_hash = compute_program_hash_chain(batch_prover.program)
+    program_hash = compute_program_hash_chain(program=batch_prover.program, use_pedersen=False)
     cairo_verifier = batch_prover.sharp_client.contract_client.contract.address
 
     # Compile the smart contract.

src/services/config/BUILD

@@ -0,0 +1,15 @@
+load("//bazel_utils/python:defs.bzl", "requirement")
+
+package(default_visibility = ["//visibility:public"])
+
+py_library(
+    name = "base_general_config_lib",
+    srcs = [
+        "general_config.py",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/starkware/starkware_utils:starkware_config_utils_lib",
+        requirement("marshmallow_dataclass"),
+    ],
+)

src/services/config/general_config.py

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

src/services/everest/definitions/BUILD

@@ -28,7 +28,7 @@ py_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//src/starkware/starkware_utils:starkware_config_utils_lib",
+        "//src/services/config:base_general_config_lib",
         requirement("marshmallow_dataclass"),
     ],
 )

src/services/everest/definitions/fields.py

@@ -82,6 +82,8 @@ def convert_valid_to_checksum(self, value: str) -> ChecksumAddress:
     formatter=hex,
 )
 
+felt_as_hex_list_metadata = dict(marshmallow_field=mfields.List(FeltField.get_marshmallow_field()))
+
 
 def get_bounded_int_range_validator(
     lower_bound: int = 0, upper_bound: int = FIELD_PRIME

src/services/everest/definitions/general_config.py

@@ -1,8 +1,8 @@
 import marshmallow_dataclass
 
-from starkware.starkware_utils.config_base import Config
+from services.config.general_config import GeneralConfigBase
 
 
 @marshmallow_dataclass.dataclass(frozen=True)
-class EverestGeneralConfig(Config):
+class EverestGeneralConfig(GeneralConfigBase):
     pass

src/services/external_api/BUILD

@@ -13,7 +13,6 @@ py_library(
         "utils.py",
     ],
     visibility = ["//visibility:public"],
-    deps = [],
 )
 
 py_library(

src/services/external_api/client.py

@@ -210,27 +210,23 @@ async def _send_request(
             except BadRequest as exception:
                 error_message = f"Got {type(exception).__name__} while trying to access {url}."
 
-                if limited_retries and (
-                    n_retries_left == 0
-                    or exception.status_code not in self.retry_config.retry_codes
+                if (limited_retries and n_retries_left == 0) or (
+                    exception.status_code not in self.retry_config.retry_codes
                 ):
                     full_error_message = (
                         f"{error_message} "
                         f"Status code: {exception.status_code}; text: {exception.text}."
                     )
                     if self.log_errors:
-                        logger.error(full_error_message, exc_info=True)
+                        logger.error(msg=full_error_message, exc_info=True)
                     raise
-
-                logger.debug(f"{error_message}, retrying...")
+                logger.debug(msg=f"{error_message}, retrying...")
             except Exception as exception:
                 error_message = f"Got {type(exception).__name__} while trying to access {url}."
-
                 if limited_retries and n_retries_left == 0:
                     if self.log_errors:
-                        logger.error(error_message, exc_info=True)
+                        logger.error(msg=error_message, exc_info=True)
                     raise
-
                 logger.debug(f"{error_message}, retrying...")
 
             await asyncio.sleep(5)