certora-cli-alpha-master 20241219.14.2.692388__py3-none-macosx_10_9_universal2.whl → 20241219.17.27.526466__py3-none-macosx_10_9_universal2.whl

certora_cli/EVMVerifier/certoraContext.py

@@ -1,10 +1,10 @@
 import argparse
 import hashlib
 import json
-import logging
 import os
 import re
 import sys
+import logging
 
 
 from pathlib import Path
@@ -106,9 +106,15 @@ def get_local_run_cmd(context: CertoraContext) -> str:
     @return: A command for running the prover locally
     """
     run_args = []
-    if context.is_tac or Attrs.is_rust_app():
+
+    if hasattr(context, 'rust_executables'):
+        run_args.append(os.path.join(context.rust_project_directory, context.rust_executables))
+    elif context.is_tac or Attrs.is_rust_app():
         # For Rust app we assume the files holds the executable for the prover, currently we support a single file
-        run_args.append(context.files[0])
+        try:
+            run_args.append(context.files[0])
+        except Exception:
+            raise RuntimeError("get_local_run_cmd: cannot find context.files[0]")
 
     if Attrs.is_evm_app() and context.cache is not None:
         run_args.extend(['-cache', context.cache])
@@ -231,7 +237,7 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
 
     validator = Cv.CertoraContextValidator(context)
     validator.validate()
-    if Attrs.is_evm_app():
+    if Attrs.is_evm_app() or Attrs.is_rust_app():
         current_build_directory = Util.get_build_dir()
         if context.build_dir is not None and current_build_directory != context.build_dir:
             Util.reset_certora_internal_dir(context.build_dir)

certora_cli/EVMVerifier/certoraContextAttributes.py

@@ -161,6 +161,14 @@ class CommonAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
+    BUILD_DIR = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_build_dir,
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
 
 class DeprecatedAttributes(AttrUtil.Attributes):
     AUTO_NONDET_DIFFICULT_INTERNAL_FUNCS = AttrUtil.AttributeDefinition(
@@ -639,15 +647,6 @@ class EvmAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-    BUILD_DIR = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_build_dir,
-        argparse_args={
-            'action': AttrUtil.UniqueStore
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-
     DISABLE_LOCAL_TYPECHECKING = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
         argparse_args={

certora_cli/EVMVerifier/certoraContextValidator.py

@@ -173,14 +173,17 @@ class CertoraContextValidator:
                 "'disable_source_finders' is set to true while 'dynamic_bound' is set to 1 or higher"
             )
             context.disable_source_finders = True
-
+        package_name = Util.get_package_and_version()[1]
         # if --fe_version was not set then if the package is alpha/beta we set it to latest else we set it to production
         if not context.fe_version:
-            lastest_packages = [Util.ALPHA_PACKAGE_NAME, Util.BETA_PACKAGE_NAME, Util.BETA_MIRROR_PACKAGE_NAME]
-            if Util.get_package_and_version()[1] in lastest_packages:
+            lastest_packages = [Util.ALPHA_PACKAGE_MASTER_NAME, Util.BETA_PACKAGE_NAME, Util.BETA_MIRROR_PACKAGE_NAME]
+            if package_name in lastest_packages:
                 context.fe_version = str(Util.FeValue.LATEST)
             else:
                 context.fe_version = str(Util.FeValue.PRODUCTION)
+        if Util.ALPHA_PACKAGE_NAME in package_name and not context.prover_version:
+            raise Util.CertoraUserInputError('When running an "alpha release", a specific branch must be supplied '
+                                             'via --prover_version. For example: "--prover_version master"')
 
         check_conflicting_branch_and_hash(context)
         set_wait_for_results_default(context)

certora_cli/EVMVerifier/certoraParseBuildScript.py

@@ -1,19 +1,19 @@
 import subprocess
 import json
-from pathlib import Path
+import logging
 
 from EVMVerifier.certoraContextClass import CertoraContext
 from Shared import certoraUtils as Util
-import os
+
+build_script_logger = logging.getLogger("build_script")
 
 
 def run_script_and_parse_json(context: CertoraContext) -> None:
     if not context.build_script:
         return
     try:
-        env = os.environ.copy()
-        result = subprocess.run(["python3", Path(context.build_script).resolve(), '--json'], capture_output=True, text=True,
-                                env=env, cwd=Path(context.build_script).resolve().parent)
+        build_script_logger.info(f"Building from script {context.build_script}")
+        result = subprocess.run([context.build_script, '--json'], capture_output=True, text=True)
 
         # Check if the script executed successfully
         if result.returncode != 0:

certora_cli/Shared/certoraUtils.py

@@ -79,7 +79,8 @@ LAST_CONF_FILE = Path("run.conf")
 EMV_JAR = Path("emv.jar")
 CERTORA_SOURCES = Path(".certora_sources")
 SOLANA_DEFAULT_COMMAND = "cargo +solana build-sbf"
-ALPHA_PACKAGE_NAME = 'certora-cli-alpha-master'
+ALPHA_PACKAGE_NAME = 'certora-cli-alpha'
+ALPHA_PACKAGE_MASTER_NAME = ALPHA_PACKAGE_NAME + '-master'
 # contract names in Solidity consists of alphanums, underscores and dollar signs
 # https://docs.soliditylang.org/en/latest/grammar.html#a4.SolidityLexer.Identifier
 SOLIDITY_ID_SUBSTRING_RE = r"[a-zA-Z_$][a-zA-Z0-9_$]*"  # string *contains* a valid solidity ID

{certora_cli_alpha_master-20241219.14.2.692388.dist-info → certora_cli_alpha_master-20241219.17.27.526466.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241219.14.2.692388
+Version: 20241219.17.27.526466
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -23,4 +23,4 @@ Requires-Dist: StrEnum
 Requires-Dist: tomli
 Requires-Dist: universalmutator
 
-Commit fbf627f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit b0ee123.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20241219.14.2.692388.dist-info → certora_cli_alpha_master-20241219.17.27.526466.dist-info}/RECORD

@@ -14,16 +14,16 @@ certora_cli/EVMVerifier/certoraCloudIO.py,sha256=b26JbU3aTEU0BO7gIlJ14tosQfv3wgV
 certora_cli/EVMVerifier/certoraCollectRunMetadata.py,sha256=selEf-p7UW8_70-AbPfa5659ki6WcGrBwfPkUQWKhFU,10322
 certora_cli/EVMVerifier/certoraCompilerParameters.py,sha256=PDKW3K_lNeRNPHisW0e5hYtfu6unDRjJUop-yItGHO0,762
 certora_cli/EVMVerifier/certoraConfigIO.py,sha256=oyNOyBjVWFfB1dmj0jNnEwvokM7UMoGZ91luSh-cFGk,4634
-certora_cli/EVMVerifier/certoraContext.py,sha256=z86n6XbsU9dKfxiIqlPrCHz6EtrBAuYIRE0BS4rxSHQ,21974
-certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=__JqYpti0mDwBvgtunajEotCAKprUyoeDabe1ooSnro,55637
+certora_cli/EVMVerifier/certoraContext.py,sha256=aYvsuedXdiHsdEbok9hRT3KZcaNY8HIg_Lee3HBVVrE,22266
+certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=Lx1vi9PgPiUcv0xRsdQncvknkpdvMWagGsT-Tw0saX4,55636
 certora_cli/EVMVerifier/certoraContextClass.py,sha256=qdHYmrzI4zeQaAaMnonw4C-h1PFrPEhI84trrgvxFj0,210
-certora_cli/EVMVerifier/certoraContextValidator.py,sha256=YE4_BYRhZhXWEtjodD_Pligh8opdaOjs27mVEoy74ZY,37210
+certora_cli/EVMVerifier/certoraContextValidator.py,sha256=zQupDhoTMu0aA3Rmp6x6KgOa_CNd5A3Cqf60_vJZ5rE,37560
 certora_cli/EVMVerifier/certoraContractFuncs.py,sha256=W3lAvKotGKK7ZGJLg4yYh0FzTwwSQJbZMpizyGaYXZo,6229
 certora_cli/EVMVerifier/certoraExtensionInfo.py,sha256=bHjEBKg3qQ1lS419KSU6v6HKbhrSOz2TmEE21YrOfYI,1336
 certora_cli/EVMVerifier/certoraJobList.py,sha256=JlPOANEzNHP6cDrM5UKfO314pmWYokuhAPTkH3ezNb4,10768
 certora_cli/EVMVerifier/certoraMiniSpecParser.py,sha256=Thtcr1BLmCz9xOiOkaP04mSnrDaqIUOUSCM81TrqD_s,8970
 certora_cli/EVMVerifier/certoraNodeFilters.py,sha256=0e8iPdj4cWjwReaAhfJhpdnSUYc8gephmKQzOOP5X_g,2140
-certora_cli/EVMVerifier/certoraParseBuildScript.py,sha256=vX_lhus5VgLQaZp5GrNtJP6R5cqChjv_Rfpk_JZz2uY,1456
+certora_cli/EVMVerifier/certoraParseBuildScript.py,sha256=HiBfBRXCl7ER1aBSzJFARgBWj8Z4doT6ApcicdhHNnU,1425
 certora_cli/EVMVerifier/certoraSourceFinders.py,sha256=fZLYGjNgntIySnG76DwsjRZ-UHiy0zEkM6xNP7cYpDE,18342
 certora_cli/EVMVerifier/certoraType.py,sha256=TPrgRwUnY-krN1SxpCHGB0zwN-TR1bxb-NFdnaigA-k,28626
 certora_cli/EVMVerifier/certoraVerifyGenerator.py,sha256=OT5zrtQMXDoaVdGfQ4_gbAnITin3nlXgXTgw3msqlNQ,9452
@@ -52,14 +52,14 @@ certora_cli/Shared/ExpectedComparator.py,sha256=rDDY3-FaE3OS_ZjZ-nOyvUTlUp8eQCHw
 certora_cli/Shared/__init__.py,sha256=QGoFb_Uu87tWp4E4L6C_VtzdG-sfNrzdNtRK79h5_Lw,333
 certora_cli/Shared/certoraAttrUtil.py,sha256=IbIIvTbtPzmPSSrK7VIWZNitkz1iwvW_e0ggX1e2joY,6751
 certora_cli/Shared/certoraLogging.py,sha256=5Lx-XWKl7GnwnWi7KlwTLIfsEvUvCTZ8KeyfNyi_6RU,13323
-certora_cli/Shared/certoraUtils.py,sha256=8EGXrxfIxu34VTx46QeTx6tTYLdwpTLT9ulVQijmD9Y,53624
+certora_cli/Shared/certoraUtils.py,sha256=WmVX8Hz5wMZ7WI2JhYavAilH1kO3fwKLUBsf4hQ4b-o,53676
 certora_cli/Shared/certoraValidateFuncs.py,sha256=OOjPAkcfrURZDD4oDjOMBFTvY6wwQSXboXzu-47AUbY,36871
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=wYtATmzfm8N6McLM-n-1Vqk-ntGzTEdXaZHMWpaT-BM,168
-certora_jars/Typechecker.jar,sha256=iGjwY4n-RTamERyuw4aIshuck8CGVUPUP_wkk1waEKk,16755362
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=bGTkY5e7Oboh6smzO5-o6N8SPKkGQMNrPYJNLlVYaDI,170
+certora_jars/Typechecker.jar,sha256=fwyph9bf1n9iHWzq0CVY7hTEjve80CdjQwa2D8_-uzE,16755362
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/METADATA,sha256=s6Ia4l7HDNJ2FLR2LoAqdyh4BHqaLLzEK_1FuFOEE44,837
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/entry_points.txt,sha256=Y90wInBDlKPSU3YnuTn3JqAsSgPRTDHc8lf6BfKILjY,261
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20241219.14.2.692388.dist-info/RECORD,,
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/METADATA,sha256=vq8b6kCBTYrIEJUL1SWIbqbp_R9S8MRt4Nc8M8iMtMM,838
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/entry_points.txt,sha256=Y90wInBDlKPSU3YnuTn3JqAsSgPRTDHc8lf6BfKILjY,261
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20241219.17.27.526466.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "fbf627f", "timestamp": "20241219.14.2.692388", "version": "20241219.14.2.692388+fbf627f"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "b0ee123", "timestamp": "20241219.17.27.526466", "version": "20241219.17.27.526466+b0ee123"}