certora-cli-beta-mirror 7.30.1__py3-none-any.whl → 7.31.0__py3-none-any.whl

certora_cli/CertoraProver/Compiler/CompilerCollectorFactory.py

@@ -25,8 +25,9 @@ from CertoraProver.Compiler.CompilerCollector import CompilerLang, CompilerColle
 from CertoraProver.Compiler.CompilerCollectorSol import CompilerCollectorSol, CompilerLangSol
 from CertoraProver.Compiler.CompilerCollectorYul import CompilerLangYul, CompilerCollectorYul
 from CertoraProver.Compiler.CompilerCollectorVy import CompilerCollectorVy, CompilerLangVy
-from Shared.certoraUtils import match_path_to_mapping_key, remove_file, get_certora_config_dir
+from Shared.certoraUtils import remove_file, get_certora_config_dir
 from CertoraProver.certoraContextClass import CertoraContext
+import CertoraProver.certoraContext as Ctx
 
 # logger for running the Solidity compiler and reporting any errors it emits
 compiler_logger = logging.getLogger("compiler")
@@ -42,8 +43,16 @@ def get_relevant_compiler(contract_file_path: Path, context: CertoraContext) ->
 
     if contract_file_path.is_absolute():
         contract_file_path = Path(os.path.relpath(contract_file_path, Path.cwd()))
+
+    # If the contract file is in the sources directory, we want to use the relative path from the "cwd" in the source tree.
+    if Util.get_certora_sources_dir() in contract_file_path.parents:
+        cwd_in_source = Util.get_certora_sources_dir() / context.cwd_rel_in_sources
+        contract_file_path = Path(os.path.relpath(contract_file_path, cwd_in_source))
+
     if context.compiler_map:
-        match = match_path_to_mapping_key(contract_file_path, context.compiler_map)
+        match = Ctx.get_map_attribute_value(context, contract_file_path, 'compiler')
+        assert isinstance(match, str), (f"In the attribute compiler_map, {contract_file_path} expected to be matched "
+                                        f"to a string, {match} is of type {type(match)} not a string")
         if match:
             return match
         else:

certora_cli/CertoraProver/certoraBuild.py

@@ -450,8 +450,12 @@ def convert_pathname_to_posix(json_dict: Dict[str, Any], entry: str, smart_contr
             if path_obj.is_file():
                 json_dict_posix_paths[path_obj.as_posix()] = json_dict[entry][file_path]
             else:
+                json_dict_str = str(json_dict)
+                # protecting against long strings
+                if len(json_dict_str) > 200:
+                    json_dict_str = json_dict_str[:200] + '...'
                 fatal_error(compiler_logger, f"The path of the source file {file_path}"
-                                             f"in the standard json file {json_dict} does not exist")
+                                             f"in the standard json file {json_dict_str} does not exist")
         json_dict[entry] = json_dict_posix_paths
 
 
@@ -1361,46 +1365,48 @@ class CertoraBuildGenerator:
 
         return bytecode
 
-    def _handle_via_ir(self, contract_file_path: str, settings_dict: Dict[str, Any]) -> None:
-        if not self.context.solc_via_ir_map and not self.context.solc_via_ir:
-            return
-        if self.context.solc_via_ir_map:
-            match = Util.match_path_to_mapping_key(Path(contract_file_path), self.context.solc_via_ir_map)
-            if match:
-                settings_dict["viaIR"] = match
-        elif self.context.solc_via_ir:
+    def get_solc_via_ir_value(self, contract_file_path: Path) -> bool:
+        match = Ctx.get_map_attribute_value(self.context, contract_file_path, 'solc_via_ir')
+        assert isinstance(match, (bool, type(None))), f"Expected solc_via_ir to be bool or None, got {type(match)}"
+        return bool(match)
+
+    def get_solc_evm_version_value(self, contract_file_path: Path) -> Optional[str]:
+        match = Ctx.get_map_attribute_value(self.context, contract_file_path, 'solc_evm_version')
+        assert isinstance(match, (str, type(None))), f"Expected solc_evm_version to be string or None, got {type(match)}"
+        return match
+
+    def get_solc_optimize_value(self, contract_file_path: Path) -> Optional[str]:
+        match = Ctx.get_map_attribute_value(self.context, contract_file_path, 'solc_optimize')
+        assert isinstance(match, (str, type(None))), f"Expected solc_optimize to be string or None, got {type(match)}"
+        return match
+
+    def _handle_via_ir(self, contract_file_path: Path, settings_dict: Dict[str, Any]) -> None:
+        if self.get_solc_via_ir_value(contract_file_path):
             settings_dict["viaIR"] = True
 
-    def _handle_evm_version(self, contract_file_path: str, settings_dict: Dict[str, Any]) -> None:
-        if self.context.solc_evm_version_map:
-            match = Util.match_path_to_mapping_key(Path(contract_file_path), self.context.solc_evm_version_map)
-            if match:
-                settings_dict["evmVersion"] = match
-        elif self.context.solc_evm_version:
-            settings_dict["evmVersion"] = self.context.solc_evm_version
+    def _handle_evm_version(self, contract_file_path: Path, settings_dict: Dict[str, Any]) -> None:
+        match = self.get_solc_evm_version_value(contract_file_path)
+        if match:
+            settings_dict["evmVersion"] = match
 
-    def _handle_optimize(self, contract_file_path: str, settings_dict: Dict[str, Any],
+    def _handle_optimize(self, contract_file_path: Path, settings_dict: Dict[str, Any],
                          compiler_collector: CompilerCollector) -> None:
         """
         @param contract_file_path: the contract that we are working on
         @param settings_dict: data structure for sending to the solc compiler
         """
-        if self.context.solc_optimize_map:
-            match = Util.match_path_to_mapping_key(Path(contract_file_path), self.context.solc_optimize_map)
-            if match and int(match) > 0:
-                settings_dict["optimizer"] = {"enabled": True}
-                settings_dict["optimizer"]['runs'] = int(match)
-        elif self.context.solc_optimize:
+        match = self.get_solc_optimize_value(contract_file_path)
+        if match:
             settings_dict["optimizer"] = {"enabled": True}
-            if int(self.context.solc_optimize) > 0:
-                settings_dict["optimizer"]['runs'] = int(self.context.solc_optimize)
+            if int(match) > 0:
+                settings_dict["optimizer"]['runs'] = int(match)
 
         # 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:
+            if not self.context.strict_solc_optimizer and self.get_solc_via_ir_value(contract_file_path):
                 # The default optimizer steps (taken from libsolidity/interface/OptimiserSettings.h) but with the
                 # full inliner step removed
                 solc0_8_26_to_0_8_30 = ("dhfoDgvulfnTUtnIfxa[r]EscLMVcul[j]Trpeulxa[r]cLCTUca[r]LSsTFOtfDnca[r]" +
@@ -1433,6 +1439,8 @@ class CertoraBuildGenerator:
                     raise Util.CertoraUserInputError(err_msg)
                 elif minor < 6 or (minor == 6 and patch < 7):
                     raise Util.CertoraUserInputError(err_msg)
+                elif self.context.yul_optimizer_steps:
+                    yul_optimizer_steps = self.context.yul_optimizer_steps
                 elif (minor == 6 and patch >= 7) or (minor == 7 and 0 <= patch <= 1):
                     yul_optimizer_steps = solc0_6_7_to_0_7_1
                 elif minor == 7 and 2 <= patch <= 5:
@@ -1470,7 +1478,7 @@ class CertoraBuildGenerator:
                 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],
+    def _fill_codegen_related_options(self, contract_file_path: Path, settings_dict: Dict[str, Any],
                                       compiler_collector: CompilerCollector) -> None:
         """
         Fills options that control how we call solc and affect the bytecode in some way
@@ -1551,7 +1559,7 @@ class CertoraBuildGenerator:
                 }
             }
 
-        self._fill_codegen_related_options(contract_file_as_provided, settings_dict, compiler_collector)
+        self._fill_codegen_related_options(Path(contract_file_as_provided), settings_dict, compiler_collector)
 
         result_dict = {"language": compiler_collector_lang.name, "sources": sources_dict, "settings": settings_dict}
         # debug_print("Standard json input")
@@ -2286,7 +2294,7 @@ class CertoraBuildGenerator:
 
         if compiler_lang == CompilerLangSol():
             settings_dict: Dict[str, Any] = {}
-            self._fill_codegen_related_options(build_arg_contract_file, settings_dict,
+            self._fill_codegen_related_options(Path(build_arg_contract_file), settings_dict,
                                                compiler_collector_for_contract_file)
             solc_optimizer_on, solc_optimizer_runs = self.solc_setting_optimizer_runs(settings_dict)
             solc_via_ir = self.solc_setting_via_ir(settings_dict)
@@ -2416,7 +2424,7 @@ class CertoraBuildGenerator:
                 # if no function finder mode set, determine based on viaIR enabled or not:
                 if self.context.function_finder_mode is None:
                     # in via-ir, should not compress
-                    if self.context.solc_via_ir:
+                    if self.get_solc_via_ir_value(Path(contract_file)):
                         should_compress = False
                     else:
                         should_compress = True
@@ -3614,7 +3622,7 @@ def build_source_tree(sources: Set[Path], context: CertoraContext, overwrite: bo
 
         try:
             if overwrite:
-                # expecting target path to exist.
+                # expecting the target path to exist.
                 if target_path.exists():
                     build_logger.debug(f"Overwriting {target_path} by copying from {source_path}")
                 else:
@@ -3632,7 +3640,7 @@ def build_source_tree(sources: Set[Path], context: CertoraContext, overwrite: bo
     cwd_file_path.parent.mkdir(parents=True, exist_ok=True)
     cwd_file_path.touch()
 
-    #  the empty file .project_directory is written in the source tree to denote the projecct directory
+    #  the empty file .project_directory is written in the source tree to denote the project directory
     rust_proj_dir = getattr(context, 'rust_project_directory', None)
     if rust_proj_dir:
         proj_dir_parent_relative = os.path.relpath(rust_proj_dir, os.getcwd())
@@ -3683,8 +3691,9 @@ def build_from_scratch(context: CertoraContext,
 
         # add to cache also source files that were found in the SDCs (e.g., storage extensions)
         paths_set = sdc.all_contract_files
-        for p in context.files:
-            paths_set.add(Path(p).absolute())
+        for f in context.files:
+            path = f.split(':')[0]  # `f` is either 'path/to/file.sol' or 'path/to/file.sol:ContractName'
+            paths_set.add(Path(path).absolute())
 
         # the contract files in SDCs are relative to .certora_sources. Which isn't good for us here.
         # Need to be relative to original paths
@@ -3724,8 +3733,7 @@ def build_from_scratch(context: CertoraContext,
 
 def build_from_cache_or_scratch(context: CertoraContext,
                                 certora_build_generator: CertoraBuildGenerator,
-                                certora_verify_generator: CertoraVerifyGenerator,
-                                certora_build_cache_manager: CertoraBuildCacheManager) \
+                                certora_verify_generator: CertoraVerifyGenerator) \
         -> Tuple[bool, bool, CachedFiles]:
     """
     Builds either from cache (fast path) or from scratch (slow path)
@@ -3742,10 +3750,10 @@ def build_from_cache_or_scratch(context: CertoraContext,
                                           False)
         return cache_hit, False, cached_files
 
-    build_cache_applicable = certora_build_cache_manager.cache_is_applicable(context)
+    build_cache_applicable = CertoraBuildCacheManager.cache_is_applicable(context)
 
     if not build_cache_applicable:
-        build_cache_disabling_options = certora_build_cache_manager.cache_disabling_options(context)
+        build_cache_disabling_options = CertoraBuildCacheManager.cache_disabling_options(context)
         build_logger.warning("Requested to enable the build cache, but the build cache is not applicable "
                              f"to this run because of the given options: {build_cache_disabling_options}")
         cached_files = build_from_scratch(context, certora_build_generator,
@@ -3753,7 +3761,7 @@ def build_from_cache_or_scratch(context: CertoraContext,
                                           False)
         return cache_hit, False, cached_files
 
-    cached_files = certora_build_cache_manager.build_from_cache(context)
+    cached_files = CertoraBuildCacheManager.build_from_cache(context)
     # if no match, will rebuild from scratch
     if cached_files is not None:
         # write to .certora_build.json
@@ -3792,7 +3800,7 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
 
     try:
         input_config = InputConfig(context)
-
+        context.main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
         # Create generators
         certora_build_generator = CertoraBuildGenerator(input_config, context)
 
@@ -3808,12 +3816,9 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
             else:
                 Ctx.run_local_spec_check(False, context)
 
-        certora_build_cache_manager = CertoraBuildCacheManager()
-
         cache_hit, build_cache_enabled, cached_files = build_from_cache_or_scratch(context,
                                                                                    certora_build_generator,
-                                                                                   certora_verify_generator,
-                                                                                   certora_build_cache_manager)
+                                                                                   certora_verify_generator)
 
         # avoid running the same test over and over again for each split run, context.split_rules is true only for
         # the first run and is set to [] for split runs
@@ -3833,7 +3838,7 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
 
         # save in build cache
         if not cache_hit and build_cache_enabled and cached_files.may_store_in_build_cache:
-            certora_build_cache_manager.save_build_cache(context, cached_files)
+            CertoraBuildCacheManager.save_build_cache(context, cached_files)
 
         certora_verify_generator.update_certora_verify_struct(True)
         certora_verify_generator.dump()  # second dump with properly rooted specs

certora_cli/CertoraProver/certoraBuildCacheManager.py

@@ -66,10 +66,9 @@ class CertoraBuildCacheManager:
         @returns None if no cache hit, otherwise - the matching `.certora_build.json` file, and a set of source files
         """
         build_cache_dir = Util.get_certora_build_cache_dir()
-        main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
-        main_cache_entry_dir = build_cache_dir / main_cache_key
+        main_cache_entry_dir = build_cache_dir / context.main_cache_key
         if not main_cache_entry_dir.exists():
-            build_cache_logger.info(f"cache miss on build cache key {main_cache_key}")
+            build_cache_logger.info(f"cache miss on build cache key {context.main_cache_key}")
             return None
 
         # here's the tricky matching part:
@@ -92,7 +91,7 @@ class CertoraBuildCacheManager:
                     build_cache_logger.debug(f"Current sub build cache key computed for {file_list_file} is invalid")
                     continue
                 elif sub_cache_key_current_for_list == sub_cache_key_from_saved_entry:
-                    build_cache_logger.info(f"We have a match on build cache key {main_cache_key} and "
+                    build_cache_logger.info(f"We have a match on build cache key {context.main_cache_key} and "
                                             f"{sub_cache_key_current_for_list}")
                     sub_cache_key = sub_cache_key_current_for_list
                     all_contract_files = set([Path(f) for f in file_list])
@@ -103,24 +102,24 @@ class CertoraBuildCacheManager:
 
         if sub_cache_key is None:
             build_cache_logger.info("All sub-cache-key file list files missed, cache miss on build cache key "
-                                    f"{main_cache_key}")
+                                    f"{context.main_cache_key}")
             return None
 
         # cache hit
         certora_build_file = main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.certora_build_suffix}"
         if not certora_build_file.exists():
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and {sub_cache_key} "
                                        "but .certora_build.json file does not exist")
             return None
 
         if all_contract_files is None:  # should not be feasible
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
-                                       "but file list file does not exist")
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and "
+                                       f"{sub_cache_key} but file list file does not exist")
             return None
 
         build_output_props_file = main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.build_output_props_suffix}"
         if not build_output_props_file.exists():
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and {sub_cache_key} "
                                        f"but {CachedFiles.build_output_props_suffix} file does not exist")
             return None
 
@@ -131,26 +130,26 @@ class CertoraBuildCacheManager:
     @staticmethod
     def save_build_cache(context: CertoraContext, cached_files: CachedFiles) -> None:
         build_cache_dir = Util.get_certora_build_cache_dir()
-        main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
-        main_cache_entry_dir = build_cache_dir / main_cache_key
+        main_cache_entry_dir = build_cache_dir / context.main_cache_key
         sub_cache_key = CertoraBuildCacheManager.get_sub_cache_key(cached_files.all_contract_files)
         if sub_cache_key is None:
-            build_cache_logger.warning(f"Cannot save cache for main build cache key {main_cache_key} "
+            build_cache_logger.warning(f"Cannot save cache for main build cache key {context.main_cache_key} "
                                        "as sub-cache-key could not be computed")
             return
 
         if main_cache_entry_dir.exists():
-            build_cache_logger.info(f"main build cache key already exists {main_cache_key}, "
+            build_cache_logger.info(f"main build cache key already exists {context.main_cache_key}, "
                                     f"saving sub build cache key {sub_cache_key}")
             if cached_files.all_exist(main_cache_entry_dir, sub_cache_key):
                 build_cache_logger.debug("cache already saved under this build cache key, override")
             else:
-                build_cache_logger.debug(f"cache was corrupted, need to re-save build cache key {main_cache_key} "
-                                         f"and sub cache key {sub_cache_key}")
+                build_cache_logger.debug(f"cache was corrupted, need to re-save build cache key "
+                                         f"{context.main_cache_key} and sub cache key {sub_cache_key}")
             CertoraBuildCacheManager.save_files(cached_files, main_cache_entry_dir,
                                                 sub_cache_key)
         else:
-            build_cache_logger.info(f"saving main build cache key {main_cache_key} and sub cache key {sub_cache_key}")
+            build_cache_logger.info(f"saving main build cache key {context.main_cache_key} and sub cache key "
+                                    f"{sub_cache_key}")
             safe_create_dir(main_cache_entry_dir)
             CertoraBuildCacheManager.save_files(cached_files, main_cache_entry_dir,
                                                 sub_cache_key)

certora_cli/CertoraProver/certoraBuildRust.py

@@ -51,6 +51,7 @@ def build_rust_app(context: CertoraContext) -> None:
         feature_flag = '--features'
         if context.cargo_tools_version:
             build_command.extend(["--tools-version", context.cargo_tools_version])
+        context.rust_project_directory = Util.find_nearest_cargo_toml()
 
     if context.cargo_features is not None:
         build_command.append(feature_flag)
@@ -102,7 +103,7 @@ def add_solana_files_to_sources(context: CertoraContext, sources: Set[Path]) ->
 
 
 def collect_files_from_rust_sources(context: CertoraContext, sources: Set[Path]) -> None:
-    patterns = ["*.rs", "*.so", "*.wasm", "Cargo.toml", "Cargo.lock", "justfile"]
+    patterns = ["*.rs", "*.so", "*.wasm", Util.CARGO_TOML_FILE, "Cargo.lock", "justfile"]
     exclude_dirs = [".certora_internal"]
 
     if hasattr(context, 'rust_project_directory'):

certora_cli/CertoraProver/certoraCloudIO.py

@@ -760,42 +760,20 @@ class CloudVerification:
                           Util.get_configuration_layout_data_file(),
                           Util.get_build_dir() / Path(self.context.files[0]).name]
 
+            if Util.get_debug_log_file().exists():
+                files_list.append(Util.get_debug_log_file())
+
             if Util.get_certora_sources_dir().exists():
                 files_list.append(Util.get_certora_sources_dir())
 
             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)
-
-                # 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)
-
                 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() or Attrs.is_soroban_app():
-                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'
-                )
+            result = compress_files(self.ZipFilePath, *files_list,
+                                    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
@@ -953,6 +931,8 @@ class CloudVerification:
         for i in range(self.verification_request_retries):
             try:
                 response = requests.post(verify_url, json=auth_data, headers=headers, timeout=60)
+                cloud_logger.debug(f"\n\n=================\n\nresponse - Status Code: {response.status_code}\n\n"
+                                   f"Headers:\n {response.headers}\n\nText:\n {response.text}\n\n=================\n\n")
                 if response is None:
                     continue
                 status = response.status_code

certora_cli/CertoraProver/certoraCollectConfigurationLayout.py

@@ -25,12 +25,13 @@ sys.path.insert(0, str(scripts_dir_path))
 import CertoraProver.certoraContextAttributes as Attrs
 from CertoraProver.certoraCollectRunMetadata import RunMetaData, MetadataEncoder
 import Shared.certoraUtils as Utils
+from typing import List
 
 
 class MainSection(Enum):
     GENERAL = "GENERAL"
+    OPTIONS = "OPTIONS"
     SOLIDITY_COMPILER = "SOLIDITY_COMPILER"
-    GIT = "GIT"
     NEW_SECTION = "NEW_SECTION"
 
 
@@ -47,13 +48,11 @@ class InnerContent:
     content: Any
     doc_link: str = ''
     tooltip: str = ''
-    unsound: str = 'false'
+    unsound: bool = False
 
     def __post_init__(self) -> None:
         if isinstance(self.content, bool):
             self.content = 'true' if self.content else 'false'
-        if isinstance(self.unsound, bool):
-            self.unsound = 'true' if self.unsound else 'false'
 
 
 @dataclasses.dataclass
@@ -65,6 +64,7 @@ class CardContent:
 
 DOC_LINK_PREFIX = 'https://docs.certora.com/en/latest/docs/'
 GIT_ATTRIBUTES = ['origin', 'revision', 'branch', 'dirty']
+ARG_LIST_ATTRIBUTES = ['prover_args', 'java_args']
 
 
 class AttributeJobConfigData:
@@ -73,13 +73,13 @@ class AttributeJobConfigData:
     This should be added to the AttributeDefinition and configured for every new attribute
     presented in the Rule report.
 
-    Note: Attributes which do not contain specific information will be assigned as a Flag in the General main section!
+    Note: Attributes that do not contain specific information will be presented in the OPTIONS main section!
 
     arguments:
     - main_section : MainSection -- the main section inside the config tab
-        default: MainSection.GENERAL
-    - subsection : str -- the subsection within the main_section (e.g Flags)
-        default: Flags
+        default: MainSection.OPTIONS
+    - subsection : str -- the subsection within the main_section
+        default: None - they will be presented inside the OPTIONS card
     - doc_link : Optional[str] -- a link to the Documentation page of this attribute (if exists)
         default: 'https://docs.certora.com/en/latest/docs/' + Solana/EVM path + #<attribute_name>
     - tooltip : Optional[str] -- a description of this attribute to present in the config tab
@@ -88,7 +88,7 @@ class AttributeJobConfigData:
         default: False
     """
 
-    def __init__(self, main_section: MainSection = MainSection.GENERAL, subsection: str = '',
+    def __init__(self, main_section: MainSection = MainSection.OPTIONS, subsection: str = '',
                  doc_link: Optional[str] = '', tooltip: Optional[str] = '', unsound: bool = False):
         self.main_section = main_section
         self.subsection = subsection
@@ -201,6 +201,40 @@ def create_or_get_card_content(output: list[CardContent], name: str) -> CardCont
     return main_section
 
 
+def split_and_sort_arg_list_value(args_list: List[str]) -> List[str]:
+    """
+    Splits a unified CLI argument list of strings into a sorted list of flag+value groups.
+    This is useful mainly for --prover_args and --java_args.
+
+    For example:
+    "-depth 15 -adaptiveSolverConfig false" → ["-adaptiveSolverConfig false", "-depth 15"]
+
+    Assumes each flag starts with '-' and its value follows immediately, if exists.
+    Lines are sorted alphabetically.
+    """
+    unified_args = ''.join(args_list)
+
+    if not unified_args.strip():
+        return []
+
+    lines: List[str] = []
+    tokens = unified_args.split()
+    curr_line = ""
+
+    for token in tokens:
+        if token.startswith('-'):
+            if curr_line:
+                lines.append(curr_line)
+            curr_line = token
+        else:
+            curr_line += f" {token}"
+
+    if curr_line:
+        lines.append(curr_line)
+
+    return sorted(lines)
+
+
 def create_inner_content(name: str, content_type: ContentType, value: Any, doc_link: str,
                          config_data: AttributeJobConfigData) -> InnerContent:
     return InnerContent(
@@ -209,7 +243,7 @@ def create_inner_content(name: str, content_type: ContentType, value: Any, doc_l
         content=value,
         doc_link=doc_link,
         tooltip=config_data.tooltip or '',
-        unsound='true' if config_data.unsound else 'false'
+        unsound=config_data.unsound
     )
 
 
@@ -260,35 +294,23 @@ def collect_attribute_configs(metadata: dict) -> list[CardContent]:
             )
             continue
 
-        # Find or create the subsection (if it exists)
+        # Find or create the subsection (if it doesn't exist)
         if isinstance(attr_value, list):
-            current_section: Any = main_section
             content_type = ContentType.SIMPLE
+            if attr_name in ARG_LIST_ATTRIBUTES:
+                attr_value = split_and_sort_arg_list_value(attr_value)
 
         elif isinstance(attr_value, dict):
-            current_section = main_section
             content_type = ContentType.COMPLEX
             attr_value = [
                 create_inner_content(key, ContentType.FLAG, value, doc_link, config_data)
                 for key, value in attr_value.items()
             ]
         else:
-            # this attribute is a value attribute without a subsection, it will be placed in flags.
-            subsection_key = config_data.subsection.lower() if config_data.subsection else 'flags'
-            current_section = next((section for section in main_section.content
-                                    if section.inner_title == subsection_key), None)
-            if current_section is None:
-                current_section = InnerContent(
-                    inner_title=subsection_key,
-                    content_type=ContentType.COMPLEX.value,
-                    content=[]
-                )
-                main_section.content.append(current_section)
-
             content_type = ContentType.FLAG
 
         # Update the current section with attribute details
-        current_section.content.append(
+        main_section.content.append(
             create_inner_content(attr_name, content_type, attr_value, doc_link, config_data)
         )
 
@@ -300,37 +322,23 @@ def collect_run_config_from_metadata(attributes_configs: list[CardContent], meta
     Adding CLI and Git configuration from metadata
     """
 
-    # Define a mapping of metadata attributes to their keys in general_section
-    metadata_mappings = {
-        'CLI Version': metadata.get('CLI_version'),
-        'Verify': metadata.get('conf', {}).get('verify'),
-    }
-
     general_section = create_or_get_card_content(attributes_configs, MainSection.GENERAL.value.lower())
 
-    # Add metadata attributes dynamically if they exist
-    for key, value in metadata_mappings.items():
-        if value:
-            general_section.content.append(InnerContent(
-                inner_title=key,
-                content_type=ContentType.FLAG.value,
-                content=value,
-            ))
+    if cli_version := metadata.get('CLI_version'):
+        general_section.content.append(InnerContent(
+            inner_title='CLI Version',
+            content_type=ContentType.FLAG.value,
+            content=cli_version,
+        ))
 
-    # Adding GIT configuration from metadata only if attributes are found
-    git_content = []
     for attr in GIT_ATTRIBUTES:
         if attr_value := metadata.get(attr):
-            git_content.append(InnerContent(
+            general_section.content.append(InnerContent(
                 inner_title=attr,
                 content_type=ContentType.FLAG.value,
                 content=attr_value,
             ))
 
-    if git_content:
-        git_section = create_or_get_card_content(attributes_configs, MainSection.GIT.value.lower())
-        git_section.content = git_content
-
     return attributes_configs
 
 
@@ -338,14 +346,17 @@ def sort_configuration_layout(data: list[CardContent]) -> list[CardContent]:
     """
     Sorts a configuration layout:
     - Top-level sorted by 'card_title'
-    - Nested content sorted by 'inner_title', with 'Verify' first
+    - Nested content sorted by 'inner_title', with 'verify' first
     """
     priority = {
-        "Verify": 0,
+        # Priorities for top-level cards
         "general": 0,
+        "files": 1,
+        "options": 2,
+        # Top level items inside their respective cards
+        "verify": 0,
         "solc": 0,
-        "CLI Version": 1,
-        "flags": 2
+        "CLI Version": 0
     }
 
     def inner_sort_key(item: Any) -> Any:

certora_cli/CertoraProver/certoraConfigIO.py

@@ -17,6 +17,7 @@ import json5
 import logging
 from pathlib import Path
 from typing import Dict, Any
+from collections import OrderedDict
 
 import CertoraProver.certoraContext as Ctx
 import CertoraProver.certoraContextAttributes as Attrs
@@ -75,7 +76,7 @@ def read_from_conf_file(context: CertoraContext) -> None:
 
     try:
         with conf_file_path.open() as conf_file:
-            context.conf_file_attr = json5.load(conf_file, allow_duplicate_keys=False)
+            context.conf_file_attr = json5.load(conf_file, allow_duplicate_keys=False, object_pairs_hook=OrderedDict)
             try:
                 check_conf_content(context)
             except Util.CertoraUserInputError as e:

certora_cli/CertoraProver/certoraContext.py

@@ -20,6 +20,8 @@ import os
 import re
 import sys
 import logging
+import fnmatch
+from wcmatch import glob
 
 
 from pathlib import Path
@@ -150,8 +152,6 @@ def get_local_run_cmd(context: CertoraContext) -> List[str]:
         java_cmd.extend(context.java_args.strip().split(' '))
 
     cmd = java_cmd + ["-jar", jar_path] + run_args
-    if context.test == str(Util.TestValue.LOCAL_JAR):
-        raise Util.TestResultsReady(' '.join(cmd))
     return cmd
 
 
@@ -615,3 +615,30 @@ def attrs_to_relative(context: CertoraContext) -> None:
     packages_to_relative()
     prover_resource_file_to_relative()
     verify_to_relative()
+
+def get_map_attribute_value(context: CertoraContext, path: Path, attr_name: str) -> Optional[Union[str, bool]]:
+
+    value = getattr(context, attr_name, None)
+    if value:
+        return value
+
+    map_value = getattr(context, f"{attr_name}_map", None)
+    if not map_value:
+        return None  # No map value defined
+    for key, entry_value in map_value.items():
+        # Split key to handle contract:field syntax
+        key_parts = key.split(':')
+        pattern = key_parts[0]
+
+        if Path(pattern).suffix == "":  # This is a contract pattern
+            # Find contracts that match the pattern
+            for contract_name, contract_file_path in context.contract_to_file.items():
+                if fnmatch.fnmatch(contract_name, pattern):
+                    # Check if this contract's file matches our target path
+                    if Path(contract_file_path) == path:
+                        return entry_value
+        else:  # This is a file pattern
+            # Match the file pattern against the path
+            if glob.globmatch(str(path), pattern, flags=glob.GLOBSTAR):
+                return entry_value
+    return None  # No match

certora_cli/CertoraProver/certoraContextAttributes.py

@@ -156,7 +156,9 @@ class CommonAttributes(AttrUtil.Attributes):
             'action': AttrUtil.NotAllowed
         },
         affects_build_cache_key=False,
-        disables_build_cache=False
+        disables_build_cache=False,
+        # Avoiding presentation of this attribute in Config Tab
+        config_data=None
     )
 
     RUN_SOURCE = AttrUtil.AttributeDefinition(
@@ -340,7 +342,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="do not set via_ir during compilation unless solc_via_ir is set",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_via_ir_map', value, bool)
+            'type': lambda value: Vf.parse_ordered_dict('solc_via_ir_map', value, bool)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -382,7 +384,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Uses the same Solidity EVM version for all contracts",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_evm_version_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('solc_evm_version_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -405,7 +407,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Uses the same Solidity compiler version for all contracts",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('solc_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -428,7 +430,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Uses the same compiler version for all contracts",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('compiler_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('compiler_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -481,7 +483,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Compiles all contracts with the same optimization settings",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_optimize_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('solc_optimize_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -582,6 +584,16 @@ class EvmAttributes(AttrUtil.Attributes):
         affects_build_cache_key=True,
         disables_build_cache=True
     )
+
+    YUL_OPTIMIZER_STEPS = AttrUtil.AttributeDefinition(
+        # overrides the hardcoded yul optimizer steps, set in certoraBuild.py
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False
+    )
+
     CACHE = AttrUtil.AttributeDefinition(
         argparse_args={
             'action': AttrUtil.UniqueStore
@@ -740,8 +752,7 @@ class EvmAttributes(AttrUtil.Attributes):
             'action': AttrUtil.UniqueStore
         },
         affects_build_cache_key=False,
-        disables_build_cache=False,
-        config_data=None
+        disables_build_cache=False
     )
 
     BUILD_CACHE = AttrUtil.AttributeDefinition(
@@ -1719,7 +1730,7 @@ class RangerAttributes(EvmProverAttributes):
     @classmethod
     def ranger_unsupported_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
         return [cls.PROJECT_SANITY, cls.RULE_SANITY, cls.COVERAGE_INFO, cls.FOUNDRY, cls.INDEPENDENT_SATISFY,
-                cls.MULTI_ASSERT_CHECK, cls.MULTI_EXAMPLE]
+                cls.MULTI_ASSERT_CHECK, cls.MULTI_EXAMPLE, cls.VYPER]
 
     @classmethod
     def ranger_true_by_default_attributes(cls) -> List[AttrUtil.AttributeDefinition]:

certora_cli/CertoraProver/certoraContextValidator.py

@@ -21,7 +21,8 @@ import itertools
 import tempfile
 import fnmatch
 from pathlib import Path
-from typing import Dict, List, Tuple, Set, Any, Union, Optional
+from wcmatch import glob
+from typing import Dict, List, Tuple, Set, Any, Union, OrderedDict
 
 import CertoraProver.certoraContext as Ctx
 import CertoraProver.certoraContextAttributes as Attrs
@@ -31,6 +32,7 @@ from Shared import certoraUtils as Util
 from Shared import certoraAttrUtil as AttrUtil
 from CertoraProver.certoraProjectScanner import scan_project
 
+
 scripts_dir_path = Path(__file__).parent.resolve()  # containing directory
 sys.path.insert(0, str(scripts_dir_path))
 
@@ -70,10 +72,10 @@ class CertoraContextValidator:
 
         else:
             if self.context.range:
-                # self.context.range = None
+                self.context.range = None
                 validation_logger.info("the 'range' attribute is ignored when not running from the Ranger App")
             if self.context.ranger_failure_limit:
-                # self.context.ranger_failure_limit = None
+                self.context.ranger_failure_limit = None
                 validation_logger.info("the 'ranger_failure_limit' is ignored when not running from the Ranger App")
 
     def validate(self) -> None:
@@ -375,19 +377,15 @@ def convert_to_compiler_map(context: CertoraContext) -> None:
     if context.solc_map:
         context.compiler_map = context.solc_map
         context.solc_map = None
-    if context.solc:
-        context.compiler_map = {'*.sol': f'{context.solc}'}
-    if context.vyper:
-        context.compiler_map = {'*.vy': f'{context.vyper}'}
+
 
 def check_vyper_flag(context: CertoraContext) -> None:
     if context.vyper:
-        non_vy_paths = [path for path in context.files if not path.endswith(".vy")]
-        if non_vy_paths:
-            raise Util.CertoraUserInputError(f"vyper attribute can only be set for Vyper files: {non_vy_paths}")
+        vy_paths = [path for path in context.files if path.endswith(".vy")]
+        if not vy_paths:
+            validation_logger.warning("vyper attribute was set but no Vyper files were set")
         if context.solc:
             raise Util.CertoraUserInputError("cannot set both vyper attribute and solc attribute")
-        context.solc = context.vyper
 
 def check_contract_name_arg_inputs(context: CertoraContext) -> None:
     """
@@ -670,37 +668,20 @@ def check_mode_of_operation(context: CertoraContext) -> None:
                 special_file_type]) and not context.build_only:
         raise Util.CertoraUserInputError("You must use 'verify' when running the Certora Prover")
 
+def find_matching_contracts(context: CertoraContext, pattern: str) -> List[str]:
+    result = []
+    for contract in context.contract_to_file:
+        if fnmatch.fnmatch(contract, pattern):
+            result.append(context.contract_to_file[contract])
+    return result
 
-def _normalize_maps(context: CertoraContext, map_attr_name: str, map_attr: Dict) -> Dict[str, str]:
-    """
-
-    :param context:
-    :param map_attr_name: name of the attribute e.g. solc_optimize_map
-    :param map_attr: the value of the map attribute, a dictionary mapping contract/file to a value
-    :return:
-
-    all solc_XXX_map attributes are used to set attributes for the Solidity compiler. The value is based on the
-    Solidity file to be compiled, therefore it translates all keys to a relative path to a file
-    """
-
-    def find_matching_files(context: CertoraContext, pattern: str) -> List[str]:
-        file_part = pattern.split(':')[0]
-        if Path(file_part).suffix == "":  # no suffix means the key is a contract
-            matching_contracts = fnmatch.filter(context.contracts, pattern)  # find matching contracts
-            return [context.contract_to_file[contract] for contract in matching_contracts]
-        else:
-            return [file_part]
-
-    new_map_attr: Dict[str, str] = {}
-    for (pattern, value) in map_attr.copy().items():
-        matching_files = find_matching_files(context, pattern)
-        for file in matching_files:
-            file = str(Path(file).resolve(strict=False).relative_to(Path.cwd()))
-            attr_value = new_map_attr.get(file)
-            if attr_value is None:  # key in file paths but no mapping yet
-                new_map_attr[file] = value
-    return new_map_attr
+def find_matching_files(context: CertoraContext, pattern: str) -> List[str]:
+    result = []
 
+    for path in context.file_paths:
+        if glob.globmatch(path, pattern, flags=glob.GLOBSTAR):
+            result.append(path)
+    return result
 
 def check_map_attributes(context: CertoraContext) -> None:
 
@@ -718,27 +699,24 @@ def check_map_attributes(context: CertoraContext) -> None:
         # we also check the map value was not set to False explicitly in the conf file
         if base_attr and map_attr and not (base_attr is False and context.conf_options.get(base_attr) is not None):
             raise Util.CertoraUserInputError(f"You cannot use both '{attr_prefix}' and '{map_attr_name}' arguments")
-        if not isinstance(map_attr, dict):
-            raise RuntimeError(f"map_attr is not dictionary, got {map_attr}")
-        map_attr = _normalize_maps(context, map_attr_name, map_attr)
-        setattr(context, f"{map_attr_name}", map_attr)
-
-        sources_mappings: Dict[str, Optional[str]] = {file_path: None for file_path in context.file_paths}  # initially mapping files to None
-        for file in sources_mappings.keys():
-            match: Optional[str] = None
-            for (pattern, value) in map_attr.items():
-                if fnmatch.fnmatch(file, pattern):
-                    match = pattern
-                    break
-            if not match:
-                raise Util.CertoraUserInputError(f"No matching for {file} in {map_attr_name}. Pattens: {map_attr}")
-            elif not sources_mappings.get(file):  # key in file paths but no mapping yet
-                sources_mappings[file] = match
-
-        # Now we check if all sources were mapped
-        paths_not_set = [path for path, value in sources_mappings.items() if value is None]
-        if paths_not_set:
-            raise Util.CertoraUserInputError(f"{' '.join(paths_not_set)} was not set in {map_attr_name}")
+        if not isinstance(map_attr, OrderedDict):
+            raise RuntimeError(f"`map_attr` is not an ordered dictionary, got {map_attr}")
+
+        # will check that all the contract files are matched
+        file_list: Dict[str, bool] = {path: False for path in context.file_paths}
+
+        for key, value in map_attr.items():
+            pattern = key.split(':')[0]  # ignore the contract part
+            if Path(pattern).suffix == "":
+                for path in find_matching_contracts(context, pattern):
+                    file_list[path] = True
+            else:
+                for path in find_matching_files(context, pattern):
+                    file_list[path] = True
+
+        none_keys = [k for k, v in file_list.items() if v is False]
+        if none_keys:
+            raise Util.CertoraUserInputError(f"The following files are not matched in {map_attr_name}: {none_keys}")
 
 
 def check_parametric_contracts(context: CertoraContext) -> None:

certora_cli/CertoraProver/certoraParseBuildScript.py

@@ -60,7 +60,7 @@ def add_solana_files_to_context(context: CertoraContext, json_obj: dict) -> None
 def run_rust_build(context: CertoraContext, build_cmd: List[str]) -> None:
 
     try:
-        build_script_logger.info(f"Building by calling {build_cmd}")
+        build_script_logger.info(f"Building by calling `{' '.join(build_cmd)}`")
         result = subprocess.run(build_cmd, capture_output=True, text=True)
 
         # Check if the script executed successfully
@@ -90,11 +90,12 @@ def run_rust_build(context: CertoraContext, build_cmd: List[str]) -> None:
 
         add_solana_files_to_context(context, json_obj)
 
-        if context.test == str(Util.TestValue.AFTER_BUILD_RUST):
-            raise Util.TestResultsReady(context)
         assert not context.files, f"run_rust_build: expecting files to be empty, got: {context.files}"
         context.files = [os.path.join(context.rust_project_directory, context.rust_executables)]
 
+        if context.test == str(Util.TestValue.AFTER_BUILD_RUST):
+            raise Util.TestResultsReady(context)
+
     except Util.TestResultsReady as e:
         raise e
     except FileNotFoundError as e:

certora_cli/Shared/certoraUtils.py

@@ -14,7 +14,6 @@
 #     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import csv
-import fnmatch
 import json
 import os
 import subprocess
@@ -97,6 +96,7 @@ EMV_JAR = Path("emv.jar")
 CERTORA_SOURCES = Path(".certora_sources")
 SOLANA_INLINING = "solana_inlining"
 SOLANA_SUMMARIES = "solana_summaries"
+CARGO_TOML_FILE = "cargo.toml"
 
 ALPHA_PACKAGE_NAME = 'certora-cli-alpha'
 ALPHA_PACKAGE_MASTER_NAME = ALPHA_PACKAGE_NAME + '-master'
@@ -1171,26 +1171,9 @@ class Singleton(type):
             cls.__instancesinstances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
         return cls.__instancesinstances[cls]
 
-
 class AbstractAndSingleton(Singleton, ABCMeta):
     pass
 
-
-def match_path_to_mapping_key(path: Path, m: Dict[str, str]) -> Optional[str]:
-    """
-    Matches the path to the best match in the dictionary's keys.
-    For example, given an absolute path `/Users/JohnDoe/Path/ToSolc/a.sol`, if the map contains
-    `b/a.sol` and `ToSolc/a.sol`, it will match on `ToSolc/a.sol`.
-    @param path: the path to match against
-    @param m: the map whose keys we're searching
-    @return: the value from the map that best matches the path, None if not found.
-    """
-    for k, v in m.items():
-        if fnmatch.fnmatch(str(path), k):
-            return v
-    return None
-
-
 def find_in(dir_path: Path, file_to_find: Path) -> Optional[Path]:
     """
     Given a directory dir_path and a file we wish to find within that directory,
@@ -1262,7 +1245,7 @@ class TestValue(NoValEnum):
     determines the chekpoint where the execution will halt. The exception TestResultsReady will be thrown. The value
     will also determine what object will be attached to the exception for inspection by the caller
     """
-    LOCAL_JAR = auto()
+    BEFORE_LOCAL_PROVER_CALL = auto()
     CHECK_ARGS = auto()
     AFTER_BUILD = auto()
     CHECK_SOLC_OPTIONS = auto()
@@ -1452,3 +1435,22 @@ def eq_by(f: Callable[[T, T], bool], a: Sequence[T], b: Sequence[T]) -> bool:
     check if Sequences a and b are equal according to function f.
     """
     return len(a) == len(b) and all(map(f, a, b))
+
+def find_nearest_cargo_toml() -> Optional[Path]:
+    current = Path.cwd()
+    for parent in [current] + list(current.parents):
+        candidate = parent / CARGO_TOML_FILE
+        if candidate.is_file():
+            return candidate
+    return None
+
+def file_in_source_tree(file_path: Path) -> bool:
+    # if the file is under .certora_source, return True
+    file_path = Path(file_path).absolute()
+    parent_dir = get_certora_sources_dir().absolute()
+
+    try:
+        file_path.relative_to(parent_dir)
+        return True
+    except ValueError:
+        return False

certora_cli/Shared/certoraValidateFuncs.py

@@ -18,6 +18,8 @@ import sys
 import argparse
 import json
 import logging
+from collections import OrderedDict
+
 import json5
 import re
 import urllib3.util
@@ -684,7 +686,7 @@ def validate_solc_via_ir_map(args: Dict[str, bool]) -> None:
         if first:
             validation_logger.warning("all via_ir values are set to True '--solc_via_ir' can be used instead")
         else:
-            validation_logger.warning("all via_ir values are set to False, this flag/attribute  can be omitted")
+            validation_logger.warning("all via_ir values are set to False, this flag/attribute can be omitted")
 
 def validate_solc_evm_version_map(args: Dict[str, str]) -> None:
     if not isinstance(args, dict):
@@ -938,7 +940,7 @@ def validate_on_off(value: str) -> str:
     return __validate_enum_value(value, OnOffValue)
 
 
-def parse_dict(conf_key: str, input_string: str, value_type: Type = str) -> Dict[str, Union[str, bool]]:
+def parse_ordered_dict(conf_key: str, input_string: str, value_type: Type = str) -> OrderedDict[str, Union[str, bool]]:
     """
     convert CLI flag value string of the form <key>=<value>,<key>=<value>,.. to a Dict.
     Keys with different values raise an exception
@@ -971,7 +973,7 @@ def parse_dict(conf_key: str, input_string: str, value_type: Type = str) -> Dict
         raise argparse.ArgumentTypeError(f"{conf_key} argument {input_string} is of wrong format. Must be of format:"
                                          f"<key>=<value>[,..]")
 
-    return_dict = {}  # type: Dict[str, Union[str, bool]]
+    return_dict = OrderedDict()  # type: OrderedDict[str, Union[str, bool]]
 
     for match in input_string.split(','):
         key, value = match.split('=')

certora_cli/Shared/proverCommon.py

@@ -176,6 +176,8 @@ def run_local(context: CertoraContext, timings: Dict, additional_commands: Optio
         cmd.extend(additional_commands)
 
     print(f'Verifier run command:\n {" ".join(cmd)}')
+    if context.test == str(Util.TestValue.BEFORE_LOCAL_PROVER_CALL):
+        raise Util.TestResultsReady(' '.join(cmd))
     rc = Util.run_jar_cmd(
         cmd,
         override_exit_code=compare_with_expected_file,

certora_cli/certoraRun.py

@@ -99,6 +99,8 @@ def run_certora(args: List[str], attrs_class: Optional[Type[AttrUtil.Attributes]
             print(f"Verifier run command:\n {check_cmd_string}", flush=True)
 
             compare_with_tool_output = False
+            if context.test == str(Util.TestValue.BEFORE_LOCAL_PROVER_CALL):
+                raise Util.TestResultsReady(' '.join(check_cmd))
             run_result = Util.run_jar_cmd(check_cmd, compare_with_tool_output, logger_topic="verification",
                                           print_output=True)
             # For solana and wasm, we don't check types so build time is zero.

{certora_cli_beta_mirror-7.30.1.dist-info → certora_cli_beta_mirror-7.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-beta-mirror
-Version: 7.30.1
+Version: 7.31.0
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-beta-mirror
 Author: Certora
@@ -25,6 +25,7 @@ Requires-Dist: tqdm
 Requires-Dist: StrEnum
 Requires-Dist: universalmutator
 Requires-Dist: jinja2
+Requires-Dist: wcmatch
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -37,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 5c9b8e0.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 89159ec.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_beta_mirror-7.30.1.dist-info → certora_cli_beta_mirror-7.31.0.dist-info}/RECORD

@@ -4,30 +4,30 @@ certora_cli/certoraEVMProver.py,sha256=gLxqPXG9jKlCdLdgfo0aNjvp09vbHGSs8wghY6RH0
 certora_cli/certoraEqCheck.py,sha256=qfZq7bpU1kbAIezC66W61VfKNZz7Uywg2Ygup62qYeo,1069
 certora_cli/certoraMutate.py,sha256=XhFHyNVP_sk-3XkY6AAV5fVliEFAVRq-JeDGsqE5IQQ,3333
 certora_cli/certoraRanger.py,sha256=cwejxWTNlHsbwtu6Lew0SNsynSeq_ZKJu1Cr9uu0DhE,1314
-certora_cli/certoraRun.py,sha256=IIPykXqarflxubpd7zJomoBMcCcj7-uLXIPiv7nrL_k,8675
+certora_cli/certoraRun.py,sha256=mTBAi-SVCApy8BvfvKAL8Z4PdGcaBV3G5vNXPrFdgTI,8817
 certora_cli/certoraSolanaProver.py,sha256=7hu-YJJNA_P5eAJq_jYh6IGjiUf0PegGUBRCJ5AhE7s,3274
 certora_cli/certoraSorobanProver.py,sha256=qE6b_vicC8KgOvUz7UTOaDuXT3UW0MMhq3keQgUVvzs,2865
 certora_cli/rustMutator.py,sha256=6AvOGU8Ijz89zW_ZJCWlfXkeobJsk7EsqZhK7Eqwn-Y,14544
 certora_cli/CertoraProver/__init__.py,sha256=QHNr-PJQAoyuPgTkO7gg23GRchiWSXglWNG7yLSQZvs,849
-certora_cli/CertoraProver/certoraBuild.py,sha256=WMaRg4VNdH_1k-GTfv-0USfIkQ7Gtdg3Y23bZHQVLVQ,212071
-certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=dzXC8A-V9gr1GGsPYglQLlFLoR2Tk4dTJuMHaxXBfgw,13257
+certora_cli/CertoraProver/certoraBuild.py,sha256=eAAaRcyF16XNjr9Es54cQPutErqjW6j8VUefrGAxumc,212517
+certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=I60x0ykMFPzciD193cPXihsHh0fdV--UOmNKbIZW6Rc,13238
 certora_cli/CertoraProver/certoraBuildDataClasses.py,sha256=8tPny9-pasC7CCRKQclaVQ3qcEDNa6EdOUu1ZWh0MZY,14704
-certora_cli/CertoraProver/certoraBuildRust.py,sha256=l81mZHGOhfSL8jme6I_O_aAiu3wxdHAg-jPEFQvFFdg,5936
-certora_cli/CertoraProver/certoraCloudIO.py,sha256=oYhNAcyhQa97_5OrpFsewcD6sksoKD8aJz_Iw1-ihg8,53980
-certora_cli/CertoraProver/certoraCollectConfigurationLayout.py,sha256=waMo5_nzirDaK7aoPCfoS7jOqqi_6huRc-_jTrDcZO8,14252
+certora_cli/CertoraProver/certoraBuildRust.py,sha256=ofKvmtqzUGTrgVm5crcybV7gbElbjiUc6Z4FphPEjz0,6016
+certora_cli/CertoraProver/certoraCloudIO.py,sha256=w3mqA5ANgIX6dsb6Nxg4jl9zBRdAX5kw9xLeYmA-iHc,53062
+certora_cli/CertoraProver/certoraCollectConfigurationLayout.py,sha256=6aHEGrhT_Y9aYfM5n_Mk--awgcQfdtc-chBPRl7FU4E,14095
 certora_cli/CertoraProver/certoraCollectRunMetadata.py,sha256=n67E7hjVdPlBXMh1FMzcWSgu3v5SfFM_HOO2JpbCeY0,11787
 certora_cli/CertoraProver/certoraCompilerParameters.py,sha256=r35y03IRwWIoz1GCNC7PuW3n8JPz9J1NGwhwUYKdYtI,1452
-certora_cli/CertoraProver/certoraConfigIO.py,sha256=H3ebbIBO8xXTf8ArBPnZV1TmDBExQVDF2zc9Yu1v0Xo,7493
-certora_cli/CertoraProver/certoraContext.py,sha256=0AihMYuUAGHWjbiSOMiDM6FVW5OyvEAxE51GPnMxSKg,25821
-certora_cli/CertoraProver/certoraContextAttributes.py,sha256=IhzGm46ToCIps-Eg04V90G4OUDcTm0dQqmtWr3rn-N4,69055
+certora_cli/CertoraProver/certoraConfigIO.py,sha256=uq-uNnjVBzg9Kh41fDqn-lnwSJXe4k2_iy5GTnQIDa8,7560
+certora_cli/CertoraProver/certoraContext.py,sha256=HyYQlzIEk3gzzEH2ilTC_Qxw1zXvsKU3IJuCLiV2Sro,26916
+certora_cli/CertoraProver/certoraContextAttributes.py,sha256=d8ywqZrWfhzwS8w3VSduwIqwgSASML7k_guXzsoxIdU,69463
 certora_cli/CertoraProver/certoraContextClass.py,sha256=d7HDqM72K7YnswR7kEcAHGwkFNrTqRz5-_0m7cl2Mso,900
-certora_cli/CertoraProver/certoraContextValidator.py,sha256=iSB2byuHmi1G4xG-ViVvBrZv7e1mdxPmlWdV3AaN_l4,46492
+certora_cli/CertoraProver/certoraContextValidator.py,sha256=SgdtQJFimBi51c9SUnpgEYow9FBEYU_7LUdZhISBxpo,45064
 certora_cli/CertoraProver/certoraContractFuncs.py,sha256=ipSwge5QQzp8qhUavY44bZ-eCR6szK_HWwSIWqQyuR0,6921
 certora_cli/CertoraProver/certoraExtensionInfo.py,sha256=YlShzdoqJQgXXj3r0TJ3fir1KntIR99Rk8JN5qii2lk,2026
 certora_cli/CertoraProver/certoraJobList.py,sha256=FBIYgJ60I0Ok7vchfTbcuJJbiXgnfAhrONoVeZoHti4,11464
 certora_cli/CertoraProver/certoraMiniSpecParser.py,sha256=NjjMwf5Rav3YWpoOJh4PZ-QOS8exC2cg4yIBSbZA6l0,9660
 certora_cli/CertoraProver/certoraNodeFilters.py,sha256=5Uk2mixZKeis_JVd3HkLgoEVklkAYBXAZiNHRlXOIfY,2830
-certora_cli/CertoraProver/certoraParseBuildScript.py,sha256=V_2lqlDnwdkXJzpdvXiMuOyupdrDTZnOyHKshm-_3rQ,4850
+certora_cli/CertoraProver/certoraParseBuildScript.py,sha256=l7KQA1poEjmbmuYbMskz0jOQg6cW0lM3vk5ruAGPjPI,4863
 certora_cli/CertoraProver/certoraProjectScanner.py,sha256=jT7FeWzcy8o83LrZRwsg_L4x6im6Fm_0LZFKVbKr3Jk,6862
 certora_cli/CertoraProver/certoraSourceFinders.py,sha256=qwJtwrQq3NUNYmdmn1UmANN4lmJFIUh4M-St2x1FJ2Y,19038
 certora_cli/CertoraProver/certoraType.py,sha256=wD-Sr3xk_dJGtbvw33oIGu_lf15NCZuKWjUb4HlVcUM,29318
@@ -36,7 +36,7 @@ certora_cli/CertoraProver/erc7201.py,sha256=BME5kBZsDx6lgqLn7EE91I1cEOZtsnZ8BlRV
 certora_cli/CertoraProver/splitRules.py,sha256=HfSqsKeeLZDeOnv8TGgpPDHoaXgdVc0HOrLcGk-cU1Q,7681
 certora_cli/CertoraProver/storageExtension.py,sha256=BZC9HJygeLxqS5TmhNxbIrVNfH3kLEPjN1VjsWQi8s8,15922
 certora_cli/CertoraProver/Compiler/CompilerCollector.py,sha256=cr-PIl7LY9VfNs4s4H3-EnSnomPiCgXudfwP9-KenMk,6740
-certora_cli/CertoraProver/Compiler/CompilerCollectorFactory.py,sha256=L-LAH0UU7gB7wYvCcXrwdtLGpBI8MX3rPts0ufQ-X9s,8157
+certora_cli/CertoraProver/Compiler/CompilerCollectorFactory.py,sha256=TOpHMSYGhfSmVQwJYZMVOI_Ws03k6cTffzaQUmhnNUo,8761
 certora_cli/CertoraProver/Compiler/CompilerCollectorSol.py,sha256=7nAY2FLMUlGJn4f_YoZMqpa3rf7THqhJVjLwTaChcBc,5027
 certora_cli/CertoraProver/Compiler/CompilerCollectorSolBased.py,sha256=UasYWyu8Of6R84vXsqRNGpscYcFQghmSIY_dyaAWDYA,1350
 certora_cli/CertoraProver/Compiler/CompilerCollectorVy.py,sha256=e95xOHK5Bz8BbzjbCVLCrGSutVs8ejqOImh5wH9o3Jk,69918
@@ -60,16 +60,16 @@ certora_cli/Shared/ExpectedComparator.py,sha256=eyRR-jni4WJoa6j2TK2lnZ89Tyb8U99w
 certora_cli/Shared/__init__.py,sha256=s0dhvolFtsS4sRNzPVhC_rlw8mm194rCZ0WhOxInY40,1025
 certora_cli/Shared/certoraAttrUtil.py,sha256=ZsoS6xbSZnAjEoPEcfiJi6CvHU-1ySBKubvVKh78ohs,8373
 certora_cli/Shared/certoraLogging.py,sha256=cV2UQMhQ5j8crGXgeq9CEamI-Lk4HgdiA3HCrP-kSR4,14013
-certora_cli/Shared/certoraUtils.py,sha256=fWb0-zZMCT_lRvhaPhf8GeXUySW6I0enChv1aOYhoOY,55185
-certora_cli/Shared/certoraValidateFuncs.py,sha256=WG4UiyES8u49o3XmuRIvNf79rcpWFuCKtV__QUptOEQ,41852
-certora_cli/Shared/proverCommon.py,sha256=-Lw6_zEIlPA7i_n6xOUsmJeUKjqYWAnGW9GKWBB_GC0,11171
+certora_cli/Shared/certoraUtils.py,sha256=5uxgeGyfq8jw4w9l7fxiyMsgw74GpEtS8Wy8u5MNBHs,55178
+certora_cli/Shared/certoraValidateFuncs.py,sha256=Fn6GN_LEwlMjBdTiVO6WzCg8P5F6DhwkvP9Xl-XiQ6o,41921
+certora_cli/Shared/proverCommon.py,sha256=PqkjycZ3TdZr0RNWoPuA_VZ5b7EAAsu9ewymNH6kIm4,11291
 certora_cli/Shared/rustProverCommon.py,sha256=NIZ5ECbhuiMegyRAl07CV3r68MFG2tBNKgUAQoV4uLI,2049
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=j8bVz9zl2GrWRNLkCyJqxowmkL3ViT7lv_8gGapoAxw,146
-certora_jars/Typechecker.jar,sha256=F8N8aedlUn9WQ3KX_3I5QgzSRnuyNa0HmCYj1uWyHMo,17139024
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=YT2XfCbYZ3cwuV-9FyvRVu5GrruMtCHqT0n1kvOSlGY,145
+certora_jars/Typechecker.jar,sha256=NmnUZaxhNvRthGr1tEh9FVlT0wEO8A-jj9J22gOtngY,17143207
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_beta_mirror-7.30.1.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
-certora_cli_beta_mirror-7.30.1.dist-info/METADATA,sha256=CFnS5p5BHGEdNORrYyCT4U27P_260PWpBD6s5UEaUvE,1231
-certora_cli_beta_mirror-7.30.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-certora_cli_beta_mirror-7.30.1.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
-certora_cli_beta_mirror-7.30.1.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_beta_mirror-7.30.1.dist-info/RECORD,,
+certora_cli_beta_mirror-7.31.0.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
+certora_cli_beta_mirror-7.31.0.dist-info/METADATA,sha256=OGfFfEjLrMpnJSD69pQjP_yH9-2Jfvh1GviqnGpZTN0,1254
+certora_cli_beta_mirror-7.31.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+certora_cli_beta_mirror-7.31.0.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
+certora_cli_beta_mirror-7.31.0.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_beta_mirror-7.31.0.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-beta-mirror", "tag": "7.30.1", "branch": "", "commit": "5c9b8e0", "timestamp": "20250604.15.13.217266", "version": "7.30.1"}
+{"name": "certora-cli-beta-mirror", "tag": "7.31.0", "branch": "", "commit": "89159ec", "timestamp": "20250624.9.18.557504", "version": "7.31.0"}