certora-cli-alpha-master 20251012.8.16.603503__tar.gz → 20251012.20.20.862738__tar.gz

{certora_cli_alpha_master-20251012.8.16.603503/certora_cli_alpha_master.egg-info → certora_cli_alpha_master-20251012.20.20.862738}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-alpha-master
-Version: 20251012.8.16.603503
+Version: 20251012.20.20.862738
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -39,4 +39,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit c99c312.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 67b032d.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20251012.20.20.862738/README.md

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

{certora_cli_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738}/certora_cli/CertoraProver/certoraBuild.py

@@ -1554,9 +1554,10 @@ class CertoraBuildGenerator:
         @param compiler_collector: Solidity or Vyper compiler collector
         @return:
         """
+        solc_json_contract_key = contract_file_as_provided 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",
@@ -2008,7 +2009,7 @@ 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]]
+        report_source_file = report_srclist[[idx for idx in srclist if Util.abs_posix_path(srclist[idx]) == file_abs_path][0]]
 
         # all "contracts in SDC" are the same for every primary contract of the compiled file.
         # we can therefore compute those just once...
@@ -2086,7 +2087,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

{certora_cli_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738}/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_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738}/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_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738}/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

{certora_cli_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738/certora_cli_alpha_master.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-alpha-master
-Version: 20251012.8.16.603503
+Version: 20251012.20.20.862738
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -39,4 +39,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit c99c312.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 67b032d.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20251012.20.20.862738/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -0,0 +1 @@
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "67b032d", "timestamp": "20251012.20.20.862738", "version": "20251012.20.20.862738+67b032d"}

{certora_cli_alpha_master-20251012.8.16.603503 → certora_cli_alpha_master-20251012.20.20.862738}/setup.py

@@ -3,11 +3,11 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli-alpha-master",
-    version="20251012.8.16.603503",
+    version="20251012.20.20.862738",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit c99c312.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit 67b032d.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
     long_description_content_type="text/markdown",
     url="https://pypi.org/project/certora-cli-alpha-master",
     packages=setuptools.find_packages(),

certora_cli_alpha_master-20251012.8.16.603503/README.md

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

certora_cli_alpha_master-20251012.8.16.603503/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +0,0 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "c99c312", "timestamp": "20251012.8.16.603503", "version": "20251012.8.16.603503+c99c312"}