certora-cli-alpha-master 20241216.22.25.927248__py3-none-macosx_10_9_universal2.whl → 20241217.16.7.546354__py3-none-macosx_10_9_universal2.whl

certora_cli/EVMVerifier/certoraCloudIO.py

@@ -1,7 +1,9 @@
+import glob
 import itertools
 import json
 import os
 import re
+import shutil
 import uuid
 
 import requests
@@ -190,21 +192,41 @@ def parse_json(response: Response) -> Dict[str, Any]:
     return json_response
 
 
-def compress_files_wasm(zip_file_path: Path, context: CertoraContext) -> bool:
+def zip_rust_files(zip_file_path: Path, context: CertoraContext, *resource_paths: Path) -> bool:
+    patterns = ["*.rs", "*.so", "*.wasm", "Cargo.toml", "Cargo.lock", "justfile"]
+    exclude_dirs = [".certora_internal"]
+
+    root_directory = Path(context.rust_project_directory)
+    if not root_directory.is_dir():
+        raise ValueError(f"The given directory {root_directory} is not valid.")
+
     with zipfile.ZipFile(zip_file_path, 'w', zipfile.ZIP_DEFLATED) as zip_obj:
-        cargo_directory = context.cargo_dir
-        for path in cargo_directory.rglob('*.rs'):
-            if cargo_directory / 'target' in path.parents or cargo_directory / '.certora_internal' in path.parents:
-                continue
-            zip_obj.write(path, Util.CERTORA_SOURCES / path.relative_to(cargo_directory))
-        for path in [cargo_directory / 'Cargo.toml', cargo_directory / 'Cargo.lock']:
-            if path.exists():
-                zip_obj.write(path, path.relative_to(cargo_directory))
-        if context.wasm_file.exists():
-            zip_obj.write(context.wasm_file, context.wasm_file.relative_to(context.wasm_file.parent))
+        for source in context.rust_sources:
+            for file in glob.glob(f'{root_directory.joinpath(source)}', recursive=True):
+                file_path = Path(file)
+                if any(excluded in file_path.parts for excluded in exclude_dirs):
+                    continue
+                if file_path.is_file() and any(file_path.match(pattern) for pattern in patterns):
+                    zip_obj.write(file_path, Util.CERTORA_SOURCES / file_path.relative_to(root_directory))
+        if context.build_script and Path(context.build_script).exists():
+            zip_obj.write(Path(context.build_script),
+                          Util.CERTORA_SOURCES / Path(context.build_script).absolute().relative_to(root_directory))
+        if context.conf_file and Path(context.conf_file).exists():
+            zip_obj.write(Path(context.conf_file),
+                          Util.CERTORA_SOURCES / Path(context.conf_file).absolute().relative_to(root_directory))
+        if Util.get_last_conf_file():
+            zip_obj.write(Util.get_last_conf_file(),
+                          Util.CERTORA_SOURCES / Util.get_last_conf_file().relative_to(Util.get_build_dir()))
+
+        rust_executable = root_directory.joinpath(context.rust_executables)
+        zip_obj.write(rust_executable, rust_executable.relative_to(rust_executable.parent))
+        for path in resource_paths:
+            zip_obj.write(path, os.path.relpath(path, Util.get_build_dir()))
+            if path.suffix == '.txt':
+                zip_obj.write(path, Util.CERTORA_SOURCES / path.relative_to(Util.get_build_dir()))
 
     if zip_file_path.stat().st_size > MAX_FILE_SIZE:
-        cloud_logger.error(f"{GENERAL_ERR_PREFIX} Max 25MB file size exceeded.")
+        cloud_logger.error(f"{GENERAL_ERR_PREFIX} Max 25MB file size exceeded. File is located at {zip_file_path}")
         return False
     return True
 
@@ -600,8 +622,12 @@ class CloudVerification:
             # We need to strip "../" path component from all file paths because
             # unzip will also do that.
             solana_jar_settings = []
-            for file in self.context.files:
-                solana_jar_settings.append(file.split('../')[-1])
+            if hasattr(self.context, 'build_script') and self.context.build_script:
+                solana_jar_settings.append(Path(self.context.rust_executables).name)
+
+            else:
+                for file in self.context.files:
+                    solana_jar_settings.append(file.split('../')[-1])
 
             is_file = False
             for arg in jar_settings:
@@ -616,18 +642,19 @@ class CloudVerification:
                 elif arg == '-solanaSummaries':
                     is_file = True
             auth_data["jarSettings"] = solana_jar_settings
-        elif Attrs.is_wasm_app():
+        elif Attrs.is_soroban_app():
             # We need to strip "../" path component from all file paths because
             # unzip will also do that.
-            wasm_jar_settings = []
-            if hasattr(self.context, 'wasm_file') and self.context.wasm_file:
-                wasm_jar_settings.append(self.context.wasm_file.name)  # assuming root is cargo_directory
+            soroban_jar_settings = []
+            # not needed - should be in files
+            if hasattr(self.context, 'build_script') and self.context.build_script:
+                soroban_jar_settings.append(Path(self.context.rust_executables).name)
             else:
                 for file in self.context.files:
-                    wasm_jar_settings.append(file.split('../')[-1])
+                    soroban_jar_settings.append(file.split('../')[-1])
             for arg in jar_settings:
-                wasm_jar_settings.append(arg)
-            auth_data["jarSettings"] = wasm_jar_settings
+                soroban_jar_settings.append(arg)
+            auth_data["jarSettings"] = soroban_jar_settings
         else:
             auth_data["jarSettings"] = jar_settings
 
@@ -744,34 +771,51 @@ class CloudVerification:
             paths.append(Path(self.context.bytecode_spec))
             result = compress_files(self.ZipFilePath, *paths,
                                     short_output=Ctx.is_minimal_cli_output(self.context))
-        elif Attrs.is_solana_app():
-            # We zip the ELF files and the two configuration files
-            jar_args = Ctx.collect_jar_args(self.context)
-            paths = []
-            for file in self.context.files:
-                paths.append(Path(file))
-            is_file = False
-            for arg in jar_args:
-                if is_file:
-                    paths.append(Path(arg))
-                    is_file = False
+        elif Attrs.is_rust_app():
+            files_list = [Util.get_certora_metadata_file()]
+
+            if hasattr(self.context, 'build_script') and self.context.build_script:
+                if self.context.prover_resource_files:
+                    for value in self.context.prover_resource_files:
+                        _, file_path = value.split(':')
+                        cur_path = (Path(self.context.conf_file).parent / Path(file_path)).resolve()
+                        shutil.copy(cur_path, Util.get_build_dir())
+                        files_list.append(Util.get_build_dir() / cur_path.name)
+
+                result = zip_rust_files(self.ZipFilePath, self.context, *files_list)
+
+            elif Attrs.is_solana_app():
+                # We zip the ELF files and the two configuration files
+                jar_args = Ctx.collect_jar_args(self.context)
 
-                if arg == '-solanaInlining':
-                    is_file = True
-                elif arg == '-solanaSummaries':
-                    is_file = True
-            result = compress_files(self.ZipFilePath, *paths,
-                                    short_output=Ctx.is_minimal_cli_output(self.context))
-        elif Attrs.is_wasm_app():
-            # We zip the wat file
-            paths = []
-            if hasattr(self.context, 'wasm_file') and self.context.wasm_file:
-                result = compress_files_wasm(self.ZipFilePath, self.context)
-            else:
                 for file in self.context.files:
-                    paths.append(Path(file))
-                result = compress_files(self.ZipFilePath, *paths,
+                    files_list.append(Path(file))
+                is_file = False
+                for arg in jar_args:
+                    if is_file:
+                        files_list.append(Path(arg))
+                        is_file = False
+
+                    if arg == '-solanaInlining':
+                        is_file = True
+                    elif arg == '-solanaSummaries':
+                        is_file = True
+                result = compress_files(self.ZipFilePath, *files_list,
                                         short_output=Ctx.is_minimal_cli_output(self.context))
+
+            elif Attrs.is_soroban_app():
+                # We zip the wat file
+                for file in self.context.files:
+                    files_list.append(Path(file))
+                result = compress_files(self.ZipFilePath, *files_list,
+                                        short_output=Ctx.is_minimal_cli_output(self.context))
+            else:
+                raise Util.CertoraUserInputError(
+                    'When running rust application, context should either have attribute "rust_executables" '
+                    'provided by build_script execution, '
+                    'or either is_solana_app(), is_soroban_app() should be set to True'
+                )
+
         else:
             # Zip the log file first separately and again with the rest of the files, so it will not be decompressed
             # on each run in order to save space

certora_cli/EVMVerifier/certoraConfigIO.py

@@ -53,7 +53,6 @@ def read_from_conf_file(context: CertoraContext) -> None:
     context namespace if the key was not set in the command line (command line shadows conf data).
     @param context: A namespace containing options from the command line
     """
-
     conf_file_path = Path(context.files[0])
     assert conf_file_path.suffix == ".conf", f"conf file must be of type .conf, instead got {conf_file_path}"
 
@@ -86,6 +85,11 @@ def check_conf_content(conf: Dict[str, Any], context: CertoraContext) -> None:
                                    f" file ({conf_val})")
         else:
             raise Util.CertoraUserInputError(f"{option} appears in the conf file but is not a known attribute. ")
+
     if 'files' not in conf:
-        raise Util.CertoraUserInputError("Mandatory 'files' attribute is missing from the configuration")
-    context.files = conf['files']  # Override the current .conf file
+        if Attrs.is_rust_app() and hasattr(context, 'build_script') and context.build_script is not None:
+            context.files = conf.get('files', None)  # Override the current .conf file
+        else:
+            raise Util.CertoraUserInputError("Mandatory 'files' attribute is missing from the configuration")
+    else:
+        context.files = conf['files']  # Override the current .conf file

certora_cli/EVMVerifier/certoraContext.py

@@ -5,19 +5,13 @@ import logging
 import os
 import re
 import sys
-import shutil
-import platform
 
-#  tomllib was added to python 3.11 this import is for supporting older versions
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
 
 from pathlib import Path
 from typing import Dict, List, Optional, Any
 from rich.console import Console
 
+from EVMVerifier.certoraParseBuildScript import run_script_and_parse_json
 
 scripts_dir_path = Path(__file__).parent.resolve()  # containing directory
 sys.path.insert(0, str(scripts_dir_path))
@@ -112,15 +106,10 @@ 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_solana_app():
+    if 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])
 
-    if Attrs.is_wasm_app():
-        if hasattr(context, 'wasm_file') and context.wasm_file:
-            run_args.append(str(context.wasm_file))
-        else:
-            run_args.append(context.files[0])
-
     if Attrs.is_evm_app() and context.cache is not None:
         run_args.extend(['-cache', context.cache])
 
@@ -158,7 +147,7 @@ class ProverParser(AttrUtil.ContextAttributeParser):
         console = Console()
         console.print("\n\nThe Certora Prover - A formal verification tool for smart contracts")
         # Using sys.stdout.write() as print() would color some of the strings here
-        sys.stdout.write("\n\nUsage: certoraRun <Files> <Flags>\n\n")
+        sys.stdout.write(f"\n\nUsage: {sys.argv[0]} <Files> <Flags>\n\n")
         sys.stdout.write("Files are Solidity, Vyper contract files, a shared object Solana contract file, "
                          "or a conf file. Solidity contracts are denoted as file:contract "
                          "e.g. f.sol:A. If the contract name is identical to the file name, "
@@ -171,7 +160,7 @@ class ProverParser(AttrUtil.ContextAttributeParser):
         console.print("3. list (L): gets multiple strings as a value, flags may also appear multiple times")
         console.print("4. map (M): collection of key, value pairs\n\n")
 
-        Attrs.EvmProverAttributes.print_attr_help()
+        Attrs.get_attribute_class().print_attr_help()
         console.print("\n\nYou can find detailed documentation of the supported flags here: "
                       f"{Util.print_rich_link(CLI_DOCUMENTATION_URL)}\n\n")
 
@@ -527,52 +516,15 @@ def run_local_spec_check(with_typechecking: bool, context: CertoraContext) -> No
         raise Util.CertoraUserInputError("Cannot run local checks because of missing a suitable java installation. "
                                          "To skip local checks run with the --disable_local_typechecking flag")
 
-def set_cargo_name(context: CertoraContext) -> None:
-    mode = "r" if platform.system().lower() == 'windows' else "rb"
-    with open(context.cargo_file, mode) as f:
-        cargo_data = tomllib.load(f)
-
-    if 'package' in cargo_data and 'name' in cargo_data['package']:
-        context.cargo_name = cargo_data['package']['name'].replace('-', '_')
-
-def build_wasm(context: CertoraContext) -> None:
-    if len(context.files) != 1:
-        raise Util.CertoraUserInputError(f"expected a single wasm file ({Util.CARGO_FILE} or .wat file)."
-                                         f" Got: {context.files}")
-    file_path = Path(context.files[0])
-    if file_path.name != Util.CARGO_FILE:
-        return
-    context.cargo_dir = file_path.parent
-    context.cargo_file = file_path
-    set_cargo_name(context)
-    run_wasm_compiler(context)
-
-
-def run_wasm_compiler(context: CertoraContext) -> None:
-    env = os.environ.copy()
-    env['RUSTFLAGS'] = "-C strip=none --emit=llvm-ir -C debuginfo=2"
-    try:
-        context_logger.info("Executing build process...")
-
-        cmd = f"cargo build --target={context.wasm_target} --release  --features certora"
-        Util.run_shell_command(cmd, env=env, cwd=context.cargo_dir)
 
-        context.wasm_file = Path(f"{context.cargo_dir}/target/{context.wasm_target}/release/{context.cargo_name}.wasm")
-        intermediate_wasm = Path("tmpwasm.wasm")
-
-        wat_file = context.wasm_file.with_suffix(".wat")
-
-        cmd = f"wasm2wat {context.wasm_file} --generate-names -o {wat_file}"
-        Util.run_shell_command(cmd, cwd=context.cargo_dir, env=env)
-
-        cmd = f"wat2wasm {wat_file} --debug-names -o {intermediate_wasm}"
-        Util.run_shell_command(cmd, cwd=context.cargo_dir, env=env)
-
-        cmd = f"wasm2wat {intermediate_wasm} -o {wat_file}"
-        Util.run_shell_command(cmd, cwd=context.cargo_dir, env=env)
-
-        intermediate_wasm.unlink()
-        shutil.copy(context.wasm_file, context.cargo_dir)
-
-    except Exception as e:
-        raise RuntimeError(f"Failed to build wasm file\n{e}")
+def build_rust_app(context: CertoraContext) -> None:
+    if context.build_script:
+        run_script_and_parse_json(context)
+        if not context.rust_executables:
+            raise Util.CertoraUserInputError("failed to get target executable")
+    else:
+        if not context.files:
+            raise Util.CertoraUserInputError("'files' or 'build_script' must be set for Rust projects")
+        if len(context.files) > 1:
+            raise Util.CertoraUserInputError("Rust projects must specify exactly one executable in 'files'.")
+        context.rust_executables = context.files[0]

certora_cli/EVMVerifier/certoraContextAttributes.py

@@ -1,4 +1,5 @@
 import logging
+
 import json5
 import sys
 from pathlib import Path
@@ -37,6 +38,17 @@ def validate_prover_args(value: str) -> str:
 
 
 class CommonAttributes(AttrUtil.Attributes):
+    COMPILATION_STEPS_ONLY = AttrUtil.AttributeDefinition(
+        arg_type=AttrUtil.AttrArgType.BOOLEAN,
+        help_msg="Compile the spec and the code without sending a verification request to the cloud",
+        default_desc="Sends a request after source compilation and spec syntax checking",
+        argparse_args={
+            'action': AttrUtil.STORE_TRUE
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
     MSG = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_msg,
         help_msg="Add a message description to your run",
@@ -149,6 +161,7 @@ class CommonAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
+
 class DeprecatedAttributes(AttrUtil.Attributes):
     AUTO_NONDET_DIFFICULT_INTERNAL_FUNCS = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
@@ -418,17 +431,6 @@ class EvmAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-    COMPILATION_STEPS_ONLY = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        help_msg="Compile the spec and the code without sending a verification request to the cloud",
-        default_desc="Sends a request after source compilation and spec syntax checking",
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-
     NO_MEMORY_SAFE_AUTOFINDERS = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
         # This is a hidden flag, the following two attributes are left intentionally as comments to help devs
@@ -1384,6 +1386,20 @@ class BackendAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
+
+class RustAttributes(AttrUtil.Attributes):
+
+    BUILD_SCRIPT = AttrUtil.AttributeDefinition(
+        help_msg="Python script to build the project",
+        default_desc="Using default building command",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
+
 class EvmProverAttributes(CommonAttributes, DeprecatedAttributes, EvmAttributes, InternalUseAttributes,
                           BackendAttributes):
     FILES = AttrUtil.AttributeDefinition(
@@ -1399,9 +1415,9 @@ class EvmProverAttributes(CommonAttributes, DeprecatedAttributes, EvmAttributes,
     )
 
 
-class SorobanProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes):
+class SorobanProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes, RustAttributes):
     FILES = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_wasm_file,
+        attr_validation_func=Vf.validate_soroban_extension,
         arg_type=AttrUtil.AttrArgType.LIST,
         help_msg="binary .wat files for the Prover",
         default_desc="",
@@ -1412,19 +1428,10 @@ class SorobanProverAttributes(CommonAttributes, InternalUseAttributes, BackendAt
         disables_build_cache=False
     )
 
-    WASM_TARGET = AttrUtil.AttributeDefinition(
-        default_desc="",
-        argparse_args={
-            'action': AttrUtil.UniqueStore,
-            'default': "wasm32-unknown-unknown"
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
 
-class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes):
+class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes, RustAttributes):
     FILES = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_solana_file,
+        attr_validation_func=Vf.validate_solana_extension,
         arg_type=AttrUtil.AttrArgType.LIST,
         help_msg="contract files for analysis SOLANA_FILE.so or a conf file",
 
@@ -1460,9 +1467,9 @@ def detect_application_class(args: List[str]) -> Type[AttrUtil.Attributes]:
     def application_by_suffix(file: str) -> Type[AttrUtil.Attributes]:
         if file.endswith(Util.EVM_EXTENSIONS):
             return EvmProverAttributes
-        elif file.endswith(Util.WASM_EXTENSIONS) or Path(file).name == Util.CARGO_FILE:
+        elif file.endswith(Util.SOROBAN_EXEC_EXTENSION):
             return SorobanProverAttributes
-        elif file.endswith(Util.SOLANA_EXTENSIONS):
+        elif file.endswith(Util.SOLANA_EXEC_EXTENSION):
             return SolanaProverAttributes
         elif file.endswith('.conf'):
             raise Util.CertoraUserInputError(f"Cannot use conf files inside a conf file: {file}")
@@ -1472,6 +1479,7 @@ def detect_application_class(args: List[str]) -> Type[AttrUtil.Attributes]:
     cli_files = []
     cli_conf_files = []
     files = []
+    build_script = None
     for arg in args:
         if arg.startswith('-'):
             break  # Stop processing when a flag is detected
@@ -1485,6 +1493,10 @@ def detect_application_class(args: List[str]) -> Type[AttrUtil.Attributes]:
         with conf_file_path.open() as conf_file:
             configuration = json5.load(conf_file, allow_duplicate_keys=False)
             files = configuration.get('files', [])
+            build_script = configuration.get('build_script')
+
+    if build_script:
+        return SorobanProverAttributes
 
     if len(cli_conf_files) == 0:
         files = cli_files
@@ -1516,9 +1528,13 @@ def is_solana_app() -> bool:
     return get_attribute_class() == SolanaProverAttributes
 
 
-def is_wasm_app() -> bool:
+def is_soroban_app() -> bool:
     return get_attribute_class() == SorobanProverAttributes
 
 
+def is_rust_app() -> bool:
+    return is_soroban_app() or is_solana_app()
+
+
 def is_evm_app() -> bool:
     return get_attribute_class() == EvmProverAttributes

certora_cli/EVMVerifier/certoraContextValidator.py

@@ -409,8 +409,7 @@ def check_contract_name_arg_inputs(context: CertoraContext) -> None:
 def valid_input_file(filename: str) -> bool:
     pattern_match_sol = bool(re.match(r'([\w.$]+)\.sol:([\w$]+)', Path(filename).name))
     ends_with_extension = any(filename.endswith(ext) for ext in Util.VALID_FILE_EXTENSIONS)
-    is_cargo_file = Path(filename).name == Util.CARGO_FILE
-    return pattern_match_sol or ends_with_extension or is_cargo_file
+    return pattern_match_sol or ends_with_extension
 
 
 def check_files_attribute(context: CertoraContext) -> None:
@@ -492,7 +491,7 @@ def check_mode_of_operation(context: CertoraContext) -> None:
             raise Util.CertoraUserInputError(
                 f"Cannot use conf files inside a conf file: {','.join(conf_files_inside_conf_file)}")
 
-        special_file_suffixes = [".tac", ".json"] + list(Util.SOLANA_EXTENSIONS) + list(Util.WASM_EXTENSIONS)
+        special_file_suffixes = [".tac", ".json"] + [Util.SOLANA_EXEC_EXTENSION, Util.SOROBAN_EXEC_EXTENSION]
         for input_file in context.files:
             special_file_type = next((suffix for suffix in special_file_suffixes if input_file.endswith(suffix)), None)
 
@@ -710,7 +709,6 @@ def validate_certora_key() -> str:
         raise Util.CertoraUserInputError(f"environment variable {KEY_ENV_VAR} has an illegal length")
     return key
 
-
 def check_files_input(file_list: List[str]) -> None:
     """
     Verifies that correct input was inserted as input to files.
@@ -719,8 +717,8 @@ def check_files_input(file_list: List[str]) -> None:
     The allowed disjoint cases are:
     1. Use a single .conf file
     2. Use a single .tac file
-    3. Use a single .o or .so file
-    4. Use a single .wat or .wasm file or a single Cargo.toml file
+    3. Use a single .so file
+    4. Use a single .wasm file
     5. Use any number of [contract.sol:nickname ...] (at least one is guaranteed by argparser)
     @param file_list: A list of strings representing file paths
     @raise CertoraUserInputError if more than one of the modes above was used
@@ -733,13 +731,10 @@ def check_files_input(file_list: List[str]) -> None:
             if '.conf' in file:
                 raise Util.CertoraUserInputError(
                     f'The conf file {file} cannot be accompanied with other files')
-            if file.endswith(Util.SOLANA_EXTENSIONS):
+            if file.endswith(Util.SOLANA_EXEC_EXTENSION):
                 raise Util.CertoraUserInputError(f'The Solana file {file} cannot be accompanied with other files')
-            if file.endswith(Util.WASM_EXTENSIONS) or file == Util.CARGO_FILE:
-                raise Util.CertoraUserInputError(
-                    f'When using the tool in WASM mode, you can only provide a single Cargo.toml file or .wat file.'
-                    f'{num_files} files were given.')
-
+            if file.endswith(Util.SOROBAN_EXEC_EXTENSION):
+                raise Util.CertoraUserInputError(f'The Soroban file {file} cannot be accompanied with other files')
 
 def set_wait_for_results_default(context: CertoraContext) -> None:
     if context.wait_for_results is None:

certora_cli/EVMVerifier/certoraParseBuildScript.py

@@ -0,0 +1,36 @@
+import subprocess
+import json
+from pathlib import Path
+
+from EVMVerifier.certoraContextClass import CertoraContext
+from Shared import certoraUtils as Util
+import os
+
+
+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)
+
+        # Check if the script executed successfully
+        if result.returncode != 0:
+            raise Util.CertoraUserInputError(f"Error running the script {context.build_script}\n{result.stderr}")
+
+        json_obj = json.loads(result.stdout)
+
+        if not json_obj or not json_obj.get("success"):
+            raise Util.CertoraUserInputError(f"{result.stderr}\nBuild from {context.build_script} failed")
+
+        context.rust_project_directory = json_obj.get("project_directory")
+        context.rust_sources = json_obj.get("sources")
+        context.rust_executables = json_obj.get("executables")
+
+    except FileNotFoundError as e:
+        raise Util.CertoraUserInputError(f"File not found: {e}")
+    except json.JSONDecodeError as e:
+        raise Util.CertoraUserInputError(f"Error decoding JSON: {e}")
+    except Exception as e:
+        raise Util.CertoraUserInputError(f"An unexpected error occurred: {e}")

certora_cli/Mutate/mutateApp.py

@@ -715,11 +715,7 @@ class MutateApp:
         self.server = self.config_server()
 
     def is_soroban_run(self) -> bool:
-        try:
-            files = self.prover_context.files
-        except AttributeError:
-            return False
-        return Util.CARGO_FILE in files or any(Path(path).suffix == '.wasm' for path in files)
+        return (hasattr(self.prover_context, 'build_script') and self.prover_context is not None)
 
     def config_server(self) -> str:
         """
@@ -873,6 +869,16 @@ class MutateApp:
         self.backup_paths = []
 
     def submit_soroban(self) -> None:
+
+        try:
+            original_run_result = self.run_certora_prover(self.conf, self.mutation_test_id, msg=MConstants.ORIGINAL)
+        except Exception as e:
+            raise Util.CertoraUserInputError(f"Orig run: {e}")
+        if not original_run_result:
+            raise Util.CertoraUserInputError("No Orig results")
+        result_link = original_run_result.rule_report_link
+        assert result_link, "submit_soroban: Null result_link"
+
         mutation_logger.info("Generating mutants and submitting...")
         generated_mutants: List[Mutant] = self.get_universal_mutator_mutants()
 
@@ -1341,7 +1347,8 @@ class MutateApp:
         for mutant in self.universal_mutator:
             file_to_mutate = Path(os.path.normpath(mutant[MConstants.FILE_TO_MUTATE]))
             mutants_location = Path(mutant[MConstants.MUTANTS_LOCATION])
-            run_universal_mutator(file_to_mutate, mutants_location)
+            num_of_mutants = mutant[MConstants.NUM_MUTANTS]
+            run_universal_mutator(file_to_mutate, self.prover_context.build_script, mutants_location, num_of_mutants)
             self.add_dir_to_mutants(ret_mutants, mutants_location, file_to_mutate)
         return ret_mutants
 
@@ -1784,7 +1791,9 @@ class MutateApp:
 
     # all keys in prover_context must exist as attribute of certoraRun
     def check_prover_context(self) -> None:
-        prover_attrs = [attr.get_conf_key() for attr in Attrs.EvmProverAttributes.attribute_list()]
+        attributes = Attrs.SorobanProverAttributes.attribute_list() if self.is_soroban_run() \
+            else Attrs.EvmProverAttributes.attribute_list()
+        prover_attrs = [attr.get_conf_key() for attr in attributes]
         for key in vars(self.prover_context).keys():
             if key not in prover_attrs:
                 raise Util.CertoraUserInputError(f"{key} not a valid attribute in a conf file")

certora_cli/Shared/certoraUtils.py

@@ -78,7 +78,7 @@ RECENT_JOBS_FILE = Path(".certora_recent_jobs.json")
 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'
 # contract names in Solidity consists of alphanums, underscores and dollar signs
 # https://docs.soliditylang.org/en/latest/grammar.html#a4.SolidityLexer.Identifier
@@ -89,11 +89,10 @@ NEW_LINE = '\n'  # for new lines in f strings
 VY_EXT = '.vy'
 SOL_EXT = '.sol'
 YUL_EXT = '.yul'
-CARGO_FILE = "Cargo.toml"
 EVM_EXTENSIONS = ('.sol', VY_EXT, YUL_EXT, '.tac', '.json')
-SOLANA_EXTENSIONS = ('.so', '.o')
-WASM_EXTENSIONS = ('.wat', '.wasm')
-VALID_FILE_EXTENSIONS = ['.conf'] + list(EVM_EXTENSIONS) + list(SOLANA_EXTENSIONS) + list(WASM_EXTENSIONS)
+SOLANA_EXEC_EXTENSION = '.so'
+SOROBAN_EXEC_EXTENSION = '.wasm'
+VALID_FILE_EXTENSIONS = ['.conf'] + list(EVM_EXTENSIONS) + [SOLANA_EXEC_EXTENSION, SOROBAN_EXEC_EXTENSION]
 # Type alias definition, not a variable
 CompilerVersion = Tuple[int, int, int]
 
@@ -1241,7 +1240,7 @@ class TestValue(NoValEnum):
     AFTER_COLLECT = auto()
     AFTER_BUILD_MUTANTS_DIRECTORY = auto()
     AFTER_GENERATE_COLLECT_REPORT = auto()
-    AFTER_BUILD_WASM = auto()
+    AFTER_BUILD_RUST = auto()
 
 
 class FeValue(NoValEnum):
@@ -1368,9 +1367,7 @@ def get_ir_flag(solc: str) -> str:
     return ''
 
 
-def run_shell_command(cmd: str, env: Dict[str, str], cwd: Optional[Path]) -> None:
-    if not cwd:
-        cwd = Path.cwd()
+def run_shell_command(cmd: Union[str, List[str]], env: Dict[str, str] = os.environ.copy(), cwd: Path = Path.cwd()) -> None:
     try:
         print(f"Executing:  {cmd}")
         result = subprocess.run(cmd, shell=True, capture_output=True, text=True, env=env, cwd=cwd)

certora_cli/Shared/certoraValidateFuncs.py

@@ -244,6 +244,17 @@ def validate_optional_readable_file(filename: str) -> str:
 def validate_spec_file(filename: str) -> str:
     return validate_readable_file(filename, (".spec", ".cvl"))
 
+def validate_soroban_extension(filename: str) -> str:
+    if not filename.lower().endswith(Util.SOROBAN_EXEC_EXTENSION):
+        raise Util.CertoraUserInputError(f"{filename} does not end with {Util.SOROBAN_EXEC_EXTENSION}")
+    return filename
+
+
+def validate_solana_extension(filename: str) -> str:
+    if not filename.lower().endswith(Util.SOLANA_EXEC_EXTENSION):
+        raise Util.CertoraUserInputError(f"{filename} does not end with {Util.SOLANA_EXEC_EXTENSION}")
+    return filename
+
 
 def validate_readable_file(filename: str, extensions: Union[str, tuple] = '') -> str:
     file_path = Path(filename)
@@ -253,8 +264,6 @@ def validate_readable_file(filename: str, extensions: Union[str, tuple] = '') ->
         raise Util.CertoraUserInputError(f"'{filename}' is a directory and not a file")
     if not os.access(filename, os.R_OK):
         raise Util.CertoraUserInputError(f"no read permissions for {filename}")
-    if Path(filename).name == Util.CARGO_FILE:
-        return filename
     if extensions and not filename.lower().endswith(extensions):
         raise Util.CertoraUserInputError(f"{filename} does not end with {extensions}")
 
@@ -375,14 +384,12 @@ def validate_exec_file(file_name: str) -> str:
     return file_name
 
 
-def validate_wasm_file(file: str) -> str:
-    if file == Util.CARGO_FILE:
-        return validate_readable_file(Util.CARGO_FILE)
-    return validate_readable_file(file, Util.WASM_EXTENSIONS)
+def validate_soroban_file(file: str) -> str:
+    return validate_readable_file(file, Util.SOROBAN_EXEC_EXTENSION)
 
 
 def validate_solana_file(file: str) -> str:
-    return validate_readable_file(file, Util.SOLANA_EXTENSIONS)
+    return validate_readable_file(file, Util.SOLANA_EXEC_EXTENSION)
 
 
 def validate_contract_extension_attr(map: Any) -> Dict[str, List[Dict[str, Any]]]:

certora_cli/certoraRun.py

@@ -24,7 +24,6 @@ from EVMVerifier import certoraContextValidator as Cv
 import EVMVerifier.certoraContextAttributes as Attrs
 from Shared import certoraAttrUtil as AttrUtil
 
-
 BUILD_SCRIPT_PATH = Path("EVMVerifier/certoraBuild.py")
 VIOLATIONS_EXIT_CODE = 100
 
@@ -95,9 +94,9 @@ def run_certora(args: List[str], attrs_class: Optional[Type[AttrUtil.Attributes]
         raise Util.TestResultsReady(metadata)
     metadata.dump()
 
-    if Attrs.is_solana_app() or Attrs.is_wasm_app():
-        if Attrs.is_wasm_app():
-            Ctx.build_wasm(context)
+    if Attrs.is_rust_app():
+        Ctx.build_rust_app(context)
+
         if context.local:
             check_cmd = Ctx.get_local_run_cmd(context)
             print(f"Verifier run command:\n {check_cmd}", flush=True)
@@ -244,7 +243,6 @@ def entry_point() -> None:
     It is important this function gets no arguments!
     """
     try:
-        Attrs.set_attribute_class(Attrs.EvmProverAttributes)
         run_certora(sys.argv[1:])
         sys.exit(0)
     except KeyboardInterrupt:

certora_cli/certoraSolanaProver.py

@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+
+import sys
+import time
+import logging
+from typing import List, Optional, Type
+from pathlib import Path
+from rich.console import Console
+
+scripts_dir_path = Path(__file__).parent.resolve()  # containing directory
+sys.path.insert(0, str(scripts_dir_path))
+
+from Shared import certoraUtils as Util
+from Shared import certoraAttrUtil as AttrUtil
+from Shared.certoraLogging import LoggingManager
+
+from EVMVerifier.certoraCloudIO import CloudVerification, validate_version_and_branch
+from EVMVerifier.certoraCollectRunMetadata import collect_run_metadata
+from EVMVerifier import certoraContextValidator as Cv
+
+import EVMVerifier.certoraContext as Ctx
+import EVMVerifier.certoraContextAttributes as Attrs
+
+from certoraRun import CertoraRunResult, VIOLATIONS_EXIT_CODE, CertoraFoundViolations
+
+# logger for issues regarding the general run flow.
+# Also serves as the default logger for errors originating from unexpected places.
+run_logger = logging.getLogger("run")
+
+
+def run_solana_prover(args: List[str], attrs_class: Optional[Type[AttrUtil.Attributes]] = None) \
+        -> Optional[CertoraRunResult]:
+    """
+    The main function that is responsible for the general flow of the script.
+    The general flow is:
+    1. Parse program arguments
+    2. Run the necessary steps (build/ cloud verification/ local verification)
+    """
+
+    Attrs.set_attribute_class(Attrs.SolanaProverAttributes)
+    non_str_els = [x for x in args if not isinstance(x, str)]
+    if non_str_els:
+        print(f"args for run_certora that are not strings: {non_str_els}")
+        exit(1)
+
+    # If we are not in debug mode, we do not want to print the traceback in case of exceptions.
+    if '--debug' not in args:  # We check manually, because we want no traceback in argument parsing exceptions
+        sys.tracebacklimit = 0
+
+    # creating the default internal dir, files may be copied to user defined build directory after
+    # parsing the input
+
+    if not ('--help' in args or '--version' in args):
+        Util.reset_certora_internal_dir()
+        Util.safe_create_dir(Util.get_build_dir())
+        logging_manager = LoggingManager()
+
+    Ctx.handle_flags_in_args(args)
+    context = Ctx.get_args(args)  # Parse arguments
+    logging_manager.set_log_level_and_format(is_quiet=Ctx.is_minimal_cli_output(context),
+                                             debug=context.debug,
+                                             debug_topics=context.debug_topics,
+                                             show_debug_topics=context.show_debug_topics)
+
+    timings = {}
+    exit_code = 0  # The exit code of the script. 0 means success, any other number is an error.
+    return_value = None
+
+    metadata = (
+        collect_run_metadata(wd=Path.cwd(), raw_args=sys.argv, context=context))
+
+    if context.test == str(Util.TestValue.CHECK_METADATA):
+        raise Util.TestResultsReady(metadata)
+    metadata.dump()
+
+    # Build Solana - If input file is .so or .o file, we skip building part
+    run_logger.debug("Build Solana target")
+    build_start = time.perf_counter()
+
+    Ctx.build_rust_app(context)
+    build_end = time.perf_counter()
+    timings["buildTime"] = round(build_end - build_start, 4)
+    if context.test == str(Util.TestValue.AFTER_BUILD):
+        raise Util.TestResultsReady(None)
+
+    if context.local:
+        check_cmd = Ctx.get_local_run_cmd(context)
+        print(f"Verifier run command:\n {check_cmd}", flush=True)
+
+        compare_with_tool_output = False
+        run_result = Util.run_jar_cmd(check_cmd, compare_with_tool_output, logger_topic="verification",
+                                      print_output=True)
+
+        if run_result != 0:
+            exit_code = 1
+        else:
+            Util.print_completion_message("Finished running verifier:")
+            print(f"\t{check_cmd}")
+    else:
+        validate_version_and_branch(context)
+        context.key = Cv.validate_certora_key()
+        cloud_verifier = CloudVerification(context, timings)
+        # Wrap strings with space with ' so it can be copied and pasted to shell
+        pretty_args = [f"'{arg}'" if ' ' in arg else arg for arg in args]
+        cl_args = ' '.join(pretty_args)
+        logging_manager.remove_debug_logger()
+        result = cloud_verifier.cli_verify_and_report(cl_args, context.wait_for_results)
+        if cloud_verifier.statusUrl:
+            return_value = CertoraRunResult(cloud_verifier.statusUrl, False,
+                                            Util.get_certora_sources_dir(), cloud_verifier.reportUrl)
+        if not result:
+            exit_code = 1
+
+    if exit_code == VIOLATIONS_EXIT_CODE:
+        raise CertoraFoundViolations("violations were found", return_value)
+    if exit_code != 0:
+        raise Util.CertoraUserInputError(f"run_certora failed (code {exit_code})")
+    return return_value
+
+
+def entry_point() -> None:
+    """
+    This function is the entry point of the certora_cli customer-facing package, as well as this script.
+    It is important this function gets no arguments!
+    """
+    try:
+        run_solana_prover(sys.argv[1:])
+        sys.exit(0)
+    except KeyboardInterrupt:
+        Console().print("[bold red]\nInterrupted by user")
+        sys.exit(1)
+    except CertoraFoundViolations as e:
+        try:
+            if e.results and e.results.rule_report_link:
+                print(f"report url: {e.results.rule_report_link}")
+        except Exception:
+            pass
+        Console().print("[bold red]\nViolations were found\n")
+        sys.exit(1)
+    except Util.CertoraUserInputError as e:
+        if e.orig:
+            print(f"\n{str(e.orig).strip()}")
+        if e.more_info:
+            print(f"\n{e.more_info.strip()}")
+        Console().print(f"[bold red]\n{e}\n")
+        sys.exit(1)
+    except Exception as e:
+        Console().print(f"[bold red]{e}")
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    entry_point()

certora_cli/rustMutator.py

@@ -6,8 +6,8 @@ import argparse
 from pathlib import Path
 import logging
 import re
-import os
 import random
+from tqdm import tqdm
 from typing import List, Tuple
 
 from Shared import certoraUtils as Util
@@ -37,6 +37,13 @@ def parse_args() -> argparse.Namespace:
         required=True,
         help="Path to the Rust source file to mutate (e.g., src/lib.rs)"
     )
+    parser.add_argument(
+        "--build_script",
+        "-b",
+        type=str,
+        required=True,
+        help = "Custom build command to execute for each mutant (e.g., 'cargo build --release')"
+    )
     parser.add_argument(
         "--mutants_location",
         "-m",
@@ -82,16 +89,25 @@ def restore_source(backup_file: Path, file_to_mutant: Path) -> None:
         rust_mutator_logger.warning(f"No backup file '{backup_file}' found. Skipping restoration.")
 
 
-def clean_temp_files() -> None:
+def clean_temp_files(file_to_mutant: Path) -> None:
     """
     Remove temporary mutant output files matching the pattern '.um.mutant_output.*'.
+
+    Args:
+        file_to_mutant (Path): Path to the original source file.
     """
-    temp_files = Path().glob(".um.mutant_output.*")
+    temp_files = Path().rglob(".um.mutant_output.*")
 
     rust_mutator_logger.info("Removing temporary mutant output files...")
     for temp_file in temp_files:
         temp_file.unlink()
         rust_mutator_logger.info(f"Removed: {temp_file}")
+
+    backup_file = next(Path().rglob(f"{file_to_mutant}.um.backup.*"), None)
+    if backup_file:
+        backup_file.unlink()
+        rust_mutator_logger.info(f"Removed: {backup_file}")
+
     rust_mutator_logger.info("Temporary files removal completed.")
 
 
@@ -224,18 +240,6 @@ def validate_mutant_count(file_to_mutant: Path, mutants_location: Path, num_muta
                 rust_mutator_logger.debug(f"Renamed {mutant} to {new_file_name}")
                 break
 
-
-def validate_cargo() -> None:
-    """
-    Validate that the cargo.toml file is in the current working directory.
-
-    Raises:
-        Util.CertoraUserInputError: If validation fails.
-    """
-    if not Path(Util.CARGO_FILE).exists():
-        raise Util.CertoraUserInputError(f"'{Util.CARGO_FILE}' not found in the current working directory: {os.getcwd()}")
-
-
 def validate_mutate_command() -> None:
     """
     Validate that the universalmutator command is available in the PATH.
@@ -247,15 +251,17 @@ 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, debug: bool = False) -> None:
+def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str) -> None:
     """
-    Execute the universalmutator command to generate mutants.
+    Execute the universalmutator command to generate mutants, displaying a progress bar.
 
     Args:
         file_to_mutant (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.
-        debug (bool): Enable debug logging.
+
+    Raises:
+        subprocess.CalledProcessError: If the mutate command fails.
     """
     mutate_command = [
         "mutate",
@@ -266,22 +272,87 @@ def run_mutate(file_to_mutant: Path, mutants_location: Path, build_command: str,
         "--cmd",
         build_command
     ]
-
     rust_mutator_logger.info("Generating mutants...")
     rust_mutator_logger.debug(f"Running universalmutator with command: {' '.join(mutate_command)}")
-    if not debug:
-        subprocess.run(mutate_command, check=True, stdout=subprocess.DEVNULL)
-    else:
-        subprocess.run(mutate_command, check=True)
-    rust_mutator_logger.info("Mutation generation completed successfully.")
 
+    # Initialize the subprocess with real-time output capture
+    process = subprocess.Popen(
+        mutate_command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        universal_newlines=True,
+        bufsize=1
+    )
+
+    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\]")
+
+    progress_bar = None
+
+    try:
+        if not process.stdout:
+            rust_mutator_logger.error("Failed to capture output from the mutate command.")
+            raise subprocess.CalledProcessError(1, mutate_command)
+
+        for line in process.stdout:
+            line = line.strip()
+            rust_mutator_logger.debug(line)
+
+            # Parse total number of mutants from the initial output
+            if total_mutants is None:
+                total_match = total_pattern.match(line)
+                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}")
+                    continue
+
+            # Update progress bar for each processed mutant
+            mutant_match = mutant_pattern.match(line)
+            if mutant_match and progress_bar:
+                progress_bar.update(1)
+                continue
+
+            # Optionally, handle validation messages
+            if valid_mutant_pattern.search(line):
+                rust_mutator_logger.info(f"Valid mutant generated: {line}")
+
+        process.wait()
 
-def run_universal_mutator(file_to_mutant: Path, mutants_location: Path, num_mutants: int = NUM_MUTANTS, seed: int = SEED, debug: bool = False) -> None:
+        if progress_bar:
+            progress_bar.close()
+
+        if process.returncode != 0:
+            rust_mutator_logger.error(f"Mutation generation failed with return code {process.returncode}")
+            raise subprocess.CalledProcessError(process.returncode, mutate_command)
+
+        rust_mutator_logger.info("Mutation generation completed successfully.")
+
+    except Exception as e:
+        if progress_bar:
+            progress_bar.close()
+        rust_mutator_logger.error(f"An error occurred during mutation generation: {e}")
+        raise
+    finally:
+        if process and process.poll() is None:
+            process.terminate()
+
+def run_universal_mutator(
+        file_to_mutant: Path,
+        build_script: str,
+        mutants_location: Path,
+        num_mutants: int = NUM_MUTANTS,
+        seed: int = SEED,
+        debug: bool = False
+) -> None:
     f"""
     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.
+        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}).
         seed (int): Seed value for random selection to ensure repeatable testing (default: {SEED}).
@@ -291,14 +362,9 @@ def run_universal_mutator(file_to_mutant: Path, mutants_location: Path, num_muta
         Util.CertoraUserInputError: If any validation fails.
         Exception: For unexpected errors.
     """
-
-    # Define the build command, ensuring it dynamically references the correct source file
-    build_command = (
-        f'cp MUTANT {file_to_mutant} && '
-        'RUSTFLAGS="-C strip=none --emit=llvm-ir" '
-        'cargo build --target=wasm32-unknown-unknown --release --features certora'
-    )
     backup_file = None
+    build_command = f"cp MUTATE & python3 {build_script}"
+
     try:
         # Set up the logger
         setup_logger(debug)
@@ -306,9 +372,6 @@ def run_universal_mutator(file_to_mutant: Path, mutants_location: Path, num_muta
         # Validate mutate command is available
         validate_mutate_command()
 
-        # Validate cargo.toml is in CWD
-        validate_cargo()
-
         # Validate source file
         validate_source_file(file_to_mutant)
 
@@ -324,7 +387,7 @@ def run_universal_mutator(file_to_mutant: Path, mutants_location: Path, num_muta
         validate_mutant_dir(mutants_location)
 
         # Run the mutation command
-        run_mutate(file_to_mutant, mutants_location, build_command, debug)
+        run_mutate(file_to_mutant, 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)
@@ -334,10 +397,17 @@ def run_universal_mutator(file_to_mutant: Path, mutants_location: Path, num_muta
         if backup_file:
             Util.restore_backup(backup_file)
         # Clean up temporary files
-        clean_temp_files()
+        clean_temp_files(file_to_mutant)
 
 
 if __name__ == "__main__":
     # Parse command-line arguments
     args = parse_args()
-    run_universal_mutator(args.file_to_mutant, args.mutants_location, args.num_mutants, args.seed, args.debug)
+    run_universal_mutator(
+        args.file_to_mutant,
+        args.build_script,
+        args.mutants_location,
+        args.num_mutants,
+        args.seed,
+        args.debug
+    )

{certora_cli_alpha_master-20241216.22.25.927248.dist-info → certora_cli_alpha_master-20241217.16.7.546354.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241216.22.25.927248
+Version: 20241217.16.7.546354
 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 6e2a8f1.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 77317ff.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20241216.22.25.927248.dist-info → certora_cli_alpha_master-20241217.16.7.546354.dist-info}/RECORD

@@ -3,25 +3,27 @@ certora_bins/gambit,sha256=mEtRHvYfT6ShKzPHpLNwqAhDfTwRjoj3wRwGYYkRxUs,3820384
 certora_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 certora_cli/certoraEqCheck.py,sha256=5LtN9GNBSYR_kYghDBeNNL4yWshPw9PNpe0stLtuIxQ,379
 certora_cli/certoraMutate.py,sha256=BUK_keaunrcCYgLiwHfIkDSjIHM_KoGwwnIiuojc-ug,2643
-certora_cli/certoraRun.py,sha256=IOl3iLVivvnGms26SfHEkfwesWV52iR4wbYbw5GbDT8,12002
-certora_cli/rustMutator.py,sha256=JRxQ-20k5iJ7B04WZXWMP-sVEW-DVIYQZCpIYJaX_B8,12113
+certora_cli/certoraRun.py,sha256=rnczNnSoYRuUKOkIN7_0cRxjiVDK0x4NJxOT4KNkYdg,11884
+certora_cli/certoraSolanaProver.py,sha256=3Vb05zd5PqkU5CmCNzYvmYfbC-hsmU6Tt390msjQlOc,5898
+certora_cli/rustMutator.py,sha256=wSE_4qDegDhItxHw7dtcFzDMgYCTsVxW4yFGxYRHlQc,14418
 certora_cli/EVMVerifier/__init__.py,sha256=AJxj90KAGh1JqAsxKqDBTL2rFbqgtkhDfW_XmxSHft0,159
 certora_cli/EVMVerifier/certoraBuild.py,sha256=omIs-4cQWR-IT3WTckXMZe9EZMyk2e-hSfRqG7iQJHo,203131
 certora_cli/EVMVerifier/certoraBuildCacheManager.py,sha256=ZSVCsdTkFFtawuNJ8VK3wJOb01Uyu5e8viPQ8wTziSQ,12563
 certora_cli/EVMVerifier/certoraBuildDataClasses.py,sha256=4IhvOA_fg-ij5RM9RRlvDDoS7imfp4Zru-AgHhxcHc0,13314
-certora_cli/EVMVerifier/certoraCloudIO.py,sha256=bu7s5lK7I8FmxQzGP7Sb5g8Q4dvCk3KXSsBMsNDes14,52460
+certora_cli/EVMVerifier/certoraCloudIO.py,sha256=ZZDjMsSkp0ZN5IA1JczhJa2m16s0nC3DBcHHDv5J2kc,54931
 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=8BUxRmRfmbRroYOJvjemDPPdvdXqmyMqKnfPnOwA3yA,4409
-certora_cli/EVMVerifier/certoraContext.py,sha256=w4k6_O7sT9OuK8MmJrTUZjjCeflOPNpg_gHIieZtKkQ,23640
-certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=I-8Ll3aK48EdBegpd-eMzjydImh_aeCtjGx6NqvkbX0,55308
+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/certoraContextClass.py,sha256=qdHYmrzI4zeQaAaMnonw4C-h1PFrPEhI84trrgvxFj0,210
-certora_cli/EVMVerifier/certoraContextValidator.py,sha256=JUOVaHquuEOv5hTo2b_f7G_6lxFB4Wm_IlsfeQmOrx8,37451
+certora_cli/EVMVerifier/certoraContextValidator.py,sha256=YE4_BYRhZhXWEtjodD_Pligh8opdaOjs27mVEoy74ZY,37210
 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/certoraSourceFinders.py,sha256=fZLYGjNgntIySnG76DwsjRZ-UHiy0zEkM6xNP7cYpDE,18342
 certora_cli/EVMVerifier/certoraType.py,sha256=mmMQ2yrffKmoH_dHhO7cMQfEENZwHw1jLbyUo98xzas,28598
 certora_cli/EVMVerifier/certoraVerifyGenerator.py,sha256=OT5zrtQMXDoaVdGfQ4_gbAnITin3nlXgXTgw3msqlNQ,9452
@@ -41,7 +43,7 @@ certora_cli/EquivalenceCheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 certora_cli/EquivalenceCheck/equivCheck.py,sha256=eG6jCa1DmHqPweGpjby-6Bnym91maffH4olE22uB2-c,19828
 certora_cli/EquivalenceCheck/sanity.spec,sha256=tWmE9z2Sq3_SWaqKDRQaNajRrw94maUrirvoUmX89LE,103
 certora_cli/Mutate/__init__.py,sha256=AJxj90KAGh1JqAsxKqDBTL2rFbqgtkhDfW_XmxSHft0,159
-certora_cli/Mutate/mutateApp.py,sha256=gDYOVhQtwgzOiHJyN2o9nmxwiOjlmwzFOU9-uynMDAU,85302
+certora_cli/Mutate/mutateApp.py,sha256=wDCfkgXgV3fdAGw8SxWt1hlU1W9kl90HOcQIdNpb_aM,85871
 certora_cli/Mutate/mutateAttributes.py,sha256=l7tpkq3WZumVBuORaM2VLv93Px_X_XueL2IkfThTMNg,9402
 certora_cli/Mutate/mutateConstants.py,sha256=SHFQ0lBCYwJYH3Uk2ncG-7-4ANQIC4JRczNvWflfNU4,3277
 certora_cli/Mutate/mutateUtil.py,sha256=O3ub9gJe6LWQTDPbWyDqdfBhupwYl0ZrlfRX4kSn18c,1597
@@ -50,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=nlUljgDaYCIptVHAzCxQc2N9fPZ8A1bV46ItM6jzaLc,53607
-certora_cli/Shared/certoraValidateFuncs.py,sha256=3qQ8ikE0UrYBWn0s0zIISlgh2COXp0poJXriCDZO2U4,36525
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=jH-b595iMzQ5nCqrTe2uo2sMKuYFA6sdcTbY9B0v7pE,170
-certora_jars/Typechecker.jar,sha256=C3JlkbWVYoftsKM971ALFSiTBiGYDbdvjrh39FRmMls,16680344
+certora_cli/Shared/certoraUtils.py,sha256=8EGXrxfIxu34VTx46QeTx6tTYLdwpTLT9ulVQijmD9Y,53624
+certora_cli/Shared/certoraValidateFuncs.py,sha256=OOjPAkcfrURZDD4oDjOMBFTvY6wwQSXboXzu-47AUbY,36871
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=CKa-Wwq9Rh28A51DZy0AdvS1UqUA3YxH7iMGm-ELUEY,168
+certora_jars/Typechecker.jar,sha256=no7ucRdariDhJSTuF91i1KdG6vCuRJxWSeLFOkvuylc,16680403
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/METADATA,sha256=11LzZIVTFumsqknzhf6XgkMGhHh-DW5zEpjmX-i9pDg,838
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/entry_points.txt,sha256=1hX_iXDKItMNmz3frdg30bXS0auF5FG_5oNXxBi79Q8,195
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20241216.22.25.927248.dist-info/RECORD,,
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/METADATA,sha256=IlmCZaJUG0ha0YrHEfQoy1AtGPGlzeLm131hzHWb9j0,837
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/entry_points.txt,sha256=Y90wInBDlKPSU3YnuTn3JqAsSgPRTDHc8lf6BfKILjY,261
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20241217.16.7.546354.dist-info/RECORD,,

{certora_cli_alpha_master-20241216.22.25.927248.dist-info → certora_cli_alpha_master-20241217.16.7.546354.dist-info}/entry_points.txt

@@ -2,3 +2,4 @@
 certoraEqCheck = certora_cli.certoraEqCheck:equiv_check_entry_point
 certoraMutate = certora_cli.certoraMutate:mutate_entry_point
 certoraRun = certora_cli.certoraRun:entry_point
+certoraSolanaProver = certora_cli.certoraSolanaProver:entry_point

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "6e2a8f1", "timestamp": "20241216.22.25.927248", "version": "20241216.22.25.927248+6e2a8f1"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "77317ff", "timestamp": "20241217.16.7.546354", "version": "20241217.16.7.546354+77317ff"}