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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli
-Version: 7.20.3
+Version: 7.22.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -21,5 +21,7 @@ Requires-Dist: tabulate
 Requires-Dist: tqdm
 Requires-Dist: StrEnum
 Requires-Dist: tomli
+Requires-Dist: universalmutator
+Requires-Dist: jinja2
 
-Commit 7b9a1c7.                    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.20.3 → certora_cli-7.22.2}/certora_cli/EVMVerifier/certoraBuild.py

@@ -515,11 +515,11 @@ class CertoraBuildGenerator:
             ret = Path(self.function_finder_file_remappings[file])
         else:
             ret = Path(file)
-        abs_sources_dir = Util.get_certora_sources_dir().resolve()
+        abs_sources_dir = Util.get_certora_sources_dir().absolute()
         if abs_sources_dir in ret.parents:
             # Normalize the file-name to never include the extra `.certora_internal/.../.certora_sources` part
             # of the path.
-            ret = ret.relative_to(abs_sources_dir).resolve()
+            ret = Util.abs_norm_path(ret.relative_to(abs_sources_dir))
 
         # things look nicer if they are rooted in .certora_sources
         # note that we only have those fully populated after starting to work on internal function finders
@@ -1104,12 +1104,12 @@ class CertoraBuildGenerator:
           function name, inputs, outputs, stateMutability) for each contract
         """
         func_signatures = []
-        file_abs_path = Path(self.to_autofinder_file(str(contract_file))).resolve()
+        file_abs_path = Path(self.to_autofinder_file(str(contract_file))).absolute()
         if file_abs_path.suffix == VY:
             smart_contract_lang: CompilerLang = CompilerLangVy()
-            sdc_name = self.file_to_sdc_name[Path(contract_file).resolve()]
+            sdc_name = self.file_to_sdc_name[Path(contract_file).absolute()]
             standard_json_data = self.get_standard_json_data(sdc_name, smart_contract_lang)
-            abi = standard_json_data[CONTRACTS][str(Path(contract_file).resolve())][contract_name]['abi']
+            abi = standard_json_data[CONTRACTS][str(Path(contract_file).absolute())][contract_name]['abi']
             ast_logger.debug(f"abi is: \n{abi}")
             for f in filter(lambda x: self.is_imported_abi_entry(x), abi):
                 func_signature = self.get_full_func_signature(f)
@@ -1347,6 +1347,11 @@ class CertoraBuildGenerator:
             settings_dict["optimizer"] = {"enabled": True}
             if int(self.context.solc_optimize) > 0:
                 settings_dict["optimizer"]['runs'] = int(self.context.solc_optimize)
+
+        # if optimizer is true, we should also define settings_dict["optimizer"]["details"]
+        # for both optimize map and optimize
+        optimizer = settings_dict.get("optimizer")
+        if optimizer and isinstance(optimizer, dict) and optimizer.get('enabled'):
             # if we are not disabling finder friendly optimizer specifically, enable it whenever viaIR is also enabled
             if not self.context.strict_solc_optimizer and (
                     self.context.solc_via_ir or self.context.solc_experimental_via_ir):
@@ -1572,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"):
@@ -1692,7 +1707,7 @@ class CertoraBuildGenerator:
         is_vyper = smart_contract_lang == CompilerLangVy()
         sdc_name = f"{Path(build_arg_contract_file).name}_{file_index}"
         compilation_path = self.get_compilation_path(sdc_name)
-        self.file_to_sdc_name[Path(build_arg_contract_file).resolve()] = sdc_name
+        self.file_to_sdc_name[Util.abs_norm_path(build_arg_contract_file)] = sdc_name
         # update remappings and collect_cmd:
         if not is_vyper:
             Util.safe_create_dir(compilation_path)
@@ -1714,7 +1729,7 @@ class CertoraBuildGenerator:
                 is equivalent to `main_path = self.context.solc_allow_path`, and that's the best we can do in that
                 case anyway.
                 """
-                main_path = (compile_wd / self.context.solc_allow_path).resolve()
+                main_path = (compile_wd / self.context.solc_allow_path).absolute()
             else:
                 main_path = self.context.solc_allow_path
             self.context.solc_cmd_allow_paths = [f'"{main_path}"', '.']
@@ -1813,7 +1828,8 @@ class CertoraBuildGenerator:
             contract_file = str(contract_file_obj)
             build_logger.debug(f"Processing dependencies from file {contract_file}")
             # make sure path name is in posix format.
-            contract_file_abs = Path(contract_file).resolve().as_posix()
+            contract_file_abs = str(Util.abs_norm_path(contract_file))
+
             # using os.path.relpath because Path.relative_to cannot go up the directory tree (no ..)
             contract_file_rel = os.path.relpath(Path(contract_file_abs), Path.cwd())
 
@@ -1849,7 +1865,7 @@ class CertoraBuildGenerator:
                     base_contracts = sorted(self.retrieve_base_contracts_list(build_arg_contract_file, contract_file,
                                                                               contract_name), key=lambda x: x[0])
                     for c_file, _, _ in base_contracts:
-                        norm_c_file = Path(c_file).resolve()
+                        norm_c_file = Util.abs_norm_path(c_file)
                         resolved_to_orig[str(norm_c_file)] = c_file
                         if norm_c_file not in seen_link_refs:
                             build_logger.debug(f"Adding a base contract link ref {norm_c_file} to worklist")
@@ -1860,7 +1876,7 @@ class CertoraBuildGenerator:
                     contract_object = data[CONTRACTS][contract_file][contract_name]
                     lib_link_refs = sorted(contract_object["evm"]["deployedBytecode"]["linkReferences"])
                     for lib_link_ref in lib_link_refs:  # linkReference is a library reference
-                        norm_link_ref = Path(lib_link_ref).resolve()
+                        norm_link_ref = Path(lib_link_ref).absolute()
                         resolved_to_orig[str(norm_link_ref)] = lib_link_ref
                         if norm_link_ref not in seen_link_refs:
                             build_logger.debug(f"Adding library link ref {norm_link_ref} to worklist")
@@ -1879,8 +1895,7 @@ class CertoraBuildGenerator:
                         contract_refs = [c_file for c_file in
                                          data[CONTRACTS].keys() if
                                          ref in data[CONTRACTS][c_file].keys()]
-                        contract_files_resolved = sorted([Path(x).resolve() for x in
-                                                          contract_refs])
+                        contract_files_resolved = sorted([Util.abs_norm_path(x) for x in contract_refs])
 
                         # There may be two non unique paths but actually referring to the same absolute path.
                         # Normalizing as absolute
@@ -2302,7 +2317,7 @@ class CertoraBuildGenerator:
                                                  f" {c.name} that doesn't have a location")
                     return None
 
-                instrumentation_path = Util.convert_path_for_solc_import(loc[0])
+                instrumentation_path = str(Util.abs_norm_path(loc[0]))
                 if instrumentation_path not in function_finder_instrumentation:
                     instrumentation_logger.debug(f"New instrumentation for location {loc[0]}, " +
                                                  f"instrumentation path {instrumentation_path}")
@@ -2615,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
@@ -2782,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:
         """
@@ -2879,7 +2815,7 @@ class CertoraBuildGenerator:
         p = Path(path)
         if p.is_absolute():
             return path
-        return str(Path.cwd() / p.resolve())
+        return str(Path.cwd() / p.absolute())
 
     @staticmethod
     def merge_dicts_instrumentation(dict1: Dict[str, Dict[int, Instrumentation]],
@@ -3052,7 +2988,7 @@ class CertoraBuildGenerator:
         """
         rel_to_cwd_path = Path(os.path.relpath(path, '.'))
         new_path = Util.get_certora_sources_dir() / self.cwd_rel_in_sources / rel_to_cwd_path
-        return str(new_path.resolve())
+        return str(new_path.absolute())
 
     def handle_links(self) -> None:
         # Link processing
@@ -3457,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:
@@ -3481,7 +3496,7 @@ def build_from_scratch(certora_build_generator: CertoraBuildGenerator,
     saw_paths_not_in_sources = False
     paths_not_in_sources = set()
     may_store_in_build_cache = True
-    absolute_sources_dir = Util.get_certora_sources_dir().resolve()
+    absolute_sources_dir = Util.get_certora_sources_dir().absolute()
     for sdc in certora_build_generator.SDCs.values():
         # the contract files in SDCs are relative to .certora_sources. Which isn't good for us here.
         # Need to be relative to original paths
@@ -3620,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.20.3 → 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
@@ -847,7 +874,7 @@ class CloudVerification:
         self.vscode_extension_info_writer.add_field("verification_report_url", self.reportUrl)
         self.vscode_extension_info_writer.write_file()
 
-        if wait_for_results == str(Vf.WaitForResultOptions.NONE):
+        if not wait_for_results or wait_for_results == str(Vf.WaitForResultOptions.NONE):
             job_list.save_data()
             job_list.save_recent_jobs_to_path()
             self.print_output_links()

{certora_cli-7.20.3 → certora_cli-7.22.2}/certora_cli/EVMVerifier/certoraCollectRunMetadata.py

@@ -149,7 +149,7 @@ def collect_run_metadata(wd: Path, raw_args: List[str], context: CertoraContext)
                            group_id=None)
 
     # collect information about current git snapshot
-    cwd_abs = wd.resolve()
+    cwd_abs = wd.absolute()
 
     is_git_executable = False
     git_present_out = None