certora-cli 7.6.3__tar.gz → 7.10.1__tar.gz

{certora-cli-7.6.3/certora_cli.egg-info → certora_cli-7.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli
-Version: 7.6.3
+Version: 7.10.1
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -21,4 +21,4 @@ Requires-Dist: tabulate
 Requires-Dist: tqdm
 Requires-Dist: StrEnum
 
-Commit 8d9362c.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 3dd11d6.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli-7.10.1/README.md

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

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/Compiler/CompilerCollectorSol.py

@@ -35,7 +35,7 @@ class CompilerLangSol(CompilerLang, metaclass=Singleton):
 
     @staticmethod
     def compilation_output_path(sdc_name: str) -> Path:
-        return get_certora_config_dir() / f"{sdc_name}.standard.json.stdout"
+        return get_certora_config_dir() / f"{sdc_name}.standard.stdout.json"
 
     @staticmethod
     def get_supports_imports() -> bool:

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraBuild.py

@@ -543,8 +543,79 @@ def generate_full_finder(f: Func, internal_id: int, sym: int,
     return used_symbols, finder_gen.renaming() + to_ret
 
 
+def reprint_ast_type(node: Dict[str, Any]) -> Optional[str]:
+    """
+       Tries to pretty print the source code that was passed as node. That is, produce the concrete syntax that
+       was parsed by the compiler and then represented by node. This can differ from the "canonical" printing, as it
+       may not include the contract qualifier, as this is not always in scope.
+    """
+    if "nodeType" not in node:
+        return None
+    typ = node["nodeType"]
+    if typ == "ArrayTypeName":
+        if "baseType" not in node:
+            return None
+        reprint_base = reprint_ast_type(node["baseType"])
+        if reprint_base is None:
+            return None
+        if "length" in node:
+            lnode = node["length"]
+            if type(lnode) is not dict or "nodeType" not in lnode or lnode["nodeType"] != "Literal" or \
+               "value" not in lnode:
+                return None
+            len_str = lnode["value"]
+        else:
+            len_str = ""
+        return f"{reprint_base}[{len_str}]"
+    elif typ == "UserDefinedTypeName":
+        if "pathNode" not in node:
+            return None
+        p_node = node["pathNode"]
+        if type(p_node) is not dict or "nodeType" not in p_node or \
+           p_node["nodeType"] != "IdentifierPath" or "name" not in p_node:
+            return None
+        return p_node["name"]
+    else:
+        return None
+
+
+def get_modifier_param_type_name(ind: int, def_node: Dict[str, Any], f: Func) -> str:
+    """
+       Get the type name to use in the modifier for paramter ind. Attempts to reprint the
+       literal source code used in the original contract (via reprint_ast_type) or falls back
+       to the canonical type name (which may not be valid syntax, see https://certora.atlassian.net/browse/CERT-6284
+    """
+    fallback = f.fullArgs[ind].get_source_and_location_str()
+    d = def_node.get("parameters", None)
+    if type(d) is not dict or d["nodeType"] != "ParameterList" or "parameters" not in d:
+        return fallback
+    params = d["parameters"]
+    if type(params) is not list or len(params) != len(f.fullArgs):
+        return fallback
+    param_def_node = params[ind]
+    if type(param_def_node) is not dict or param_def_node["nodeType"] != "VariableDeclaration" or \
+       "typeName" not in param_def_node:
+        return fallback
+    param_type_node = param_def_node["typeName"]
+    if type(param_type_node) is not dict:
+        return fallback
+    reprint = reprint_ast_type(param_type_node)
+    if reprint is None:
+        return fallback
+    loc_string = ""
+    if "storageLocation" in param_def_node:
+        if param_def_node["storageLocation"] == "memory":
+            loc_string = " memory"
+        elif param_def_node["storageLocation"] == "calldata":
+            loc_string = " calldata"
+        elif param_def_node["storageLocation"] == "storage":
+            loc_string = " storage"
+    return f"{reprint}{loc_string}"
+
+
 def generate_modifier_finder(f: Func, internal_id: int, sym: int,
-                             compiler_collector: CompilerCollectorSol, compress: bool) -> Optional[Tuple[str, str]]:
+                             compiler_collector: CompilerCollectorSol, def_node: Dict[str, Any],
+                             compress: bool) -> Optional[Tuple[str, str]]:
     compressed = generate_finder_body(f, internal_id, sym, compiler_collector, compressed=compress)
     if compressed is None:
         return None
@@ -552,13 +623,13 @@ def generate_modifier_finder(f: Func, internal_id: int, sym: int,
     if len(compressed[0]) == 0:
         return f"{modifier_name}()", f"modifier {modifier_name}() {{ {compressed[1]} _; }}"
     else:
-        loggable_types = map(lambda e: f.fullArgs[e], compressed[0])
+        loggable_types = map(lambda e: get_modifier_param_type_name(e, def_node, f), compressed[0])
         loggable_names = map(lambda e: f.paramNames[e], compressed[0])
         formal_strings = []
         arg_strings = []
         for (logged_ty, logged_name) in zip(loggable_types, loggable_names):
             arg_strings.append(logged_name)
-            formal_strings.append(f"{logged_ty.get_source_and_location_str()} {logged_name}")
+            formal_strings.append(f"{logged_ty} {logged_name}")
         modifier_body = f"modifier {modifier_name}"
         modifier_body += f'({",".join(formal_strings)}) {{ '
         modifier_body += compressed[1]
@@ -1510,6 +1581,8 @@ class CertoraBuildGenerator:
                self.context.solc_via_ir or self.context.solc_experimental_via_ir):
                 # The default optimizer steps (taken from libsolidity/interface/OptimiserSettings.h) but with the
                 # full inliner step removed
+                solc0_8_26 = "dhfoDgvulfnTUtnIfxa[r]EscLMVcul[j]Trpeulxa[r]cLCTUca[r]LSsTFOtfDnca[r]" + \
+                             "IulcscCTUtx[scCTUt]TOntnfDIuljmul[jul]VcTOculjmul"
                 solc0_8_13_to_0_8_25 = "dhfoDgvulfnTUtnIf[xa[r]EscLMcCTUtTOntnfDIulLculVcul[j]T" + \
                                        "peulxa[rul]xa[r]cLgvifCTUca[r]LSsTFOtfDnca[r]Iulc]jmul[jul]VcTOculjmul"
                 solc0_8_12 = "dhfoDgvulfnTUtnIf[xa[r]EscLMcCTUtTOntnfDIulLculVcul[j]T" + \
@@ -1552,6 +1625,8 @@ class CertoraBuildGenerator:
                     yul_optimizer_steps = solc0_8_12
                 elif minor == 8 and 13 <= patch <= 25:
                     yul_optimizer_steps = solc0_8_13_to_0_8_25
+                elif minor == 8 and patch == 26:
+                    yul_optimizer_steps = solc0_8_26
                 assert yul_optimizer_steps is not None
 
                 yul_optimizer_steps = standard_replacement(yul_optimizer_steps)
@@ -1566,6 +1641,11 @@ class CertoraBuildGenerator:
                     raise Util.CertoraUserInputError(f"Unrecognized version {major}.{minor}.{patch}")
                 if (minor == 8 and patch >= 5) or (minor > 8):
                     settings_dict["optimizer"]["details"] = {"inliner": False}
+            if self.context.disable_solc_optimizers is not None:
+                if "details" not in settings_dict["optimizer"]:
+                    settings_dict["optimizer"]["details"] = {}
+                for opt_pass in self.context.disable_solc_optimizers:
+                    settings_dict["optimizer"]["details"][opt_pass] = False
 
     def _fill_codegen_related_options(self, contract_file_path: str, settings_dict: Dict[str, Any],
                                       compiler_collector: CompilerCollector) -> None:
@@ -1863,7 +1943,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
+                main_path = (compile_wd / self.context.solc_allow_path).resolve()
             else:
                 main_path = self.context.solc_allow_path
             self.context.solc_cmd_allow_paths = [f'"{main_path}"', '.']
@@ -2484,7 +2564,7 @@ class CertoraBuildGenerator:
                     # least one modifier already present, and then insert before the first modifier's location in the
                     # source code
                     mod_inst = generate_modifier_finder(f, internal_id, function_symbol, sdc.compiler_collector,
-                                                        compress=should_compress)
+                                                        def_node, compress=should_compress)
                     if mod_inst is None:
                         instrumentation_logger.debug(f"Modifier generation for {f.name} @ {f.where()} failed")
                         return None
@@ -2716,7 +2796,16 @@ class CertoraBuildGenerator:
                     sdc_with_verified_contract_name = next(
                         curr_sdc for index, curr_sdc in enumerate(sdc_pre_finders) if
                         curr_sdc.primary_contract == verified_contract_name)
-                    self.__verify_method(context.method, sdc_with_verified_contract_name)
+                    errs = []
+                    for method in context.method:
+                        try:
+                            self.__verify_method(method, sdc_with_verified_contract_name)
+                        except Util.CertoraUserInputError as e:
+                            errs.append(e)
+                    if len(errs) > 0:
+                        raise Util.CertoraUserInputError(
+                            f"Some methods as specified via the `method` flag could not be found!{Util.NEW_LINE}{Util.NEW_LINE.join(str(e) for e in errs)}"
+                        )
 
             # Build sources tree
             build_logger.debug("Building source tree")
@@ -3041,7 +3130,7 @@ class CertoraBuildGenerator:
             for k, v in autofinder_remappings.items():
                 self.function_finder_file_remappings[Util.abs_posix_path(k)] = Util.abs_posix_path(v)
             new_sdcs = self.collect_for_file(new_file, i, get_compiler_lang(build_arg_contract_file),
-                                             Util.get_certora_sources_dir(),
+                                             Util.get_certora_sources_dir() / self.cwd_rel_in_sources,
                                              path_for_compiler_collector_file,
                                              sdc_pre_finder,
                                              fail_on_compilation_error=False,
@@ -3394,6 +3483,8 @@ class CertoraBuildGenerator:
                 add_to_sources(Path(file))
         if context.bytecode_spec:
             sources.add(Path(context.bytecode_spec))
+        if context.yul_abi:
+            sources.add(Path(context.yul_abi))
 
         if hasattr(context,
                    Attr.ContextAttribute.PROVER_RESOURCE_FILES.get_conf_key()) and context.prover_resource_files:
@@ -3478,7 +3569,8 @@ def build_from_scratch(certora_build_generator: CertoraBuildGenerator,
                   indent=4,
                   sort_keys=True)
 
-    return CachedFiles(certora_build_file, all_contract_files, build_output_props_file, may_store_in_build_cache)
+    return CachedFiles(certora_build_file, all_contract_files, build_output_props_file, may_store_in_build_cache,
+                       path_with_additional_included_files=absolute_sources_dir)
 
 
 def build_from_cache_or_scratch(context: CertoraContext,
@@ -3522,6 +3614,14 @@ def build_from_cache_or_scratch(context: CertoraContext,
         # write build_cache indicator file
         with open(Util.get_build_cache_indicator_file(), "w+") as indicator_handle:
             json.dump({"build_cache_hit": True}, indicator_handle)
+        # write in sources all the additional paths found
+        for p in cached_files.path_with_additional_included_files.glob("*"):
+            if p.is_dir():
+                Util.safe_copy_folder(p,
+                                      Util.get_certora_sources_dir() / p.name,
+                                      shutil.ignore_patterns())
+            else:
+                shutil.copyfile(p, Util.get_certora_sources_dir() / p.name)
         cache_hit = True
     else:
         # rebuild

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraBuildCacheManager.py

@@ -23,6 +23,9 @@ class CachedFiles:
     build_output_props_file: Path
     may_store_in_build_cache: bool
 
+    # to keep .post_autofinders
+    path_with_additional_included_files: Path
+
     def all_exist(self, main_cache_entry_dir: Path, sub_cache_key: str) -> bool:
         exist = self.certora_build_file.exists() and \
             self.certora_build_file == main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.certora_build_suffix}"
@@ -36,6 +39,7 @@ class CachedFiles:
     certora_build_suffix = "certora_build.json"
     file_list_suffix = "file_list.json"
     build_output_props_suffix = "build_output_props.json"
+    additional_included_files = "additional_included_files"
 
 
 class CertoraBuildCacheManager:
@@ -105,8 +109,9 @@ class CertoraBuildCacheManager:
                                        f"but {CachedFiles.build_output_props_suffix} file does not exist")
             return None
 
+        additional_included_files = main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.additional_included_files}"
         return CachedFiles(certora_build_file, all_contract_files, build_output_props_file,
-                           may_store_in_build_cache=True)
+                           may_store_in_build_cache=True, path_with_additional_included_files=additional_included_files)
 
     @staticmethod
     def save_build_cache(context: CertoraContext, cached_files: CachedFiles) -> None:
@@ -151,6 +156,22 @@ class CertoraBuildCacheManager:
         # save additional props file
         shutil.copyfile(cached_files.build_output_props_file,
                         main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.build_output_props_suffix}")
+        # save .post_autofinders from additional included files
+        trg_path_with_additional_included_files = \
+            main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.additional_included_files}"
+        post_autofinder_dirs = list(
+            cached_files.path_with_additional_included_files.glob(f"{Util.POST_AUTOFINDER_BACKUP_DIR}.*"))
+        for post_autofinder_dir in post_autofinder_dirs:
+            trg = trg_path_with_additional_included_files / post_autofinder_dir.name
+            if post_autofinder_dir != trg:
+                if post_autofinder_dir.is_dir():
+                    Util.safe_copy_folder(post_autofinder_dir, trg, shutil.ignore_patterns())
+                else:
+                    # highly unlikely .post_autofinder.[digit] will be a file and not a directory,
+                    # but would rather not crash and future-proof instead
+                    # (more likely, we may include other types of files and not just autofinder directories, in which
+                    # case we'll change the variable name accordingly)
+                    shutil.copyfile(post_autofinder_dir, trg)
 
     @staticmethod
     def get_main_cache_key(context: CertoraContext) -> str:

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraCloudIO.py

@@ -21,6 +21,7 @@ from Shared import certoraUtils as Util
 import EVMVerifier.certoraContextAttribute as Attr
 import EVMVerifier.certoraContext as Ctx
 from Shared import certoraValidateFuncs as Vf
+from Mutate import mutateUtil as MutUtil
 
 from typing import Optional, Dict, Any, List, Union, cast
 from tqdm import tqdm
@@ -560,6 +561,7 @@ class CloudVerification:
         auth_data = {
             "process": self.context.process, "runName": self.runName,
             "run_source": self.context.run_source,
+            "group_id": self.context.group_id,
             "branch": self.context.prover_version if self.context.prover_version else '',
             'ci': Util.is_ci_or_git_action()
         }
@@ -595,6 +597,15 @@ class CloudVerification:
                 elif arg == '-solanaSummaries':
                     is_file = True
             auth_data["jarSettings"] = solana_jar_settings
+        elif self.context.is_wasm:
+            # We need to strip "../" path component from all file paths because
+            # unzip will also do that.
+            wasm_jar_settings = []
+            for file in self.context.files:
+                wasm_jar_settings.append(file.split('../')[-1])
+            for arg in jar_settings:
+                wasm_jar_settings.append(arg)
+            auth_data["jarSettings"] = wasm_jar_settings
         else:
             auth_data["jarSettings"] = jar_settings
 
@@ -728,6 +739,12 @@ class CloudVerification:
                 elif arg == '-solanaSummaries':
                     is_file = True
             result = compress_files(self.ZipFilePath, *paths, short_output=Ctx.is_minimal_cli_output(self.context))
+        elif self.context.is_wasm:
+            # We zip the wat file
+            paths = []
+            for file in self.context.files:
+                paths.append(Path(file))
+            result = compress_files(self.ZipFilePath, *paths, short_output=Ctx.is_minimal_cli_output(self.context))
         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
@@ -748,7 +765,17 @@ class CloudVerification:
 
         cloud_logger.debug("Uploading files...")
         if self.upload(self.presigned_url, self.ZipFilePath):
-            Util.print_completion_message("Job submitted to server")
+            try:
+                if self.context.mutation_test_id:
+                    counter = MutUtil.mutant_counter(self.context.mutation_test_id)
+                    total = MutUtil.TOTAL_MUTANTS
+                    Util.print_completion_message(f"Mutation {counter}/{total} submitted to server")
+                else:
+                    Util.print_completion_message("Job submitted to server")
+
+            except Exception:
+                Util.print_completion_message("Job submitted to server")
+
             print()
         else:  # upload error
             return False
@@ -881,6 +908,9 @@ class CloudVerification:
                         print("Please note - failure may be related to using the server"
                               f" <{self.context.server.lower()}> which is not a standard server")
                     return None
+                elif status == 401:
+                    print("Invalid key or key is missing. Please, make sure you entered a valid key.")
+                    return None
                 elif status >= 500:
                     cloud_logger.debug(f'{status} received. Retry...')
                     if i < self.verification_request_retries:

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraCollectRunMetadata.py

@@ -45,7 +45,7 @@ class RunMetaData:
     """
     def __init__(self, raw_args: List[str], conf: Dict[str, Any], origin: str, revision: str,
                  branch: str, cwd_relative: Path, dirty: bool, main_spec: Optional[str],
-                 conf_path: Optional[Path]):
+                 conf_path: Optional[Path], group_id: Optional[str]):
         self.raw_args = raw_args
         self.conf = conf
         self.origin = origin
@@ -55,22 +55,27 @@ class RunMetaData:
         self.dirty = dirty
         self.main_spec = main_spec
         self.conf_path = conf_path
+        self.group_id = group_id
+        self.python_version = ".".join(str(x) for x in sys.version_info[:3])
         self.certora_ci_client = Utils.get_certora_ci_name()
         self.timestamp = str(datetime.utcnow().timestamp())
-        _, _, self.CLI_version = Utils.get_package_and_version()
+        _, self.CLI_package_name, self.CLI_version = Utils.get_package_and_version()
 
     def __repr__(self) -> str:
         return (
-            f" raw_args: {self.raw_args}\n" +
-            f" conf: {self.conf}\n" +
-            f" origin: {self.origin}\n" +
-            f" revision: {self.revision}\n" +
-            f" branch: {self.branch}\n" +
-            f" cwd_relative: {self.cwd_relative}\n" +
-            f" dirty: {self.dirty}\n" +
-            f" CLI_version: {self.CLI_version}\n" +
-            f" main_spec: {self.main_spec}\n" +
-            f" conf_path: {self.conf_path}\n" +
+            f" raw_args: {self.raw_args}\n"
+            f" conf: {self.conf}\n"
+            f" origin: {self.origin}\n"
+            f" revision: {self.revision}\n"
+            f" branch: {self.branch}\n"
+            f" cwd_relative: {self.cwd_relative}\n"
+            f" dirty: {self.dirty}\n"
+            f" CLI_version: {self.CLI_version}\n"
+            f" CLI_package_name: {self.CLI_package_name}\n"
+            f" main_spec: {self.main_spec}\n"
+            f" conf_path: {self.conf_path}\n"
+            f" group_id: {self.group_id}\n"
+            f" python_version: {self.python_version}\n"
             f" CertoraCI client: {self.certora_ci_client}\n"
         )
 
@@ -137,7 +142,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], raw_input_conf_dict: Dic
                            cwd_relative=wd,
                            dirty=True,
                            main_spec=None,
-                           conf_path=None)
+                           conf_path=None,
+                           group_id=None)
 
     # collect information about current git snapshot
     cwd_abs = wd.resolve()
@@ -164,7 +170,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], raw_input_conf_dict: Dic
                            cwd_relative=cwd_relative,
                            dirty=True,
                            main_spec=context.main_spec,
-                           conf_path=conf_path)
+                           conf_path=conf_path,
+                           group_id=context.group_id)
 
     try:
         sha_out = subprocess.run(['git', 'rev-parse', 'HEAD'], cwd=wd,
@@ -198,7 +205,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], raw_input_conf_dict: Dic
                            cwd_relative=cwd_relative,
                            dirty=dirty,
                            main_spec=context.main_spec,
-                           conf_path=conf_path)
+                           conf_path=conf_path,
+                           group_id=context.group_id)
 
         metadata_logger.debug(f' collected data:\n{str(data)}')
 
@@ -215,4 +223,5 @@ def collect_run_metadata(wd: Path, raw_args: List[str], raw_input_conf_dict: Dic
                            cwd_relative=cwd_relative,
                            dirty=True,
                            main_spec=context.main_spec,
-                           conf_path=conf_path)
+                           conf_path=conf_path,
+                           group_id=context.group_id)

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraConfigIO.py

@@ -1,6 +1,5 @@
 import json5
 import logging
-import sys
 from pathlib import Path
 from typing import Dict, Any, Optional
 
@@ -43,17 +42,6 @@ def current_conf_to_file(context: CertoraContext) -> Dict[str, Any]:
     run_logger.debug(f"Saving last configuration file to {out_file_path}")
     Ctx.write_output_conf_to_path(context_to_save, out_file_path)
 
-    # for dumping the conf file and exit user can either call with --conf_output_file or by setting the
-    # environment variable CERTORA_DUMP_CONFIG. Using CERTORA_DUMP_CONFIG let the user change the conf file path
-    # without tempering with .sh files.
-    # NOTE: if you want to run multiple CVT instances simultaneously,
-    # you should use consider the --conf_output_file flag and not CERTORA_DUMP_CONFIG.
-
-    conf_key = Attr.ContextAttribute.CONF_OUTPUT_FILE.get_conf_key()
-    conf_output_file = getattr(context, conf_key, None) or Util.get_certora_dump_config()
-    if conf_output_file:
-        Ctx.write_output_conf_to_path(context_to_save, Path(conf_output_file))
-        sys.exit(0)
     return context_to_save
 
 

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraContext.py

@@ -114,7 +114,9 @@ def get_typechecker_arguments(context: CertoraContext, typechecker_args: Optiona
         typecheck_cmd = f"{typecheck_cmd} {' '.join(typechecker_args)}"
 
     relevant_args = filter(lambda arg: get_attr_value(context, arg),
-                           [Attr.ContextAttribute.RULE, Attr.ContextAttribute.EXCLUDE_RULE])
+                           [Attr.ContextAttribute.RULE,
+                            Attr.ContextAttribute.EXCLUDE_RULE,
+                            Attr.ContextAttribute.FOUNDRY_TESTS_MODE])
     args_list = create_jar_flag_list(context, list(relevant_args))
 
     return f"{typecheck_cmd} {' '.join(args_list)}"
@@ -127,7 +129,7 @@ def get_local_run_cmd(context: CertoraContext) -> str:
     @return: A command for running the prover locally
     """
     run_args = []
-    if context.is_tac or context.is_solana:
+    if context.is_tac or context.is_solana or context.is_wasm:
         run_args.append(context.files[0])
     if context.cache is not None:
         run_args.extend(['-cache', context.cache])
@@ -140,7 +142,7 @@ def get_local_run_cmd(context: CertoraContext) -> str:
         jar_path = context.jar
     else:
         certora_root_dir = Util.get_certora_root_directory().as_posix()
-        jar_path = f"{certora_root_dir}/emv.jar"
+        jar_path = f"{certora_root_dir}/{Util.EMV_JAR}"
 
     if context.allow_solidity_calls_in_quantifiers:
         run_args.extend(['-allowSolidityCallsInQuantifiers true'])
@@ -184,7 +186,7 @@ class ProverParser(AttrUtil.CertoraArgumentParser):
 
         Attr.ContextAttribute.print_attr_help()
         console.print("\n\nYou can find detailed documentation of the supported flags here: "
-                      f"[link={CLI_DOCUMENTATION_URL}]{CLI_DOCUMENTATION_URL}[/link]\n\n")
+                      f"{Util.print_rich_link(CLI_DOCUMENTATION_URL)}\n\n")
 
         return ''
 
@@ -263,10 +265,8 @@ def get_args(args_list: Optional[List[str]] = None) -> Tuple[CertoraContext, Dic
     setup_cache(context)  # Here context.cache, context.user_defined_cache are set
 
     # Setup defaults (defaults are not recorded in conf file)
-    if context.expected_file is None:
-        context.expected_file = "expected.json"
-    if context.run_source is None:
-        context.run_source = Vf.RunSources.COMMAND.name.upper()
+    context.expected_file = context.expected_file or "expected.json"
+    context.run_source = context.run_source or Vf.RunSources.COMMAND.name.upper()
 
     context_logger.debug("parsed args successfully.")
     context_logger.debug(f"args= {context}")

{certora-cli-7.6.3 → certora_cli-7.10.1}/certora_cli/EVMVerifier/certoraContextAttribute.py

@@ -254,7 +254,8 @@ class ContextAttribute(AttrUtil.BaseAttribute):
 
     MULTI_EXAMPLE = CertoraArgument(
         attr_validation_func=Vf.validate_multi_example_value,
-        help_msg="Show several examples for failed 'assert' or verified 'satisfy' statements",
+        help_msg="Show several counter examples for failed `assert` statements "
+                 "and several witnesses for verified `satisfy` statements",
         jar_flag='-multipleCEX',
         default_desc="Shows a single example",
         argparse_args={
@@ -269,8 +270,8 @@ class ContextAttribute(AttrUtil.BaseAttribute):
 
     FUNCTION_FINDER_MODE = CertoraArgument(
         attr_validation_func=Vf.validate_function_finder_mode,
-        help_msg="Use 'relaxed' mode to increase internal function finders precision, "
-                 "but may cause 'stack too deep' errors unless using 'via-ir'",
+        help_msg="Use `relaxed` mode to increase internal function finders precision, "
+                 "but may cause `stack too deep` errors unless using `via-ir`",
         default_desc="Takes less stack space but internal functions may be missed",
         argparse_args={
             'nargs': AttrUtil.SINGLE_OR_NONE_OCCURRENCES,
@@ -588,6 +589,16 @@ class ContextAttribute(AttrUtil.BaseAttribute):
         disables_build_cache=False
     )
 
+    DISABLE_SOLC_OPTIMIZERS = CertoraArgument(
+        arg_type=AttrUtil.AttrArgType.LIST,
+        argparse_args={
+            'nargs': AttrUtil.ONE_OR_MORE_OCCURRENCES,
+            'action': AttrUtil.APPEND
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False
+    )
+
     YUL_ABI = CertoraArgument(
         attr_validation_func=Vf.validate_json_file,
         help_msg="An auxiliary ABI file for yul contracts",
@@ -715,10 +726,12 @@ class ContextAttribute(AttrUtil.BaseAttribute):
 
     METHOD = CertoraArgument(
         jar_flag='-method',
+        arg_type=AttrUtil.AttrArgType.LIST,
         help_msg="Filter methods to be verified by their signature",
         default_desc="Verifies all public or external methods. In invariants pure and view functions are ignored",
         argparse_args={
-            'action': AttrUtil.UniqueStore
+            'nargs': AttrUtil.ONE_OR_MORE_OCCURRENCES,
+            'action': AttrUtil.APPEND
         },
         affects_build_cache_key=False,
         disables_build_cache=False
@@ -866,7 +879,7 @@ class ContextAttribute(AttrUtil.BaseAttribute):
     NONDET_MINIMAL_DIFFICULTY = CertoraArgument(
         attr_validation_func=Vf.validate_non_negative_integer,
         jar_flag='-autoNondetMinimalDifficulty',
-        help_msg="Set the minimal 'difficulty' threshold for summarization by `nondet_difficult_funcs`",
+        help_msg="Set the minimal `difficulty` threshold for summarization by `nondet_difficult_funcs`",
         default_desc="50",
         argparse_args={
             'action': AttrUtil.UniqueStore
@@ -1172,15 +1185,6 @@ class ContextAttribute(AttrUtil.BaseAttribute):
         disables_build_cache=False
     )
 
-    CONF_OUTPUT_FILE = CertoraArgument(
-        flag='--conf_output_file',
-        argparse_args={
-            'action': AttrUtil.UniqueStore
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-
     RUN_SOURCE = CertoraArgument(
         attr_validation_func=Vf.validate_run_source,
         argparse_args={
@@ -1404,6 +1408,22 @@ class ContextAttribute(AttrUtil.BaseAttribute):
         disables_build_cache=True
     )
 
+    GROUP_ID = CertoraArgument(
+        attr_validation_func=Vf.validate_uuid,
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
+    FOUNDRY_TESTS_MODE = CertoraArgument(
+        arg_type=AttrUtil.AttrArgType.BOOLEAN,
+        jar_flag='-foundry',
+        argparse_args={
+            'action': AttrUtil.STORE_TRUE
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
     def validate_value(self, value: str, cli_flag: bool = True) -> None:
         if self.value.attr_validation_func is not None:
             try:
@@ -1426,4 +1446,4 @@ class ContextAttribute(AttrUtil.BaseAttribute):
 
 @lru_cache(maxsize=1, typed=False)
 def all_context_keys() -> List[str]:
-    return [attr.get_conf_key() for attr in ContextAttribute if attr is not ContextAttribute.CONF_OUTPUT_FILE]
+    return [attr.get_conf_key() for attr in ContextAttribute]