certora-cli-alpha-master 20241217.22.6.367707__tar.gz → 20241219.20.36.174596__tar.gz

{certora_cli_alpha_master-20241217.22.6.367707/certora_cli_alpha_master.egg-info → certora_cli_alpha_master-20241219.20.36.174596}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241217.22.6.367707
+Version: 20241219.20.36.174596
 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 885526e.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit a0a7788.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20241219.20.36.174596/README.md

@@ -0,0 +1 @@
+Commit a0a7788.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/certora_cli/EVMVerifier/certoraBuild.py

@@ -1577,7 +1577,17 @@ class CertoraBuildGenerator:
             while queue:
                 pop = queue.pop(0)
                 if isinstance(pop, dict) and node_id_attrb in pop:
-                    container[int(pop[node_id_attrb])] = pop
+                    idAttr = pop[node_id_attrb]
+                    if isinstance(idAttr, int):
+                        container[int(idAttr)] = pop
+                    elif isinstance(idAttr, list) and len(idAttr) == 1 and isinstance(idAttr[0], int):
+                        # In the bug reported in https://certora.atlassian.net/browse/CERT-7643 the id field is a list
+                        # instead of a single integer - we except that the first element of the list is the actual id
+                        # and unpack it.
+                        container[int(idAttr[0])] = pop
+                    else:
+                        raise Exception(f"Unexpected type of attribute `{node_id_attrb}`, was {idAttr}, expected an integer or an int-typed list of length 1")
+
                     for key, value in pop.items():
                         if (node_type_attrb in pop and
                                 pop[node_type_attrb] == "InlineAssembly" and key == "externalReferences"):

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/certora_cli/EVMVerifier/certoraCloudIO.py

@@ -765,7 +765,11 @@ class CloudVerification:
                                     short_output=Ctx.is_minimal_cli_output(self.context))
         elif Attrs.is_evm_app() and self.context.is_bytecode:
             # We zip the bytecode jsons and the spec
-            paths = []
+            paths = [Util.get_certora_build_file(), Util.get_certora_verify_file(),
+                     Util.get_certora_metadata_file()]
+            if Util.get_certora_sources_dir().exists():
+                paths.append(Util.get_certora_sources_dir())
+
             for bytecode_json in self.context.bytecode_jsons:
                 paths.append(Path(bytecode_json))
             paths.append(Path(self.context.bytecode_spec))

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/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') and hasattr(context, 'rust_project_directory'):
+        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_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/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_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/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_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/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_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/certora_cli/EVMVerifier/certoraType.py

@@ -634,6 +634,7 @@ class TypeLocation(Enum):
     MEMORY = "memory"
     CALLDATA = "calldata"
     STORAGE = "storage"
+    TRANSIENT = "transient"
 
     @property
     def abi_str(self) -> str:

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/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-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/certora_cli/rustMutator.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import atexit
 import shutil
 import subprocess
 import argparse
@@ -31,7 +32,7 @@ def parse_args() -> argparse.Namespace:
         )
     )
     parser.add_argument(
-        "--file_to_mutant",
+        "--file_to_mutate",
         "-f",
         type=Path,
         required=True,
@@ -74,27 +75,12 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
-def restore_source(backup_file: Path, file_to_mutant: Path) -> None:
-    """
-    Restore the original source file from the backup.
-
-    Args:
-        backup_file (Path): Path to the backup file.
-        file_to_mutant (Path): Path to the original source file.
-    """
-    rust_mutator_logger.info(f"Restoring the original '{file_to_mutant}' from '{backup_file}'...")
-    if Util.restore_backup(backup_file):
-        rust_mutator_logger.info(f"Original '{file_to_mutant}' restored successfully.")
-    else:
-        rust_mutator_logger.warning(f"No backup file '{backup_file}' found. Skipping restoration.")
-
-
-def clean_temp_files(file_to_mutant: Path) -> None:
+def clean_temp_files(file_to_mutate: Path) -> None:
     """
     Remove temporary mutant output files matching the pattern '.um.mutant_output.*'.
 
     Args:
-        file_to_mutant (Path): Path to the original source file.
+        file_to_mutate (Path): Path to the original source file.
     """
     temp_files = Path().rglob(".um.mutant_output.*")
 
@@ -103,7 +89,7 @@ def clean_temp_files(file_to_mutant: Path) -> None:
         temp_file.unlink()
         rust_mutator_logger.info(f"Removed: {temp_file}")
 
-    backup_file = next(Path().rglob(f"{file_to_mutant}.um.backup.*"), None)
+    backup_file = next(Path().rglob(f"{file_to_mutate}.um.backup.*"), None)
     if backup_file:
         backup_file.unlink()
         rust_mutator_logger.info(f"Removed: {backup_file}")
@@ -148,22 +134,22 @@ def uniform_selection(mutants: List[Path], num_select: int, seed: int) -> List[P
     return shuffled_mutants[:num_select]
 
 
-def validate_source_file(file_to_mutant: Path) -> None:
+def validate_source_file(file_to_mutate: Path) -> None:
     """
     Validate that the source file exists and has a .rs extension.
 
     Args:
-        file_to_mutant (Path): Path to the Rust source file.
+        file_to_mutate (Path): Path to the Rust source file.
 
     Raises:
         Util.CertoraUserInputError: If validation fails.
     """
-    if not file_to_mutant.exists():
-        raise Util.CertoraUserInputError(f"Source file '{file_to_mutant}' does not exist.")
-    if not file_to_mutant.is_file():
-        raise Util.CertoraUserInputError(f"Source file '{file_to_mutant}' is not a file.")
-    if file_to_mutant.suffix != ".rs":
-        raise Util.CertoraUserInputError(f"Source file '{file_to_mutant}' does not have a .rs extension.")
+    if not file_to_mutate.exists():
+        raise Util.CertoraUserInputError(f"Source file '{file_to_mutate}' does not exist.")
+    if not file_to_mutate.is_file():
+        raise Util.CertoraUserInputError(f"Source file '{file_to_mutate}' is not a file.")
+    if file_to_mutate.suffix != ".rs":
+        raise Util.CertoraUserInputError(f"Source file '{file_to_mutate}' does not have a .rs extension.")
 
 
 def validate_mutant_dir(mutants_location: Path) -> None:
@@ -186,13 +172,13 @@ def validate_mutant_dir(mutants_location: Path) -> None:
         rust_mutator_logger.info(f"Mutant directory '{mutants_location}' created successfully.")
 
 
-def validate_mutant_count(file_to_mutant: Path, mutants_location: Path, num_mutants: int, seed: int) -> None:
+def validate_mutant_count(file_to_mutate: Path, mutants_location: Path, num_mutants: int, seed: int) -> None:
     """
     Validate the number of mutants generated is less than or equal to the specified limit. If the number of mutants
     exceeds the limit, select uniformly based on the seed and delete the rest.
 
     Args:
-        file_to_mutant (Path): Path to the original Rust source file.
+        file_to_mutate (Path): Path to the original Rust source file.
         mutants_location (Path): Directory containing generated mutants.
         num_mutants (int): Upper bound on the number of mutants to generate.
         seed (int, optional): Seed value for random selection.
@@ -201,7 +187,7 @@ def validate_mutant_count(file_to_mutant: Path, mutants_location: Path, num_muta
         Util.CertoraUserInputError: If no mutants are generated.
     """
     # Define the regex pattern to extract the mutant number
-    pattern = re.compile(rf"{re.escape(file_to_mutant.stem)}\.mutant\.(\d+)\.rs$")
+    pattern = re.compile(rf"{re.escape(file_to_mutate.stem)}\.mutant\.(\d+)\.rs$")
 
     # Gather all mutants matching the pattern
     mutants = [mutant for mutant in mutants_location.iterdir() if pattern.match(mutant.name)]
@@ -233,7 +219,7 @@ def validate_mutant_count(file_to_mutant: Path, mutants_location: Path, num_muta
     for mutant, mutant_number in numbered_mutants:
         if not 0 <= mutant_number < num_mutants:
             for i in range(num_mutants):
-                new_file_name = mutant.with_name(f"{file_to_mutant.stem}.mutant.{i}.rs")
+                new_file_name = mutant.with_name(f"{file_to_mutate.stem}.mutant.{i}.rs")
                 if new_file_name.exists():
                     continue
                 mutant.rename(new_file_name)
@@ -251,12 +237,12 @@ def validate_mutate_command() -> None:
         raise Util.CertoraUserInputError("universalmutator command 'mutate' not found in PATH.")
 
 
-def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str) -> None:
+def run_mutate(file_to_mutate: Path, mutants_location: Path, build_command: str) -> None:
     """
     Execute the universalmutator command to generate mutants, displaying a progress bar.
 
     Args:
-        file_to_mutant (Path): Path to the Rust source file.
+        file_to_mutate (Path): Path to the Rust source file.
         mutants_location (Path): Directory to store generated mutants.
         build_command (str): Command to execute for each mutant to verify compilation.
 
@@ -265,7 +251,7 @@ def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str)
     """
     mutate_command = [
         "mutate",
-        str(file_to_mutant),
+        str(file_to_mutate),
         "rust",
         "--mutantDir",
         str(mutants_location),
@@ -287,7 +273,7 @@ def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str)
     total_mutants = None
     mutant_pattern = re.compile(r"^PROCESSING MUTANT: (\d+):")
     total_pattern = re.compile(r"^(\d+) MUTANTS GENERATED BY RULES")
-    valid_mutant_pattern = re.compile(rf"VALID \[written to {mutants_location.stem}/{file_to_mutant.stem}\.mutant\.\d+\.rs\]")
+    valid_mutant_pattern = re.compile(rf"VALID \[written to {mutants_location.stem}/{file_to_mutate.stem}\.mutant\.\d+\.rs\]")
 
     progress_bar = None
 
@@ -306,7 +292,7 @@ def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str)
                 if total_match:
                     total_mutants = int(total_match.group(1))
                     progress_bar = tqdm(total=total_mutants, desc="Mutants Generated", unit="mutant")
-                    rust_mutator_logger.info(f"Total mutants to generate: {total_mutants}")
+                    rust_mutator_logger.info(f"Total mutants generated: {total_mutants}")
                     continue
 
             # Update progress bar for each processed mutant
@@ -340,7 +326,7 @@ def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str)
             process.terminate()
 
 def run_universal_mutator(
-        file_to_mutant: Path,
+        file_to_mutate: Path,
         build_script: str,
         mutants_location: Path,
         num_mutants: int = NUM_MUTANTS,
@@ -351,7 +337,7 @@ def run_universal_mutator(
     Generate mutants for the specified source file and ensure the original file remains unchanged.
 
     Args:
-        file_to_mutant (Path): Path to the Rust source file.
+        file_to_mutate (Path): Path to the Rust source file.
         build_script (str): Command to execute for each mutant to verify compilation.
         mutants_location (Path): Directory to store generated mutants.
         num_mutants (int): Upper bound on the number of mutants to generate (default: {NUM_MUTANTS}).
@@ -365,7 +351,10 @@ def run_universal_mutator(
     backup_file = None
     build_command = f"cp MUTATE & python3 {build_script}"
 
+    atexit.register(clean_temp_files, file_to_mutate)
+
     try:
+
         # Set up the logger
         setup_logger(debug)
 
@@ -373,38 +362,37 @@ def run_universal_mutator(
         validate_mutate_command()
 
         # Validate source file
-        validate_source_file(file_to_mutant)
+        validate_source_file(file_to_mutate)
 
         # Backup the original source file
-        rust_mutator_logger.info(f"Backing up '{file_to_mutant}' ...")
-        backup_file = Util.create_backup(file_to_mutant)
+        rust_mutator_logger.info(f"Backing up '{file_to_mutate}' ...")
+        backup_file = Util.create_backup(file_to_mutate)
+
         if backup_file:
-            rust_mutator_logger.info(f"Backing up '{file_to_mutant}' to '{backup_file} succeeded")
+            atexit.register(Util.restore_backup, backup_file)
+            rust_mutator_logger.info(f"Backing up '{file_to_mutate}' to '{backup_file} succeeded")
         else:
-            rust_mutator_logger.warning(f"Backing up '{file_to_mutant}' to '{backup_file} failed")
+            rust_mutator_logger.warning(f"Backing up '{file_to_mutate}' to '{backup_file} failed")
 
         # Validate or create mutant directory
         validate_mutant_dir(mutants_location)
 
         # Run the mutation command
-        run_mutate(file_to_mutant, mutants_location, build_command)
+        run_mutate(file_to_mutate, mutants_location, build_command)
 
         # Make sure the number of mutants generated is less than or equal to the specified limit
-        validate_mutant_count(file_to_mutant, mutants_location, num_mutants, seed)
-
+        validate_mutant_count(file_to_mutate, mutants_location, num_mutants, seed)
     finally:
-        # Restore the original source file
         if backup_file:
             Util.restore_backup(backup_file)
-        # Clean up temporary files
-        clean_temp_files(file_to_mutant)
+        clean_temp_files(file_to_mutate)
 
 
 if __name__ == "__main__":
     # Parse command-line arguments
     args = parse_args()
     run_universal_mutator(
-        args.file_to_mutant,
+        args.file_to_mutate,
         args.build_script,
         args.mutants_location,
         args.num_mutants,

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596/certora_cli_alpha_master.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241217.22.6.367707
+Version: 20241219.20.36.174596
 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 885526e.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit a0a7788.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20241219.20.36.174596/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -0,0 +1 @@
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "a0a7788", "timestamp": "20241219.20.36.174596", "version": "20241219.20.36.174596+a0a7788"}

{certora_cli_alpha_master-20241217.22.6.367707 → certora_cli_alpha_master-20241219.20.36.174596}/setup.py

@@ -3,11 +3,11 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli-alpha-master",
-    version="20241217.22.6.367707",
+    version="20241219.20.36.174596",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit 885526e.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit a0a7788.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
     long_description_content_type="text/markdown",
     url="https://pypi.org/project/certora-cli-alpha-master",
     packages=setuptools.find_packages(),

certora_cli_alpha_master-20241217.22.6.367707/README.md

@@ -1 +0,0 @@
-Commit 885526e.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20241217.22.6.367707/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +0,0 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "885526e", "timestamp": "20241217.22.6.367707", "version": "20241217.22.6.367707+885526e"}