certora-cli-beta-mirror 8.3.1__py3-none-macosx_10_9_universal2.whl → 8.4.1__py3-none-macosx_10_9_universal2.whl

certora_cli/CertoraProver/certoraBuild.py

@@ -1543,7 +1543,8 @@ class CertoraBuildGenerator:
                       contract_file_posix_abs: Path,
                       contract_file_as_provided: str,
                       remappings: List[str],
-                      compiler_collector: CompilerCollector) -> Dict[str, Any]:
+                      compiler_collector: CompilerCollector,
+                      compile_wd: Path) -> Dict[str, Any]:
         """
         when calling solc with the standard_json api, instead of passing it flags, we pass it json to request what we
         want -- currently we only use this to retrieve storage layout as this is the only way to do that,
@@ -1554,9 +1555,10 @@ class CertoraBuildGenerator:
         @param compiler_collector: Solidity or Vyper compiler collector
         @return:
         """
+        solc_json_contract_key = os.path.relpath(contract_file_as_provided, compile_wd) if self.context.use_relpaths_for_solc_json else contract_file_posix_abs
         compiler_collector_lang = compiler_collector.smart_contract_lang
         if compiler_collector_lang == CompilerLangSol() or compiler_collector_lang == CompilerLangYul():
-            sources_dict = {str(contract_file_posix_abs): {
+            sources_dict = {str(solc_json_contract_key): {
                 "urls": [str(contract_file_posix_abs)]}}  # type: Dict[str, Dict[str, Any]]
             output_selection = ["transientStorageLayout", "storageLayout", "abi", "evm.bytecode",
                                 "evm.deployedBytecode", "evm.methodIdentifiers", "evm.assembly",
@@ -1853,7 +1855,7 @@ class CertoraBuildGenerator:
         # Standard JSON
         remappings = [] if isinstance(compiler_collector, CompilerCollectorYul) else self.context.remappings
         input_for_solc = self.standard_json(Path(file_abs_path), build_arg_contract_file, remappings,
-                                            compiler_collector)
+                                            compiler_collector, compile_wd)
         standard_json_input = json.dumps(input_for_solc).encode("utf-8")
         compiler_logger.debug(f"about to run in {compile_wd} the command: {collect_cmd}")
         compiler_logger.debug(f"solc input = {json.dumps(input_for_solc, indent=4)}")
@@ -1909,7 +1911,7 @@ class CertoraBuildGenerator:
             contract_file_abs = str(Util.abs_norm_path(contract_file))
 
             # using os.path.relpath because Path.relative_to cannot go up the directory tree (no ..)
-            contract_file_rel = os.path.relpath(Path(contract_file_abs), Path.cwd())
+            contract_file_rel = os.path.relpath(Path(contract_file_abs), compile_wd)
 
             build_logger.debug(f"available keys: {data['contracts'].keys()}")
             if contract_file_rel in data[CONTRACTS]:
@@ -2008,7 +2010,15 @@ class CertoraBuildGenerator:
             srclist = {"0": file_abs_path}
             report_srclist = {"0": file_abs_path}
 
-        report_source_file = report_srclist[[idx for idx in srclist if srclist[idx] == file_abs_path][0]]
+        # Annoyingly, this is currently used just for... presentation?!
+        # We should clean up report_source_file from all places...
+
+        build_logger.debug(f"Finding report source file, abs path {file_abs_path} relative to {compile_wd}")
+        if self.context.use_relpaths_for_solc_json:
+            orig_report_source_file = Util.abs_posix_path(os.path.relpath(file_abs_path, compile_wd))
+        else:
+            orig_report_source_file = file_abs_path
+        report_source_file = report_srclist[[idx for idx in srclist if Util.abs_posix_path(srclist[idx]) == orig_report_source_file][0]]
 
         # all "contracts in SDC" are the same for every primary contract of the compiled file.
         # we can therefore compute those just once...
@@ -2039,8 +2049,9 @@ class CertoraBuildGenerator:
 
             build_logger.debug(f"finding primary contract address of {file_compiler_path}:{primary_contract} in "
                                f"{contracts_with_chosen_addresses}")
+            path_to_find = os.path.relpath(file_compiler_path, compile_wd) if self.context.use_relpaths_for_solc_json else file_compiler_path
             primary_contract_address = \
-                self.find_contract_address_str(file_compiler_path,
+                self.find_contract_address_str(path_to_find,
                                                primary_contract,
                                                contracts_with_chosen_addresses)
             build_logger.debug(f"Contracts in SDC {sdc_name}: {[contract.name for contract in contracts_in_sdc]}")
@@ -2086,7 +2097,7 @@ class CertoraBuildGenerator:
                 if new_path is None:
                     file_abs_path = Util.abs_posix_path(build_arg_contract_file)
                     # for vyper, because there are no autofinders, at least find the main file
-                    if (orig_file == file_abs_path and
+                    if (Util.abs_posix_path(orig_file) == file_abs_path and
                         ((Util.get_certora_sources_dir() / build_arg_contract_file).exists() or
                          Path(build_arg_contract_file).exists())):
                         new_srclist_map[idx] = build_arg_contract_file
@@ -2101,6 +2112,7 @@ class CertoraBuildGenerator:
                 report_srclist = srclist
         else:
             report_srclist = srclist
+        build_logger.debug(f"Report source list={report_srclist}")
         return report_srclist
 
     def get_bytecode(self,
@@ -2108,7 +2120,7 @@ class CertoraBuildGenerator:
                      contract_name: str,
                      primary_contracts: List[str],
                      contracts_with_chosen_addresses: List[Tuple[int, Any]],
-                     fail_if_no_bytecode: bool
+                     is_deployed_bytecode: bool
                      ) -> str:
         """
         Computes the linked bytecode object from the Solidity compiler output.
@@ -2119,20 +2131,31 @@ class CertoraBuildGenerator:
         @param primary_contracts - the names of the primary contracts we check to have a bytecode
         @param contracts_with_chosen_addresses - a list of tuples of addresses and the
             associated contract identifier
-        @param fail_if_no_bytecode - true if the function should fail if bytecode object is missing,
+        @param is_deployed_bytecode - true if we deal with deployed (runtime) bytecode,
+            thus the function should fail if bytecode object is missing,
             false otherwise
         @returns linked bytecode object
         """
         # TODO: Only contract_name should be necessary. This requires a lot more test cases to make sure we're not
         # missing any weird solidity outputs.
         bytecode_ = bytecode_object["object"]
-        bytecode = self.collect_and_link_bytecode(contract_name, contracts_with_chosen_addresses,
-                                                  bytecode_, bytecode_object.get("linkReferences", {}))
+        try:
+            bytecode = self.collect_and_link_bytecode(contract_name, contracts_with_chosen_addresses,
+                                                      bytecode_, bytecode_object.get("linkReferences", {}))
+        except Util.CertoraUserInputError as e:
+            if is_deployed_bytecode:
+                raise e
+            else:
+                prefix_msg = f"Failed to find a dependency library while building the "\
+                             f"constructor bytecode of {contract_name}. "\
+                             f"If you need the contract, import the missing library directly and add a dummy usage:\n"
+                orig_msg = str(e)
+                raise Util.CertoraUserInputError(prefix_msg + orig_msg)
         if contract_name in primary_contracts and len(bytecode) == 0:
             msg = f"Contract {contract_name} has no bytecode. " \
                   f"It may be caused because the contract is abstract, " \
                   f"or is missing constructor code. Please check the output of the Solidity compiler."
-            if fail_if_no_bytecode:
+            if is_deployed_bytecode:
                 raise Util.CertoraUserInputError(msg)
             else:
                 build_logger.warning(msg)
@@ -3002,7 +3025,7 @@ class CertoraBuildGenerator:
             target_file = self.context.contract_to_file[target.name]
             base_contracts = self.retrieve_base_contracts_list(
                 target_file,
-                Util.abs_posix_path(target_file),
+                target_file if self.context.use_relpaths_for_solc_json else Util.abs_posix_path(target_file),
                 target.name
             )
             extensions: Set[str] = set()
@@ -3078,8 +3101,9 @@ class CertoraBuildGenerator:
 
             # let's try to find the AST now
             build_file_ast = None
+            orig_path = os.path.relpath(ext_instance.original_file, Path.cwd()) if self.context.use_relpaths_for_solc_json else ext_instance.original_file
             for (k, v) in self.asts.items():
-                if ext_instance.original_file in v:
+                if orig_path in v:
                     build_file_ast = k
                     break
             if build_file_ast is None:
@@ -3087,10 +3111,10 @@ class CertoraBuildGenerator:
 
             contract_def_node = self.get_contract_def_node_ref(
                 build_file_ast,
-                ext_instance.original_file,
+                orig_path,
                 storage_ext
             )
-            def_node = self.asts[build_file_ast][ext_instance.original_file][contract_def_node]
+            def_node = self.asts[build_file_ast][orig_path][contract_def_node]
             nodes = def_node.get("nodes")
             if not isinstance(nodes, list):
                 raise RuntimeError(f"Couldn't find nodes for body of {storage_ext}")

certora_cli/CertoraProver/certoraBuildCacheManager.py

@@ -179,9 +179,12 @@ class CertoraBuildCacheManager:
             trg = trg_path_with_additional_included_files / post_autofinder_dir.name
             if post_autofinder_dir != trg:
                 if post_autofinder_dir.is_dir():
-                    if trg.exists():
-                        shutil.rmtree(trg)
-                    Util.safe_copy_folder(post_autofinder_dir, trg, shutil.ignore_patterns())
+                    # if we match on the cache, and we run a few certoraRun-s in parallel,
+                    # it could be this folder already exists. But the exact contents do not matter and are likely to
+                    # agree with the exception of spec files. So let's merge the folders so that the
+                    # sources are in any case runnable
+                    if not trg.exists():
+                        Util.safe_merge_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

certora_cli/CertoraProver/certoraContext.py

@@ -670,10 +670,10 @@ def get_map_attribute_value(context: CertoraContext, path: Path, attr_name: str)
             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:
+                    if str(path).endswith(contract_file_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
+    raise RuntimeError(f"cannot match {attr_name} to {path} from {attr_name}_map")

certora_cli/CertoraProver/certoraContextAttributes.py

@@ -753,6 +753,17 @@ class EvmAttributes(AttrUtil.Attributes):
         disables_build_cache=True  # prefer to be extra careful with this rare option
     )
 
+    USE_RELPATHS_FOR_SOLC_JSON = AttrUtil.AttributeDefinition(
+        arg_type=AttrUtil.AttrArgType.BOOLEAN,
+        help_msg="Uses relative paths when constructing json keys for solc's standard-json input",
+        default_desc="By using relative paths for the standard json, some rare compilation errors can be prevented",
+        argparse_args={
+            'action': AttrUtil.STORE_TRUE
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False
+    )
+
     IGNORE_SOLIDITY_WARNINGS = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
         help_msg="Ignore all Solidity compiler warnings",

certora_cli/Shared/certoraUtils.py

@@ -514,6 +514,18 @@ def safe_copy_folder(source: Path, dest: Path, ignore_patterns: Callable[[str, L
     shutil.rmtree(copy_temp, ignore_errors=True)
 
 
+def safe_merge_folder(source: Path, dest: Path, ignore_patterns: Callable[[str, List[str]], Iterable[str]]) -> None:
+    """
+    Safely merge source to dest. dest may exist. Will overwrite existing files
+    On certain OS/kernels/FS, copying a folder f into a subdirectory of f will
+    send copy tree into an infinite loop. This sidesteps the problem by first copying through a temporary folder.
+    """
+    copy_temp = tempfile.mkdtemp()
+    shutil.copytree(source, copy_temp, ignore=ignore_patterns, dirs_exist_ok=True)
+    shutil.copytree(copy_temp, dest, dirs_exist_ok=True)
+    shutil.rmtree(copy_temp, ignore_errors=True)
+
+
 def as_posix(path: str) -> str:
     """
     Converts path from windows to unix
@@ -1364,8 +1376,14 @@ def get_mappings_from_forge_remappings() -> List[str]:
     remappings = []
     if remappings_output:
         for line in remappings_output.strip().split('\n'):
-            if '=' in line:
+            key, value = line.split('=', 1)
+            if key and value:
                 remappings.append(line.strip())
+                for suffix in ['contracts/', 'src/']:
+                    if value.endswith(suffix) and not key.endswith(suffix):
+                        new_remapping = f"{key}{suffix}={value}"
+                        if new_remapping not in remappings:
+                            remappings.append(new_remapping)
 
     return remappings
 

certora_cli/Shared/proverCommon.py

@@ -29,6 +29,7 @@ from pathlib import Path
 from dataclasses import dataclass
 from rich.console import Console
 from typing import List, Tuple, Type, Optional, Dict, NoReturn, Callable
+from os import getenv
 
 scripts_dir_path = Path(__file__).parent.parent.resolve()  # containing directory
 sys.path.insert(0, str(scripts_dir_path))
@@ -299,6 +300,9 @@ def catch_exits(fn: Callable[..., None]) -> Callable[..., NoReturn]:
 
         except Exception as e:
             console.print(f"[bold red]{e}")
+            if getenv('CERTORA_DEV_MODE'):
+                import traceback
+                console.print(f"Traceback: {traceback.format_exc()}")
             sys.exit(1)
 
     return wrapper

{certora_cli_beta_mirror-8.3.1.dist-info → certora_cli_beta_mirror-8.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-beta-mirror
-Version: 8.3.1
+Version: 8.4.1
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-beta-mirror
 Author: Certora
@@ -39,4 +39,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 33ef152.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 6df223c.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_beta_mirror-8.3.1.dist-info → certora_cli_beta_mirror-8.4.1.dist-info}/RECORD

@@ -13,8 +13,8 @@ certora_cli/certoraSorobanProver.py,sha256=SYJKz5Sw-N0bJrSa1njRCE53R9_PMz7IWLhfa
 certora_cli/rustMutator.py,sha256=6AvOGU8Ijz89zW_ZJCWlfXkeobJsk7EsqZhK7Eqwn-Y,14544
 certora_cli/CertoraProver/__init__.py,sha256=QHNr-PJQAoyuPgTkO7gg23GRchiWSXglWNG7yLSQZvs,849
 certora_cli/CertoraProver/certoraApp.py,sha256=RKJ2Krb_CzbRUvczbdE6FhUDrFcvrR8j0JS8MNWXX7s,1469
-certora_cli/CertoraProver/certoraBuild.py,sha256=hcZA6lvTFottYU5C9t0KaEKc_jGEIzSEj5u5fotJPPI,225213
-certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=YnZmBZ_gCIbLwExgK5oxFlVDQGe4_YuGIpDLMy589E0,13318
+certora_cli/CertoraProver/certoraBuild.py,sha256=njHHl-D1HLobXk29l5cov9XP2cCAs1xaNSJxBmYx_qw,226911
+certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=DnVd7w92xjmg0DIrMgoJnCvaU0yCz7ySy0M4RiHEXEM,13648
 certora_cli/CertoraProver/certoraBuildDataClasses.py,sha256=hO0w3YK9V9gZsTbh4gxxlnEAaOiubUwfzNEw6uL1HaE,14841
 certora_cli/CertoraProver/certoraBuildRust.py,sha256=ZPbNp4ttRmzcKhFsgHSiHDRExNPaLOzgxTRqu23o1D0,6061
 certora_cli/CertoraProver/certoraBuildSui.py,sha256=zMXD2XnC4oqRDzPcBvSZmVquL3UG5paBZkfUT3JPbYY,4180
@@ -23,8 +23,8 @@ certora_cli/CertoraProver/certoraCollectConfigurationLayout.py,sha256=Rln6LsqMp-
 certora_cli/CertoraProver/certoraCollectRunMetadata.py,sha256=i31dkYt8kwlX44SHZtV_b8QI1Egi6cbB5-uuh5beYN0,12630
 certora_cli/CertoraProver/certoraCompilerParameters.py,sha256=r35y03IRwWIoz1GCNC7PuW3n8JPz9J1NGwhwUYKdYtI,1452
 certora_cli/CertoraProver/certoraConfigIO.py,sha256=-1EhJYsiheYvyCgOOWrRCQBjqtqNXrpMKJYRq5cKJ0Y,8171
-certora_cli/CertoraProver/certoraContext.py,sha256=OVNACUNj9fGb9He8sGdod2waC0eWE8ZgXNPWjRC1lFg,28817
-certora_cli/CertoraProver/certoraContextAttributes.py,sha256=dFV44uoKzpfAc5mCcTXVrAR3aFBi1YS_6evWcS5akVA,70197
+certora_cli/CertoraProver/certoraContext.py,sha256=bBbLPet5si6jFEdL1TBORN-HCiJGQK7hD6OQZ_ODmFY,28878
+certora_cli/CertoraProver/certoraContextAttributes.py,sha256=jtL_0nnRbPJ8pMNmMekDHZqTQueQGP_-tOSN6-4ql0Y,70680
 certora_cli/CertoraProver/certoraContextClass.py,sha256=d7HDqM72K7YnswR7kEcAHGwkFNrTqRz5-_0m7cl2Mso,900
 certora_cli/CertoraProver/certoraContextValidator.py,sha256=clXwmYHIBUmOJ8ADRUmu9U6_pNe_tXRNawvUPBLlYVY,46490
 certora_cli/CertoraProver/certoraContractFuncs.py,sha256=-CV7MkmsrwYfdYFAd6ZZib_6-mDG_ytxPM4hAjxtbMM,7137
@@ -65,16 +65,16 @@ certora_cli/Shared/ExpectedComparator.py,sha256=eyRR-jni4WJoa6j2TK2lnZ89Tyb8U99w
 certora_cli/Shared/__init__.py,sha256=s0dhvolFtsS4sRNzPVhC_rlw8mm194rCZ0WhOxInY40,1025
 certora_cli/Shared/certoraAttrUtil.py,sha256=Nw8ban5Axp6c6dT-KJfCD9i9tKnGk1DbvRDDNH3--DU,8574
 certora_cli/Shared/certoraLogging.py,sha256=cV2UQMhQ5j8crGXgeq9CEamI-Lk4HgdiA3HCrP-kSR4,14013
-certora_cli/Shared/certoraUtils.py,sha256=wayg6igrwaKi05pqBwAeu0GWFmaTXF8vK8kS_b2GSog,58450
+certora_cli/Shared/certoraUtils.py,sha256=b9qIZ90wW1ofZIlvdFyZRzoVg1HlkA6gfkTaKkVxcQU,59443
 certora_cli/Shared/certoraValidateFuncs.py,sha256=mYguICGfUwVZ9qPBFajss1xqHPDR-KRtskgERLum4AM,43225
-certora_cli/Shared/proverCommon.py,sha256=uZkl9PDLPj81kKRnBnlPUmvhMZovNP25_74No_7jaQ4,11215
-certora_jars/ASTExtraction.jar,sha256=-WUqC3U6UHyft5d3qW9FKoYl8IZuSL3D0Q28Et0YrE4,17652496
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=X42-7NRQKFGFXVr_SME0w7ZA4Uw93ZIjVzYT3NCVgnE,142
-certora_jars/Typechecker.jar,sha256=SY3njRtjl8HoPVzwc5n6sEx6U9DvW5mdWlEqm4BWbMA,17614653
+certora_cli/Shared/proverCommon.py,sha256=DUB-uEKjOkZ-8qil6xukPqfTynpigXW-gcrm0_kRUZY,11383
+certora_jars/ASTExtraction.jar,sha256=Ng8UDdDV61EIPjBh9-H0646LoeQLA2a5CNCFN3X49o0,20972809
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=yA1W1HSGmMNq1KsBK40KYMMLzLVdVJJzfvqFC8LyY3w,143
+certora_jars/Typechecker.jar,sha256=_t5VYHpbSKTCtZFYKkNWnvj9LBpGoVEQzHEZr-hPKoQ,20934968
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_beta_mirror-8.3.1.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
-certora_cli_beta_mirror-8.3.1.dist-info/METADATA,sha256=vSnbSzRa86vjT_SuM9GwISkExJ9IB8KUdzrfV1O8cTw,1286
-certora_cli_beta_mirror-8.3.1.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
-certora_cli_beta_mirror-8.3.1.dist-info/entry_points.txt,sha256=ClZiFkCYDdK25_ufxZvnE2Rx_kNk1_4vj7KpgYUKxGM,509
-certora_cli_beta_mirror-8.3.1.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_beta_mirror-8.3.1.dist-info/RECORD,,
+certora_cli_beta_mirror-8.4.1.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
+certora_cli_beta_mirror-8.4.1.dist-info/METADATA,sha256=Mr1J2VrDcor8wTtGoMbxriQ541tjfeHXaRPXooRERIA,1286
+certora_cli_beta_mirror-8.4.1.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
+certora_cli_beta_mirror-8.4.1.dist-info/entry_points.txt,sha256=ClZiFkCYDdK25_ufxZvnE2Rx_kNk1_4vj7KpgYUKxGM,509
+certora_cli_beta_mirror-8.4.1.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_beta_mirror-8.4.1.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-beta-mirror", "tag": "8.3.1", "branch": "", "commit": "33ef152", "timestamp": "20251010.9.6.993359", "version": "8.3.1"}
+{"name": "certora-cli-beta-mirror", "tag": "8.4.1", "branch": "", "commit": "6df223c", "timestamp": "20251021.7.13.438699", "version": "8.4.1"}