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

{certora_cli_alpha_master-20241216.19.20.76131/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: 20241216.19.20.76131
+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 8fa71f6.                    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-20241216.19.20.76131 → 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-20241216.19.20.76131 → certora_cli_alpha_master-20241219.20.36.174596}/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
 
@@ -738,40 +765,61 @@ 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))
             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_alpha_master-20241216.19.20.76131 → certora_cli_alpha_master-20241219.20.36.174596}/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_alpha_master-20241216.19.20.76131 → certora_cli_alpha_master-20241219.20.36.174596}/certora_cli/EVMVerifier/certoraContext.py

@@ -1,23 +1,17 @@
 import argparse
 import hashlib
 import json
-import logging
 import os
 import re
 import sys
-import shutil
-import platform
+import logging
 
-#  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,14 +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_solana_app():
-        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:
+    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
+        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])
@@ -158,7 +153,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 +166,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")
 
@@ -242,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)
@@ -527,52 +522,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_alpha_master-20241216.19.20.76131 → certora_cli_alpha_master-20241219.20.36.174596}/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,15 @@ 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(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
@@ -418,17 +439,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
@@ -637,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={
@@ -1384,6 +1385,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 +1414,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 +1427,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 +1466,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 +1478,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 +1492,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 +1527,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_alpha_master-20241216.19.20.76131 → 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)
@@ -409,8 +412,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 +494,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 +712,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 +720,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 +734,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: