certora-cli 8.20.0__tar.gz → 8.20.2__tar.gz

{certora_cli-8.20.0/certora_cli.egg-info → certora_cli-8.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli
-Version: 8.20.0
+Version: 8.20.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit f567630.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit f5f7778.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli-8.20.2/README.md

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

{certora_cli-8.20.0 → certora_cli-8.20.2}/certora_cli/CertoraProver/Compiler/CompilerCollector.py

@@ -190,6 +190,20 @@ class CompilerCollector(ABC):
     def compiler_version(self) -> CompilerVersion:
         pass
 
+    # Full version identifier from the compiler's `--version` output
+    # (e.g. solc '0.8.34+commit.80d5c536.Darwin.appleclang'), recording the exact
+    # compiler build. None when it could not be extracted. Set by the factory after
+    # construction so subclass constructors need not change.
+    _compiler_version_full: Optional[str] = None
+
+    @property
+    def compiler_version_full(self) -> Optional[str]:
+        return self._compiler_version_full
+
+    @compiler_version_full.setter
+    def compiler_version_full(self, value: Optional[str]) -> None:
+        self._compiler_version_full = value
+
     def normalize_file_compiler_path_name(self, file_abs_path: str) -> str:
         """
         Normalizes the absolute path name [file_abs_path] of a file, given to the compiler.

{certora_cli-8.20.0 → certora_cli-8.20.2}/certora_cli/CertoraProver/Compiler/CompilerCollectorFactory.py

@@ -18,7 +18,7 @@ import os
 from Shared import certoraUtils as Util
 from pathlib import Path
 from functools import lru_cache
-from typing import Set, Callable
+from typing import Set, Callable, Tuple, Optional
 import re
 import logging
 from CertoraProver.Compiler.CompilerCollector import CompilerLang, CompilerCollector
@@ -94,44 +94,48 @@ class CompilerCollectorFactory:
         @param path: path of the file to create [CompilerCollector] for
         """
         if str(path).endswith(".vy"):
-            version = self.__get_vyper_version(path)
-            return CompilerCollectorVy(version)
+            version, full_version = self.__get_vyper_version(path)
+            collector: CompilerCollector = CompilerCollectorVy(version)
         elif str(path).endswith(".sol"):
-            version = self.__get_solc_version(path)
-
-            return CompilerCollectorSol(version, CompilerLangSol(), not self.context.no_memory_safe_autofinders)
+            version, full_version = self.__get_solc_version(path)
+            collector = CompilerCollectorSol(version, CompilerLangSol(), not self.context.no_memory_safe_autofinders)
         elif str(path).endswith(".yul"):
-            version = self.__get_solc_version(path)
-            return CompilerCollectorYul(version, CompilerLangYul())
+            version, full_version = self.__get_solc_version(path)
+            collector = CompilerCollectorYul(version, CompilerLangYul())
         else:
             raise RuntimeError(f'expected {path} to represent a Solidity, Yul, or Vyper file')
 
-    def __get_vyper_version(self, contract_file_path: Path) -> Util.CompilerVersion:
+        collector.compiler_version_full = full_version
+        return collector
+
+    def __get_vyper_version(self, contract_file_path: Path) -> Tuple[Util.CompilerVersion, Optional[str]]:
         """
         @param contract_file_path: the contract that we are working on
-        @return: the running Vyper version
+        @return: the running Vyper version (triplet, full identifier)
         """
         vyper_exec_to_run = get_relevant_compiler(contract_file_path, self.context)
-        version = self.__get_compiler_exe_version(vyper_exec_to_run, self.__version_string_handler_vyper)
-        return version
+        return self.__get_compiler_exe_version(vyper_exec_to_run, self.__version_string_handler_vyper)
 
-    def __get_solc_version(self, contract_file_path: Path) -> Util.CompilerVersion:
+    def __get_solc_version(self, contract_file_path: Path) -> Tuple[Util.CompilerVersion, Optional[str]]:
         """
         @param contract_file_path: the contract that we are working on
-        @return: the running solc version
+        @return: the running solc version (triplet, full identifier)
         """
         compiler_logger.debug(f"visiting contract file {contract_file_path}")
         solc_path = get_relevant_compiler(contract_file_path, self.context)
-        version = self.__get_compiler_exe_version(solc_path, self.__version_string_handler_solc)
-        return version
+        return self.__get_compiler_exe_version(solc_path, self.__version_string_handler_solc)
 
     @lru_cache(maxsize=32)
     def __get_compiler_exe_version(self, compiler_name: str,
                                    version_string_handler:
-                                   Callable[[str], Util.CompilerVersion]) -> Util.CompilerVersion:
+                                   Callable[[str], Util.CompilerVersion]) -> Tuple[Util.CompilerVersion, Optional[str]]:
         """
         @param compiler_name: name of the solc we want to run on this contract
-        @return: the running compiler version
+        @return: a tuple of (the running compiler version triplet, the full version
+                 identifier string from `--version` such as
+                 '0.8.34+commit.80d5c536.Darwin.appleclang', or None if it could not
+                 be extracted). The triplet is used for behavioural checks; the full
+                 identifier records the exact compiler build for reproducibility.
         """
         out_name = f"version_check_{Path(compiler_name).name}"
         stdout_path = get_certora_config_dir() / f'{out_name}.stdout'
@@ -146,7 +150,23 @@ class CompilerCollectorFactory:
 
         with stdout_path.open() as r:
             version_string = r.read(-1)
-        return version_string_handler(version_string)
+        return version_string_handler(version_string), self.__extract_full_version(version_string)
+
+    @staticmethod
+    def __extract_full_version(version_string: str) -> Optional[str]:
+        """
+        Extracts the full version identifier from a compiler's `--version` output.
+        solc prints a `Version: <id>` line (e.g. 'Version: 0.8.34+commit.80d5c536.Darwin.appleclang');
+        vyper prints the bare identifier. Returns the identifier token, or None if not found.
+        """
+        version_matches = re.findall(r'^Version:\s*(\S+)', version_string, re.MULTILINE)
+        if version_matches:
+            return version_matches[0]
+        for line in version_string.splitlines():
+            line = line.strip()
+            if line:
+                return line
+        return None
 
     @staticmethod
     def __version_string_handler_vyper(version_string: str) -> Util.CompilerVersion:

{certora_cli-8.20.0 → certora_cli-8.20.2}/certora_cli/CertoraProver/certoraBuild.py

@@ -468,6 +468,25 @@ def convert_pathname_to_posix(json_dict: Dict[str, Any], entry: str, compiler_co
         json_dict[entry] = json_dict_posix_paths
 
 
+def relative_import_path(importer_dir: Path, target: str) -> str:
+    """
+    The path under which a Solidity file in [importer_dir] imports [target].
+    solc resolves an import starting with `./` or `../` against the importing file's directory.
+    """
+    rel = Util.as_posix(os.path.relpath(Util.abs_posix_path(target), Util.abs_posix_path(importer_dir)))
+    return rel if rel.startswith("../") else f"./{rel}"
+
+
+def harness_import_path(importer_dir: Path, target: str) -> str:
+    """
+    The path under which a harness in [importer_dir] imports [target], a solc source unit name from the main build.
+    A name that does not start with `./` or `../` is imported as is, so solc gives the file the same name as in the
+    main build and loads it once even if the harness also reaches it through other imports. A name that does would be
+    resolved against the harness's directory, so it is rewritten relative to it.
+    """
+    return relative_import_path(importer_dir, target) if target.startswith(("./", "../")) else target
+
+
 class CertoraBuildGenerator:
     # 12,14,04,06,00,04,10 is 0xce4604a aka certora.
     CONSTRUCTOR_STRING = "constructor"
@@ -3115,7 +3134,7 @@ class CertoraBuildGenerator:
             # Note we import and don't inline the file's contents since that's how the
             # original file is accessed also in the actual code, and compiling it
             # directly can cause issues.
-            tmp_file.write(f"import \"{original_file}\";\n\n")
+            tmp_file.write(f"import \"{harness_import_path(file_dir, original_file)}\";\n\n")
             rel_path = os.path.relpath(tmp_file.name, Path.cwd())
             tmp_abs_path = Util.abs_posix_path(tmp_file.name)
             # Add the temp file to all map attributes so that map lookups
@@ -3179,7 +3198,7 @@ class CertoraBuildGenerator:
                 current_content = tmp_file.read()
 
                 # Prepare modified content with target import at the beginning
-                rel_target_path = os.path.relpath(target_file, Path.cwd())
+                rel_target_path = harness_import_path(file_dir, target_file)
                 modified_content = f'import "{rel_target_path}";\n{current_content}'
 
                 # Write modified content

{certora_cli-8.20.0 → certora_cli-8.20.2}/certora_cli/CertoraProver/certoraBuildDataClasses.py

@@ -194,6 +194,10 @@ class ContractInSDC:
             "solidityTypes": [x.as_dict() for x in self.types],
             "compilerName": "" if not self.compiler_collector else self.compiler_collector.compiler_name,
             "compilerVersion": self.compiler_version,
+            # Full compiler build identifier from `--version` (e.g.
+            # '0.8.34+commit.80d5c536.Darwin.appleclang'); additive alongside the
+            # triplet-only compilerVersion above. None if unavailable.
+            "compilerVersionFull": None if not self.compiler_collector else self.compiler_collector.compiler_version_full,
             "compilerParameters": None if not self.compiler_parameters else self.compiler_parameters.as_dict(),
             "sourceBytes": None if self.source_bytes is None else self.source_bytes.as_dict(),
             "extensionContracts": [e.as_dict() for e in self.extension_contracts],

{certora_cli-8.20.0 → certora_cli-8.20.2/certora_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli
-Version: 8.20.0
+Version: 8.20.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit f567630.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit f5f7778.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli-8.20.2/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -0,0 +1 @@
+{"name": "certora-cli", "tag": "8.20.2", "branch": "", "commit": "f5f7778", "timestamp": "20261016.20.56.176000", "version": "8.20.2"}

{certora_cli-8.20.0 → certora_cli-8.20.2}/setup.py

@@ -3,11 +3,11 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli",
-    version="8.20.0",
+    version="8.20.2",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit f567630.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit f5f7778.                    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",
     packages=setuptools.find_packages(),

certora_cli-8.20.0/README.md

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

certora_cli-8.20.0/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +0,0 @@
-{"name": "certora-cli", "tag": "8.20.0", "branch": "", "commit": "f567630", "timestamp": "20261015.12.30.517651", "version": "8.20.0"}