certora-cli-beta 8.16.0__tar.gz → 8.16.2__tar.gz

{certora_cli_beta-8.16.0/certora_cli_beta.egg-info → certora_cli_beta-8.16.2}/PKG-INFO

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

certora_cli_beta-8.16.2/README.md

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

{certora_cli_beta-8.16.0 → certora_cli_beta-8.16.2}/certora_cli/CertoraProver/certoraBuild.py

@@ -1839,6 +1839,42 @@ class CertoraBuildGenerator:
                         else:
                             raise Util.CertoraUserInputError(err_msg)
 
+    def _resolve_data_contracts_key(self,
+                                    contract_file: str,
+                                    compile_wd: Path,
+                                    data: Dict[str, Any],
+                                    resolved_to_orig: Optional[Dict[str, str]] = None,
+                                    ) -> str:
+        """Resolve which key in data[CONTRACTS] corresponds to ``contract_file``.
+
+        solc's standard-json output keys files in whatever form solc saw them — relative to
+        compile_wd, absolute, the raw input string, or (for symlinks) a previously seen original.
+        We try each in order and return the matching key. Raises if no form matches.
+
+        ``resolved_to_orig`` is optional: the worklist populates it from base contracts and link
+        references; the pre-worklist seed for the primary file passes ``None``.
+        """
+        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), compile_wd)
+
+        build_logger.debug(f"available keys: {data[CONTRACTS].keys()}")
+        if contract_file_rel in data[CONTRACTS]:
+            return contract_file_rel
+        if contract_file_abs in data[CONTRACTS]:
+            return contract_file_abs
+        if contract_file in data[CONTRACTS]:
+            # when does this happen? Saw this in TrustToken on a package source file
+            return contract_file
+        orig = resolved_to_orig.get(contract_file) if resolved_to_orig is not None else None
+        if orig is not None and orig in data[CONTRACTS]:
+            return orig
+        # our file may be a symlink!
+        raise Exception(
+            f"Worklist contains {contract_file} (relative {contract_file_rel}, "
+            f"absolute {contract_file_abs}), resolved from {orig} "
+            f"that does not exist in contract set {orig in data[CONTRACTS] if orig else False}")
+
     def collect_for_file(self,
                          build_arg_contract_file: str,
                          file_index: int,
@@ -1986,6 +2022,12 @@ class CertoraBuildGenerator:
         contracts_with_libraries = {}
         file_compiler_path = compiler_collector.normalize_file_compiler_path_name(file_abs_path)
 
+        # Resolve the data[CONTRACTS] key for the primary file once, before the worklist runs.
+        # This is the (file, *) half of the primary contract-handle set used to scope the bytecode
+        # check inside get_bytecode — see the primary_contract_handles construction just below.
+        primary_file_key = self._resolve_data_contracts_key(str(Path(file_compiler_path)), compile_wd, data)
+        primary_contract_handles: Set[Tuple[str, str]] = {(primary_file_key, n) for n in contracts_in_file}
+
         # But apparently this heavily depends on the Solidity AST format anyway
 
         # Need to add all library dependencies that are in a different file:
@@ -1997,31 +2039,8 @@ class CertoraBuildGenerator:
             contract_file_obj = contracts_to_add_dependencies_queue.pop()
             contract_file = str(contract_file_obj)
             build_logger.debug(f"Processing dependencies from file {contract_file}")
-            # make sure path name is in posix format.
-            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), compile_wd)
-
-            build_logger.debug(f"available keys: {data['contracts'].keys()}")
-            if contract_file_rel in data[CONTRACTS]:
-                contract_file = contract_file_rel
-                unsorted_contract_list = data[CONTRACTS][contract_file]
-            elif contract_file_abs in data[CONTRACTS]:
-                contract_file = contract_file_abs
-                unsorted_contract_list = data[CONTRACTS][contract_file_abs]
-            elif contract_file in data[CONTRACTS]:
-                # when does this happen? Saw this in TrustToken on a package source file
-                unsorted_contract_list = data[CONTRACTS][contract_file]
-            elif resolved_to_orig.get(contract_file) in data[CONTRACTS]:
-                unsorted_contract_list = data[CONTRACTS][resolved_to_orig[contract_file]]
-                contract_file = resolved_to_orig[contract_file]
-            else:
-                # our file may be a symlink!
-                raise Exception(
-                    f"Worklist contains {contract_file} (relative {contract_file_rel}, "
-                    f"absolute {contract_file_abs}), resolved from {resolved_to_orig.get(contract_file)} "
-                    f"that does not exist in contract set {resolved_to_orig.get(contract_file) in data['contracts']}")
+            contract_file = self._resolve_data_contracts_key(contract_file, compile_wd, data, resolved_to_orig)
+            unsorted_contract_list = data[CONTRACTS][contract_file]
 
             contract_list = sorted([c for c in unsorted_contract_list])
             # every contract file may contain numerous primary contracts, but the dependent contracts
@@ -2125,7 +2144,7 @@ class CertoraBuildGenerator:
                     contracts_with_chosen_addresses,
                     data,
                     report_source_file,
-                    contracts_in_file,
+                    primary_contract_handles,
                     build_arg_contract_file,
                     compiler_collector,
                     compile_wd,
@@ -2208,7 +2227,7 @@ class CertoraBuildGenerator:
     def get_bytecode(self,
                      bytecode_object: Dict[str, Any],
                      contract_name: str,
-                     primary_contracts: List[str],
+                     is_primary: bool,
                      contracts_with_chosen_addresses: List[Tuple[int, Any]],
                      is_deployed_bytecode: bool
                      ) -> str:
@@ -2218,7 +2237,11 @@ class CertoraBuildGenerator:
 
         @param bytecode_object - the output from the Solidity compiler
         @param contract_name - the contract that we are working on
-        @param primary_contracts - the names of the primary contracts we check to have a bytecode
+        @param is_primary - whether (source_file, contract_name) is a primary handle in the current
+            compilation; only primaries are required to have non-empty bytecode. The (file, name)
+            scoping avoids false positives when a transitively-imported abstract contract shares a
+            name with a primary (e.g. local concrete `Proxy` vs OpenZeppelin's abstract `Proxy`).
+            Caller computes membership against the primary_contract_handles set.
         @param contracts_with_chosen_addresses - a list of tuples of addresses and the
             associated contract identifier
         @param is_deployed_bytecode - true if we deal with deployed (runtime) bytecode,
@@ -2241,7 +2264,7 @@ class CertoraBuildGenerator:
                              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:
+        if is_primary 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."
@@ -2350,7 +2373,7 @@ class CertoraBuildGenerator:
                             contracts_with_chosen_addresses: List[Tuple[int, Any]],
                             data: Dict[str, Any],
                             report_source_file: str,
-                            primary_contracts: List[str],
+                            primary_contract_handles: Set[Tuple[str, str]],
                             build_arg_contract_file: str,
                             compiler_collector_for_contract_file: CompilerCollector,
                             compile_wd: Path,
@@ -2422,12 +2445,14 @@ class CertoraBuildGenerator:
         (srcmap, constructor_srcmap) = self.collect_srcmap(contract_data)
 
         varmap = ""
+        contract_is_primary = (source_code_file, contract_name) in primary_contract_handles
         deployed_bytecode = self.get_bytecode(contract_data["evm"]["deployedBytecode"], contract_name,
-                                              primary_contracts,
+                                              contract_is_primary,
                                               contracts_with_chosen_addresses, True)
         deployed_bytecode = compiler_lang.normalize_deployed_bytecode(
             deployed_bytecode)
-        constructor_bytecode = self.get_bytecode(contract_data["evm"]["bytecode"], contract_name, primary_contracts,
+        constructor_bytecode = self.get_bytecode(contract_data["evm"]["bytecode"], contract_name,
+                                                 contract_is_primary,
                                                  contracts_with_chosen_addresses, False)
         constructor_bytecode = compiler_lang.normalize_deployed_bytecode(
             constructor_bytecode)

{certora_cli_beta-8.16.0 → certora_cli_beta-8.16.2}/certora_cli/Shared/certoraValidateFuncs.py

@@ -93,6 +93,8 @@ class RunSources(Util.NoValEnum):
     LIGHT_TEST = auto()
     REPORT = auto()
     TIMEOUTER = auto()
+    STATIC_ANALYZER = auto()
+    AUTO_PROVER = auto()
 
 
 class WaitForResultOptions(Util.NoValEnum):

{certora_cli_beta-8.16.0 → certora_cli_beta-8.16.2/certora_cli_beta.egg-info}/PKG-INFO

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

certora_cli_beta-8.16.2/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -0,0 +1 @@
+{"name": "certora-cli-beta", "tag": "8.16.2", "branch": "", "commit": "94b86f7", "timestamp": "20260625.10.50.595039", "version": "8.16.2"}

{certora_cli_beta-8.16.0 → certora_cli_beta-8.16.2}/setup.py

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

certora_cli_beta-8.16.0/README.md

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

certora_cli_beta-8.16.0/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +0,0 @@
-{"name": "certora-cli-beta", "tag": "8.16.0", "branch": "", "commit": "9317e51", "timestamp": "20260525.8.32.660750", "version": "8.16.0"}