certora-cli 7.21.1__tar.gz → 7.22.2__tar.gz

{certora_cli-7.21.1/certora_cli.egg-info → certora_cli-7.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli
-Version: 7.21.1
+Version: 7.22.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -22,5 +22,6 @@ Requires-Dist: tqdm
 Requires-Dist: StrEnum
 Requires-Dist: tomli
 Requires-Dist: universalmutator
+Requires-Dist: jinja2
 
-Commit 03eae31.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 31a4e5d.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli-7.22.2/README.md

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

{certora_cli-7.21.1 → certora_cli-7.22.2}/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"):
@@ -2620,7 +2630,7 @@ class CertoraBuildGenerator:
                 sources_from_pre_finder_SDCs |= sdc.all_contract_files
             sources = self.collect_sources(context, certora_verify_generator, sources_from_pre_finder_SDCs)
             try:
-                self.cwd_rel_in_sources = self.build_source_tree(sources, context)
+                self.cwd_rel_in_sources = build_source_tree(sources, context)
             except Exception as e:
                 build_logger.debug(f"build_source_tree failed. Sources: {sources}", exc_info=e)
                 raise
@@ -2787,85 +2797,6 @@ class CertoraBuildGenerator:
         common_path = Path(os.path.commonpath(list(sources.union({cwd}))))
         return cwd.relative_to(common_path), common_path
 
-    @staticmethod
-    def build_source_tree(sources: Set[Path], context: CertoraContext, overwrite: bool = False) -> Path:
-        """
-        Copies files to .certora_sources
-        @returns the cwd relative in sources
-        """
-        sources = sources_to_abs(sources)
-        cwd_rel_in_sources, common_path = CertoraBuildGenerator.get_cwd_rel_in_sources(sources)
-
-        for source_path in sources:
-            is_dir = source_path.is_dir()
-            # copy file to the path of the file from the common root under the sources directory
-
-            # make sure directory exists
-            target_path = Util.get_certora_sources_dir() / source_path.relative_to(common_path)
-            target_directory = target_path if is_dir else target_path.parent
-            try:
-                target_directory.mkdir(parents=True, exist_ok=True)
-            except OSError as e:
-                build_logger.debug(f"Failed to create directory {target_directory}", exc_info=e)
-                raise
-
-            # copy files. if we got a directory, nothing to do
-            if is_dir:
-                build_logger.debug(f"Skipping directory {source_path}")
-                continue
-
-            try:
-                if overwrite:
-                    # expecting target path to exist.
-                    if target_path.exists():
-                        build_logger.debug(f"Overwriting {target_path} by copying from {source_path}")
-                    else:
-                        build_logger.warning(f"Supposed to overwrite {target_path} by copying from {source_path}" +
-                                             " but it does not exist... this may indicate bad things happen")
-                if overwrite or not target_path.exists():
-                    build_logger.debug(f"Copying {source_path} to {target_path}")
-                    shutil.copyfile(source_path, target_path)
-            except OSError as e:
-                build_logger.debug(f"Couldn't copy {source_path} to {target_path}", exc_info=e)
-                raise
-
-        #  the empty file .cwd is written in the source tree to denote the current working directory
-        if cwd_rel_in_sources != '.':
-            file_path = Util.get_certora_sources_dir() / cwd_rel_in_sources / Util.CWD_FILE
-            file_path.parent.mkdir(parents=True, exist_ok=True)
-            file_path.touch()
-
-        """
-        Once the resource files are copied to the source tree, the paths in the value of the 'prover_resource_files'
-        attribute are replaced with the relative path of the resource file from the source tree root.
-        This way The server can easily find the resource files in the source tree. The path from the source tree is the
-        relative path of cwd from source tree root (most cases '.') concatenated with the relative path of the resource
-        file from cwd
-        """
-        if context.prover_resource_files:
-            new_value = []
-            len_orig = len(context.prover_resource_files)
-            for value in context.prover_resource_files:
-                label, file_path = value.split(':')
-                rel_path = Path(os.path.relpath(file_path, '.'))
-                new_value.append(':'.join([label, os.path.normpath(rel_path)]))
-            if len_orig != len(new_value):
-                raise RuntimeError(f"fail to process prover_resource_files {len_orig} out of {len(new_value)}")
-            context.prover_resource_files = new_value
-
-        # Copy the repro conf file to the sources as the overall way to reproduce this run easily.
-        # The file is being copied in here and not added through collect_sources, because we want
-        # to avoid building the whole tree up to the common path for this file. We simply want to copy
-        # the repro file from .certora_internal to .certora_sources so it will be uploaded as a run
-        # resource.
-        try:
-            shutil.copy(Util.get_last_conf_file(), Util.get_certora_sources_dir() / Util.LAST_CONF_FILE)
-        except OSError as e:
-            build_logger.debug("Couldn't copy repro conf to certora sources.", exc_info=e)
-            raise
-
-        return cwd_rel_in_sources
-
     @staticmethod
     def normalize_path(path: str) -> str:
         """
@@ -3462,6 +3393,85 @@ def sources_to_abs(sources: Set[Path]) -> Set[Path]:
     return result
 
 
+def build_source_tree(sources: Set[Path], context: CertoraContext, overwrite: bool = False) -> Path:
+    """
+    Copies files to .certora_sources
+    @returns the cwd relative in sources
+    """
+    sources = sources_to_abs(sources)
+    cwd_rel_in_sources, common_path = CertoraBuildGenerator.get_cwd_rel_in_sources(sources)
+
+    for source_path in sources:
+        is_dir = source_path.is_dir()
+        # copy file to the path of the file from the common root under the sources directory
+
+        # make sure directory exists
+        target_path = Util.get_certora_sources_dir() / source_path.relative_to(common_path)
+        target_directory = target_path if is_dir else target_path.parent
+        try:
+            target_directory.mkdir(parents=True, exist_ok=True)
+        except OSError as e:
+            build_logger.debug(f"Failed to create directory {target_directory}", exc_info=e)
+            raise
+
+        # copy files. if we got a directory, nothing to do
+        if is_dir:
+            build_logger.debug(f"Skipping directory {source_path}")
+            continue
+
+        try:
+            if overwrite:
+                # expecting target path to exist.
+                if target_path.exists():
+                    build_logger.debug(f"Overwriting {target_path} by copying from {source_path}")
+                else:
+                    build_logger.warning(f"Supposed to overwrite {target_path} by copying from {source_path}" +
+                                         " but it does not exist... this may indicate bad things happen")
+            if overwrite or not target_path.exists():
+                build_logger.debug(f"Copying {source_path} to {target_path}")
+                shutil.copyfile(source_path, target_path)
+        except OSError as e:
+            build_logger.debug(f"Couldn't copy {source_path} to {target_path}", exc_info=e)
+            raise
+
+    #  the empty file .cwd is written in the source tree to denote the current working directory
+    if cwd_rel_in_sources != '.':
+        file_path = Util.get_certora_sources_dir() / cwd_rel_in_sources / Util.CWD_FILE
+        file_path.parent.mkdir(parents=True, exist_ok=True)
+        file_path.touch()
+
+    """
+    Once the resource files are copied to the source tree, the paths in the value of the 'prover_resource_files'
+    attribute are replaced with the relative path of the resource file from the source tree root.
+    This way The server can easily find the resource files in the source tree. The path from the source tree is the
+    relative path of cwd from source tree root (most cases '.') concatenated with the relative path of the resource
+    file from cwd
+    """
+    if context.prover_resource_files:
+        new_value = []
+        len_orig = len(context.prover_resource_files)
+        for value in context.prover_resource_files:
+            label, file_path = value.split(':')
+            rel_path = Path(os.path.relpath(file_path, '.'))
+            new_value.append(':'.join([label, os.path.normpath(rel_path)]))
+        if len_orig != len(new_value):
+            raise RuntimeError(f"fail to process prover_resource_files {len_orig} out of {len(new_value)}")
+        context.prover_resource_files = new_value
+
+    # Copy the repro conf file to the sources as the overall way to reproduce this run easily.
+    # The file is being copied in here and not added through collect_sources, because we want
+    # to avoid building the whole tree up to the common path for this file. We simply want to copy
+    # the repro file from .certora_internal to .certora_sources so it will be uploaded as a run
+    # resource.
+    try:
+        shutil.copy(Util.get_last_conf_file(), Util.get_certora_sources_dir() / Util.LAST_CONF_FILE)
+    except OSError as e:
+        build_logger.debug("Couldn't copy repro conf to certora sources.", exc_info=e)
+        raise
+
+    return cwd_rel_in_sources
+
+
 def build_from_scratch(certora_build_generator: CertoraBuildGenerator,
                        certora_verify_generator: CertoraVerifyGenerator,
                        build_cache_enabled: bool) -> CachedFiles:
@@ -3625,7 +3635,7 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
                                                           cached_files.all_contract_files)
         try:
             # Copies files, not updating state
-            certora_build_generator.build_source_tree(sources, context)
+            build_source_tree(sources, context)
         except Exception as e:
             build_logger.debug("build_source_tree failed", exc_info=e)
 

certora_cli-7.22.2/certora_cli/EVMVerifier/certoraBuildRust.py

@@ -0,0 +1,78 @@
+import glob
+import shutil
+from pathlib import Path
+from typing import Set
+
+from EVMVerifier.certoraBuild import build_source_tree
+from EVMVerifier.certoraContextClass import CertoraContext
+from EVMVerifier.certoraParseBuildScript import run_script_and_parse_json
+from Shared import certoraUtils as Util
+
+
+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")
+
+        sources: Set[Path] = set()
+        root_directory = Path(context.rust_project_directory)
+        collect_files_from_rust_sources(context, sources, root_directory)
+
+        try:
+            # Create generators
+            build_source_tree(sources, context)
+
+            copy_files_to_build_dir(context)
+
+        except Exception as e:
+            raise Util.CertoraUserInputError(f"Collecting build files failed with the exception: {e}")
+    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]
+
+
+def collect_files_from_rust_sources(context: CertoraContext, sources: Set[Path], root_directory: Path) -> None:
+    patterns = ["*.rs", "*.so", "*.wasm", "Cargo.toml", "Cargo.lock", "justfile"]
+    exclude_dirs = [".certora_internal"]
+
+    if not root_directory.is_dir():
+        raise ValueError(f"The given directory {root_directory} is not valid.")
+
+    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):
+                sources.add(file_path)
+
+    if Path(context.build_script).exists():
+        sources.add(Path(context.build_script).resolve())
+    if context.conf_file and Path(context.conf_file).exists():
+        sources.add(Path(context.conf_file).absolute())
+
+    additional_files = (getattr(context, 'solana_inlining', None) or []) + \
+                       (getattr(context, 'solana_summaries', None) or [])
+    for file in additional_files:
+        sources.add(Path(file))
+
+
+def copy_files_to_build_dir(context: CertoraContext) -> None:
+    rust_executable = Path(context.rust_project_directory) / context.rust_executables
+    shutil.copyfile(rust_executable, Util.get_build_dir() / rust_executable.name)
+
+    additional_files = (getattr(context, 'solana_inlining', None) or []) + \
+                       (getattr(context, 'solana_summaries', None) or [])
+
+    for file in additional_files:
+        file_path = Path(file).resolve()
+        shutil.copy(file_path, Util.get_build_dir() / file_path.name)
+
+    if rust_logs := getattr(context, 'rust_logs_stdout', None):
+        shutil.copy(Path(rust_logs), Util.get_build_dir() / Path(rust_logs).name)
+    if rust_logs := getattr(context, 'rust_logs_stderr', None):
+        shutil.copy(Path(rust_logs), Util.get_build_dir() / Path(rust_logs).name)

{certora_cli-7.21.1 → certora_cli-7.22.2}/certora_cli/EVMVerifier/certoraCloudIO.py

@@ -190,25 +190,6 @@ def parse_json(response: Response) -> Dict[str, Any]:
     return json_response
 
 
-def compress_files_wasm(zip_file_path: Path, context: CertoraContext) -> bool:
-    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))
-
-    if zip_file_path.stat().st_size > MAX_FILE_SIZE:
-        cloud_logger.error(f"{GENERAL_ERR_PREFIX} Max 25MB file size exceeded.")
-        return False
-    return True
-
-
 def compress_files(zip_file_path: Path, *resource_paths: Path, short_output: bool = False) -> bool:
     with zipfile.ZipFile(zip_file_path, 'w', zipfile.ZIP_DEFLATED) as zip_obj:
 
@@ -600,8 +581,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 +601,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 +724,81 @@ 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:
+                result = compress_files(self.logZipFilePath, Util.get_debug_log_file(),
+                                        short_output=Ctx.is_minimal_cli_output(self.context))
+
+                if not result:
+                    return False
+                files_list.append(self.logZipFilePath)
+                if Util.get_certora_sources_dir().exists():
+                    files_list.append(Util.get_certora_sources_dir())
+
+                files_list.append(Util.get_build_dir() / Path(self.context.rust_executables).name)
+
+                # Create a .RustExecution file to classify zipInput as a rust source code
+                rust_execution_file = Util.get_build_dir() / ".RustExecution"
+                rust_execution_file.touch(exist_ok=True)
+                files_list.append(rust_execution_file)
+
+                additional_files = (getattr(self.context, 'solana_inlining', None) or []) + \
+                                   (getattr(self.context, 'solana_summaries', None) or [])
+                for file in additional_files:
+                    files_list.append(Util.get_build_dir() / Path(file).name)
+
+                if attr_file := getattr(self.context, 'rust_logs_stdout', None):
+                    files_list.append(Util.get_build_dir() / Path(attr_file).name)
+                if attr_file := getattr(self.context, 'rust_logs_stderr', None):
+                    files_list.append(Util.get_build_dir() / Path(attr_file).name)
+
+                result = compress_files(self.ZipFilePath, *files_list,
+                                        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)
 
-                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-7.21.1 → certora_cli-7.22.2}/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}"
 
@@ -62,7 +61,7 @@ def read_from_conf_file(context: CertoraContext) -> None:
         try:
             check_conf_content(configuration, context)
         except Util.CertoraUserInputError as e:
-            raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}", e) from None
+            raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}: {str(e)}", e) from None
         context.conf_file = str(conf_file_path)
 
 
@@ -86,6 +85,13 @@ 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:
+
+    if Attrs.is_evm_app() and '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():
+        has_build_script = getattr(context, 'build_script', False)
+        if not has_build_script and 'files' not in conf:
+            raise Util.CertoraUserInputError("Mandatory 'build_script' or 'files' attribute is missing from the configuration")
+
+    context.files = conf.get('files')

{certora_cli-7.21.1 → certora_cli-7.22.2}/certora_cli/EVMVerifier/certoraContext.py

@@ -1,24 +1,16 @@
 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
 
-
 scripts_dir_path = Path(__file__).parent.resolve()  # containing directory
 sys.path.insert(0, str(scripts_dir_path))
 
@@ -112,14 +104,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 +151,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 +164,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 +235,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)
@@ -526,53 +519,3 @@ def run_local_spec_check(with_typechecking: bool, context: CertoraContext) -> No
     else:
         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}")