certora-cli 7.22.3__tar.gz → 7.25.3__tar.gz

{certora_cli-7.22.3/certora_cli.egg-info → certora-cli-7.25.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli
-Version: 7.22.3
+Version: 7.25.3
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli
 Author: Certora
@@ -11,17 +11,5 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click
-Requires-Dist: json5
-Requires-Dist: pycryptodome
-Requires-Dist: requests
-Requires-Dist: rich
-Requires-Dist: sly
-Requires-Dist: tabulate
-Requires-Dist: tqdm
-Requires-Dist: StrEnum
-Requires-Dist: tomli
-Requires-Dist: universalmutator
-Requires-Dist: jinja2
 
-Commit fa78588.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 97ac73d.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora-cli-7.25.3/README.md

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

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/Compiler/CompilerCollector.py

@@ -1,10 +1,25 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 from abc import abstractmethod, ABC
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Set
 from Shared.certoraUtils import AbstractAndSingleton, CompilerVersion
-from EVMVerifier.certoraContractFuncs import SourceBytes
-import EVMVerifier.certoraType as CT
+from CertoraProver.certoraContractFuncs import SourceBytes
+import CertoraProver.certoraType as CT
 
 
 # TODO: merge this with Func in certoraBuild

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/Compiler/CompilerCollectorFactory.py

@@ -1,3 +1,18 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import os
 
 from Shared import certoraUtils as Util
@@ -6,12 +21,12 @@ from functools import lru_cache
 from typing import Set, Callable
 import re
 import logging
-from EVMVerifier.Compiler.CompilerCollector import CompilerLang, CompilerCollector
-from EVMVerifier.Compiler.CompilerCollectorSol import CompilerCollectorSol, CompilerLangSol
-from EVMVerifier.Compiler.CompilerCollectorYul import CompilerLangYul, CompilerCollectorYul
-from EVMVerifier.Compiler.CompilerCollectorVy import CompilerCollectorVy, CompilerLangVy
+from CertoraProver.Compiler.CompilerCollector import CompilerLang, CompilerCollector
+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 EVMVerifier.certoraContextClass import CertoraContext
+from CertoraProver.certoraContextClass import CertoraContext
 
 # logger for running the Solidity compiler and reporting any errors it emits
 compiler_logger = logging.getLogger("compiler")

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/Compiler/CompilerCollectorSol.py

@@ -1,10 +1,25 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 from pathlib import Path
 from typing import Any, List, Tuple, Dict, Set
 
-from EVMVerifier.Compiler.CompilerCollector import CompilerLang, CompilerLangFunc
-from EVMVerifier.Compiler.CompilerCollectorSolBased import CompilerCollectorSolBased
+from CertoraProver.Compiler.CompilerCollector import CompilerLang, CompilerLangFunc
+from CertoraProver.Compiler.CompilerCollectorSolBased import CompilerCollectorSolBased
 from Shared.certoraUtils import Singleton, CompilerVersion, get_certora_config_dir
-import EVMVerifier.certoraType as CT
+import CertoraProver.certoraType as CT
 
 
 class CompilerLangSol(CompilerLang, metaclass=Singleton):

certora-cli-7.25.3/certora_cli/CertoraProver/Compiler/CompilerCollectorSolBased.py

@@ -0,0 +1,36 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+from CertoraProver.Compiler.CompilerCollector import CompilerCollector, CompilerLang
+from Shared.certoraUtils import CompilerVersion
+
+
+class CompilerCollectorSolBased(CompilerCollector):
+
+    def __init__(self, version: CompilerVersion, lang: CompilerLang):
+        self.__compiler_version = version
+        self.__smart_contract_lang = lang
+
+    @property
+    def compiler_name(self) -> str:
+        return self.smart_contract_lang.compiler_name
+
+    @property
+    def smart_contract_lang(self) -> CompilerLang:
+        return self.__smart_contract_lang
+
+    @property
+    def compiler_version(self) -> CompilerVersion:
+        return self.__compiler_version

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/Compiler/CompilerCollectorVy.py

@@ -1,3 +1,18 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import itertools
 import json
 import logging
@@ -8,9 +23,9 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import Any, Dict, List, Set, Tuple, Optional
 
-import EVMVerifier.certoraType as CT
+import CertoraProver.certoraType as CT
 from Crypto.Hash import keccak
-from EVMVerifier.Compiler.CompilerCollector import CompilerCollector, CompilerLang, CompilerLangFunc
+from CertoraProver.Compiler.CompilerCollector import CompilerCollector, CompilerLang, CompilerLangFunc
 from Shared.certoraUtils import Singleton, DEFAULT_VYPER_COMPILER, CompilerVersion
 from Shared.certoraUtils import print_failed_to_run, get_certora_config_dir
 

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/Compiler/CompilerCollectorYul.py

@@ -1,14 +1,29 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import json
 from typing import List
 
 from Crypto.Hash import keccak
 
-from EVMVerifier.Compiler.CompilerCollector import CompilerLang
-from EVMVerifier.Compiler.CompilerCollectorSol import CompilerLangSol
-from EVMVerifier.Compiler.CompilerCollectorSolBased import CompilerCollectorSolBased
-from EVMVerifier.certoraContractFuncs import Func
+from CertoraProver.Compiler.CompilerCollector import CompilerLang
+from CertoraProver.Compiler.CompilerCollectorSol import CompilerLangSol
+from CertoraProver.Compiler.CompilerCollectorSolBased import CompilerCollectorSolBased
+from CertoraProver.certoraContractFuncs import Func
 from Shared.certoraUtils import Singleton, CompilerVersion
-import EVMVerifier.certoraType as CT
+import CertoraProver.certoraType as CT
 
 
 class CompilerLangYul(CompilerLangSol, metaclass=Singleton):

certora-cli-7.25.3/certora_cli/CertoraProver/Compiler/__init__.py

@@ -0,0 +1,18 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""
+This package contains scripts that are used for interacting with the source code compiler.
+"""

certora-cli-7.25.3/certora_cli/CertoraProver/__init__.py

@@ -0,0 +1,20 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""
+This package contains scripts that are used for running the Certora Prover.
+
+This package is a part of the certora_cli customer-facing Python package.
+"""

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/certoraBuild.py

@@ -1,3 +1,18 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import enum
 import json
 import logging
@@ -13,32 +28,32 @@ from pathlib import Path
 from typing import Any, Dict, List, Tuple, Optional, Set, Iterator, NoReturn
 from Crypto.Hash import keccak
 
-from EVMVerifier.certoraBuildCacheManager import CertoraBuildCacheManager, CachedFiles
-from EVMVerifier.certoraBuildDataClasses import CONTRACTS, ImmutableReference, ContractExtension, ContractInSDC, SDC, \
+from CertoraProver.certoraBuildCacheManager import CertoraBuildCacheManager, CachedFiles
+from CertoraProver.certoraBuildDataClasses import CONTRACTS, ImmutableReference, ContractExtension, ContractInSDC, SDC, \
     Instrumentation, InsertBefore, InsertAfter, UnspecializedSourceFinder, instrumentation_logger
-from EVMVerifier.certoraCompilerParameters import SolcParameters
-from EVMVerifier.certoraSourceFinders import add_source_finders
-from EVMVerifier.certoraVerifyGenerator import CertoraVerifyGenerator
-from EVMVerifier.certoraContractFuncs import Func, InternalFunc, STATEMUT, SourceBytes
+from CertoraProver.certoraCompilerParameters import SolcParameters
+from CertoraProver.certoraSourceFinders import add_source_finders
+from CertoraProver.certoraVerifyGenerator import CertoraVerifyGenerator
+from CertoraProver.certoraContractFuncs import Func, InternalFunc, STATEMUT, SourceBytes
 from Shared.certoraUtils import is_relative_to
 
 scripts_dir_path = Path(__file__).parent.parent.resolve()  # containing directory
 sys.path.insert(0, str(scripts_dir_path))
-from EVMVerifier.Compiler.CompilerCollector import CompilerLang, CompilerCollector
-from EVMVerifier.Compiler.CompilerCollectorSol import CompilerCollectorSol, CompilerLangSol
-from EVMVerifier.Compiler.CompilerCollectorYul import CompilerLangYul, CompilerCollectorYul
-from EVMVerifier.Compiler.CompilerCollectorVy import CompilerLangVy
-from EVMVerifier.Compiler.CompilerCollectorFactory import CompilerCollectorFactory, \
+from CertoraProver.Compiler.CompilerCollector import CompilerLang, CompilerCollector
+from CertoraProver.Compiler.CompilerCollectorSol import CompilerCollectorSol, CompilerLangSol
+from CertoraProver.Compiler.CompilerCollectorYul import CompilerLangYul, CompilerCollectorYul
+from CertoraProver.Compiler.CompilerCollectorVy import CompilerLangVy
+from CertoraProver.Compiler.CompilerCollectorFactory import CompilerCollectorFactory, \
     get_relevant_compiler, get_compiler_lang
-from EVMVerifier.certoraNodeFilters import NodeFilters as Nf
-import EVMVerifier.certoraType as CT
+from CertoraProver.certoraNodeFilters import NodeFilters as Nf
+import CertoraProver.certoraType as CT
 
-from EVMVerifier.certoraContextClass import CertoraContext
-import EVMVerifier.certoraContextAttributes as Attrs
+from CertoraProver.certoraContextClass import CertoraContext
+import CertoraProver.certoraContextAttributes as Attrs
 from Shared import certoraValidateFuncs as Vf
-from EVMVerifier import certoraContextValidator as Cv
+from CertoraProver import certoraContextValidator as Cv
 from Shared import certoraUtils as Util
-import EVMVerifier.certoraContext as Ctx
+import CertoraProver.certoraContext as Ctx
 
 
 BUILD_IS_LIBRARY = False
@@ -211,7 +226,7 @@ def generate_compressed_finder(f: Func, internal_id: int, sym: int,
     type_layout = 0
     for ty in f.fullArgs:
         # generate the layout according to this spec:
-        # https://certora.atlassian.net/wiki/spaces/CER/pages/281411612/Certora+Autofinder+Binary+Format
+        # https://www.notion.so/certora/Certora-Autofinder-Binary-Format-45327dff9de64b2fb1fdac4b1ec4d7f9
         if finder_gen.is_decomposed(ty):
             type_layout = (type_layout << 6 | 0b11010)
         elif finder_gen.is_calldata_pointer(ty):
@@ -1332,6 +1347,24 @@ 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:
+            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_optimize(self, contract_file_path: str, settings_dict: Dict[str, Any],
                          compiler_collector: CompilerCollector) -> None:
         """
@@ -1353,8 +1386,7 @@ class CertoraBuildGenerator:
         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 or self.context.solc_experimental_via_ir):
+            if not self.context.strict_solc_optimizer and self.context.solc_via_ir:
                 # The default optimizer steps (taken from libsolidity/interface/OptimiserSettings.h) but with the
                 # full inliner step removed
                 solc0_8_26_to_0_8_28 = ("dhfoDgvulfnTUtnIfxa[r]EscLMVcul[j]Trpeulxa[r]cLCTUca[r]LSsTFOtfDnca[r]" +
@@ -1431,10 +1463,9 @@ class CertoraBuildGenerator:
         @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_via_ir or self.context.solc_experimental_via_ir:
-            settings_dict["viaIR"] = True
-        if self.context.solc_evm_version is not None:
-            settings_dict["evmVersion"] = self.context.solc_evm_version
+
+        self._handle_via_ir(contract_file_path, settings_dict)
+        self._handle_evm_version(contract_file_path, settings_dict)
         self._handle_optimize(contract_file_path, settings_dict, compiler_collector)
 
     @staticmethod
@@ -1780,7 +1811,7 @@ class CertoraBuildGenerator:
         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)}")
 
-        if self.context.test == str(Util.TestValue.CHECK_SOLC_OPTIONS):
+        if self.context.test == str(Util.TestValue.CHECK_SOLC_OPTIONS) and eval(self.context.test_condition):
             raise Util.TestResultsReady({'standard_json_input': standard_json_input, 'main_path': main_path})
         Util.run_compiler_cmd(collect_cmd, f"{sdc_name}.standard.json", wd=compile_wd,
                               compiler_input=standard_json_input)
@@ -2358,7 +2389,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 or self.context.solc_experimental_via_ir:
+                    if self.context.solc_via_ir:
                         should_compress = False
                     else:
                         should_compress = True
@@ -2458,112 +2489,6 @@ class CertoraBuildGenerator:
         # some referenced function calls could be builtins like require, whose declarations we do not see
         return [node[self.CERTORA_CONTRACT_NAME()] for node in referenced_nodes if self.CERTORA_CONTRACT_NAME() in node]
 
-    @staticmethod
-    def __find_closest_methods(method_name: str, methods: List[Func]) -> List[str]:
-        """
-        Gets a name of a method and a list of existing methods. Returns a list of closest matching method signatures.
-        The match is performed on the name only, ignoring the parameters in the function.
-        :param method_name: Name of a method
-        :param methods: A list of possible methods.
-        :return: An list of best suggested method signatures as replacement. Ordered by descending relevance.
-        """
-        # Step 1: find the closest method names
-        all_method_names = [method.name for method in methods]
-        all_method_names = list(set(all_method_names))  # remove duplicate names
-        possible_method_names = Util.get_closest_strings(method_name, all_method_names)
-
-        # Step 2: fetch the parameters of the closest matching method names
-        possible_methods = list()
-        for name in possible_method_names:
-            for method in methods:
-                if method.name == name:
-                    possible_methods.append(method.signature())
-        return possible_methods
-
-    @staticmethod
-    def __suggest_methods(wrong_sig: str, suggested_replacements: List[str]) -> None:
-        """
-        Raises an error suggesting replacement methods for an erroneous signature.
-        :param wrong_sig: A method signature as inserted by the user. Had no exact matches in the code.
-        :param suggested_replacements: A list of suggested method signatures, ordered by descending relevance
-        :raises: AttributeError always
-        """
-        if len(suggested_replacements) == 0:
-            raise Util.CertoraUserInputError(f"Method {wrong_sig} was not found.")
-
-        if len(suggested_replacements) == 1:
-            options_str = suggested_replacements[0]
-        elif len(suggested_replacements) == 2:
-            options_str = " or ".join(suggested_replacements)
-        elif len(suggested_replacements) > 2:
-            # Code below adds or after the last comma if there are multiple options
-            options_str = ", ".join(suggested_replacements)
-            last_commas_location_regex = r"(?<=,)(?=[^,]*$)"
-            options_str = re.sub(last_commas_location_regex, r" or", options_str)
-
-        raise Util.CertoraUserInputError(f"Method {wrong_sig} was not found. Maybe you meant {options_str}?")
-
-    def __verify_method(self, method_input: str, sdc_pre_finder: SDC) -> None:
-        input_method_name = method_input.split('(')[0]
-        input_method_sig = method_input.replace(' ', '')
-
-        """
-        A list of suggested methods, in case the user inserted a wrong method signature. Only public/external methods
-        are suggested to the user. The suggestions are ordered by closest match - index zero is the best match, and
-        descending.
-        """
-        possible_methods = list()
-
-        # Step #1 - check if an exact match exists. If not, check if only the parameters were wrong in the signature
-
-        contract_names = [contract.name for contract in sdc_pre_finder.contracts]
-        public_method_sets = [contract.methods for contract in sdc_pre_finder.contracts]
-        public_methods = Util.flatten_set_list(public_method_sets)
-
-        for method in public_methods:
-            if method.name == input_method_name:  # Correct name, now we check parameter types
-                if method.signature() == input_method_sig:  # An exact match was found
-                    return
-
-                # A method with the same name but different parameters exists
-                possible_methods.append(method.signature())
-
-            for contract_name in contract_names:
-                contract_method_name = method.name_for_contract(contract_name)
-                if contract_method_name == input_method_name:
-                    if method.signature_for_contract(contract_name) == input_method_sig:
-                        return
-
-                    possible_methods.append(contract_method_name)
-
-        # Now we check if the method exists, but is private or external
-        private_method_sets = [contract.internal_funcs for contract in sdc_pre_finder.contracts]
-        private_methods = Util.flatten_set_list(private_method_sets)
-
-        for method in private_methods:
-            if method.name == input_method_name:  # Correct name, now we check parameter types
-                if method.signature() == input_method_sig:  # An exact match was found
-                    raise Util.CertoraUserInputError(
-                        f"Method {input_method_sig} is {method.visibility}. Please change it to external or public")
-
-            for contract_name in contract_names:
-                contract_method_name = method.name_for_contract(contract_name)
-                if contract_method_name == input_method_name:
-                    if method.signature_for_contract(contract_name) == input_method_sig:
-                        raise Util.CertoraUserInputError(
-                            f"Method {contract_method_name} is {method.visibility}. "
-                            "Please change it to external or public")
-
-        # We suggest a different method name, if we have a good enough suggestion
-        # A method with correct name but wrong argument types takes precedence over a method with a different name
-        if len(possible_methods) == 0:
-            possible_methods = self.__find_closest_methods(input_method_name, public_methods)
-
-        if len(possible_methods) > 0:  # We have suggestions
-            self.__suggest_methods(method_input, possible_methods)
-
-        raise Util.CertoraUserInputError(f"Method {method_input} was not found")
-
     @staticmethod
     def get_fresh_backupdir(backupdir: Path) -> Path:
         """
@@ -2595,34 +2520,6 @@ class CertoraBuildGenerator:
             sdc_pre_finders = self.collect_for_file(build_arg_contract_file, i, compiler_lang, Path(os.getcwd()),
                                                     path_for_compiler_collector_file, original_sdc=None)
 
-            if context.method and (build_arg_contract_file in context.verified_contract_files):
-                # we check the --method flag's argument on compile time only for those modes
-                # notice: when the backend will support multiple contracts to be verified/asserted,
-                # we will have to be more careful here, since we assume there is only one contract
-                # which is verified/asserted. For now, only the CLI support such multiple contracts.
-                if context.verify:
-                    verified_contract_name = context.verify.split(":")[0]
-                elif context.assert_contracts:
-                    verified_contract_name = context.assert_contracts[0]
-                else:
-                    verified_contract_name = None
-
-                if verified_contract_name:
-                    sdc_with_verified_contract_name = next(
-                        curr_sdc for index, curr_sdc in enumerate(sdc_pre_finders) if
-                        curr_sdc.primary_contract == verified_contract_name)
-                    errs = []
-                    for method in context.method:
-                        try:
-                            self.__verify_method(method, sdc_with_verified_contract_name)
-                        except Util.CertoraUserInputError as e:
-                            errs.append(e)
-                    if len(errs) > 0:
-                        raise Util.CertoraUserInputError(
-                            "Some methods as specified via the `method` flag could not be found!"
-                            f"{Util.NEW_LINE}{Util.NEW_LINE.join(str(e) for e in errs)}"
-                        )
-
             # Build sources tree
             build_logger.debug("Building source tree")
             sources_from_pre_finder_SDCs = set()
@@ -2932,8 +2829,13 @@ class CertoraBuildGenerator:
         new_file = self.to_autofinder_file(build_arg_contract_file)
         self.context.file_to_contract[new_file] = self.context.file_to_contract[
             build_arg_contract_file]
-        if self.context.solc_map and build_arg_contract_file in self.context.solc_map:
-            self.context.solc_map[new_file] = self.context.solc_map[build_arg_contract_file]
+
+        # add generated file to map attributes
+        for map_attr in Attrs.get_attribute_class().all_map_attrs():
+            map_attr_value = getattr(self.context, map_attr)
+            if map_attr_value and build_arg_contract_file in map_attr_value:
+                map_attr_value[new_file] = map_attr_value[build_arg_contract_file]
+
         autofinder_remappings[new_file] = build_arg_contract_file
         # TODO: I think this file name gets passed on to kotlin?? Not sure if it'll ever want to open the
         #       file, or if it'll only get the .certora_config one??

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/certoraBuildCacheManager.py

@@ -1,3 +1,18 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import json
 import logging
 import shutil
@@ -7,9 +22,9 @@ from typing import Set, Optional
 
 from Crypto.Hash import keccak
 
-from EVMVerifier.certoraContext import collect_args_build_cache_affecting, get_attr_value, \
+from CertoraProver.certoraContext import collect_args_build_cache_affecting, get_attr_value, \
     collect_args_build_cache_disabling, get_client_version
-from EVMVerifier.certoraContextClass import CertoraContext
+from CertoraProver.certoraContextClass import CertoraContext
 from Shared import certoraUtils as Util
 from Shared.certoraUtils import safe_create_dir
 

{certora_cli-7.22.3/certora_cli/EVMVerifier → certora-cli-7.25.3/certora_cli/CertoraProver}/certoraBuildDataClasses.py

@@ -1,14 +1,29 @@
+#     The Certora Prover
+#     Copyright (C) 2025  Certora Ltd.
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3 of the License.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import logging
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, Any, List, Set, Optional, BinaryIO
 
-from EVMVerifier import certoraType as CT
-from EVMVerifier.Compiler.CompilerCollector import CompilerCollector
-from EVMVerifier.Compiler.CompilerCollectorSol import CompilerLangSol
-from EVMVerifier.Compiler.CompilerCollectorVy import CompilerLangVy
-from EVMVerifier.certoraCompilerParameters import CompilerParameters
-from EVMVerifier.certoraContractFuncs import Func, InternalFunc, SourceBytes
+from CertoraProver import certoraType as CT
+from CertoraProver.Compiler.CompilerCollector import CompilerCollector
+from CertoraProver.Compiler.CompilerCollectorSol import CompilerLangSol
+from CertoraProver.Compiler.CompilerCollectorVy import CompilerLangVy
+from CertoraProver.certoraCompilerParameters import CompilerParameters
+from CertoraProver.certoraContractFuncs import Func, InternalFunc, SourceBytes
 from Shared import certoraUtils as Util