certora-cli-alpha-master 20250109.12.56.561847__py3-none-macosx_10_9_universal2.whl → 20250109.13.37.711480__py3-none-macosx_10_9_universal2.whl

certora_cli/EVMVerifier/certoraBuild.py

@@ -2458,112 +2458,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 +2489,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()

certora_cli/EVMVerifier/certoraContextAttributes.py

@@ -964,6 +964,7 @@ class BackendAttributes(AttrUtil.Attributes):
     )
 
     METHOD = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_method_flag,
         jar_flag='-method',
         arg_type=AttrUtil.AttrArgType.LIST,
         help_msg="Filter methods to be verified by their signature",

certora_cli/Shared/certoraValidateFuncs.py

@@ -707,6 +707,43 @@ def validate_git_hash(git_hash: str) -> str:
     return git_hash
 
 
+def validate_method_flag(method: str) -> str:
+    contract_and_method = method.split('.')
+    if len(contract_and_method) > 2:
+        raise Util.CertoraUserInputError(f"Malformed method '{method}' in `--method` list: a method should be of the form `[ContractName.]functionABISignature(...)`")
+    elif (len(contract_and_method) == 2):
+        contract = contract_and_method[0]
+        validate_contract_name(contract)
+        m = contract_and_method[1]
+    else:
+        m = contract_and_method[0]
+
+    if ' ' in method:
+        raise Util.CertoraUserInputError(f"Malformed method '{method}' in `--method` list: remove all whitespace")
+
+    if not __validate_matching_parens(m):
+        raise Util.CertoraUserInputError(f"Malformed method '{method}' in `--method` list: unmatched parenthesis")
+
+    return method
+
+
+def __validate_matching_parens(s: str) -> bool:
+    stack = []
+    matching_pairs = {")": "(", "]": "["}
+
+    for char in s:
+        if char in "([":  # Opening parenthesis
+            stack.append(char)
+        elif char in ")]":  # Closing parenthesis
+            if not stack:  # Nothing to match with
+                return False
+            top = stack.pop()
+            if matching_pairs[char] != top:
+                return False
+
+    return not stack  # Stack should be empty if all matched
+
+
 def __validate_solidity_id(string: str, object: str) -> str:
     """
     validates that string is a valid Solidity ID i.e. starts with  aletter,  a dollar sign or an underscore followed by

{certora_cli_alpha_master-20250109.12.56.561847.dist-info → certora_cli_alpha_master-20250109.13.37.711480.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20250109.12.56.561847
+Version: 20250109.13.37.711480
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -24,4 +24,4 @@ Requires-Dist: tomli
 Requires-Dist: universalmutator
 Requires-Dist: jinja2
 
-Commit a913487.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit f4edc82.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20250109.12.56.561847.dist-info → certora_cli_alpha_master-20250109.13.37.711480.dist-info}/RECORD

@@ -9,7 +9,7 @@ certora_cli/certoraSolanaProver.py,sha256=LEfKpfef0l91mqIQxSzCXtzE8oxZQek-ILcI02
 certora_cli/certoraSorobanProver.py,sha256=L7mwsHZUxdZMW20_HfPgJeDHZAwIO2Bm2oHl_Nnn1xs,563
 certora_cli/rustMutator.py,sha256=8FMLCFYfHK5A9YvHL-OEEWVxt55RVzBHLl3rP_F90Q8,13854
 certora_cli/EVMVerifier/__init__.py,sha256=AJxj90KAGh1JqAsxKqDBTL2rFbqgtkhDfW_XmxSHft0,159
-certora_cli/EVMVerifier/certoraBuild.py,sha256=SNpafLfTRInMrns6OuI9WUrJXP7Yt4Fv53pUnpI_j60,203520
+certora_cli/EVMVerifier/certoraBuild.py,sha256=GLo5piIDyojpNMu41cBwY5jRbrlsYf6WZ1IG2GKcf8w,196161
 certora_cli/EVMVerifier/certoraBuildCacheManager.py,sha256=ZSVCsdTkFFtawuNJ8VK3wJOb01Uyu5e8viPQ8wTziSQ,12563
 certora_cli/EVMVerifier/certoraBuildDataClasses.py,sha256=4IhvOA_fg-ij5RM9RRlvDDoS7imfp4Zru-AgHhxcHc0,13314
 certora_cli/EVMVerifier/certoraBuildRust.py,sha256=SzQyaY4X1z6bg9pyFrxNJmyiLi4yCbV-13hnJ69iuf4,3353
@@ -18,7 +18,7 @@ certora_cli/EVMVerifier/certoraCollectRunMetadata.py,sha256=selEf-p7UW8_70-AbPfa
 certora_cli/EVMVerifier/certoraCompilerParameters.py,sha256=PDKW3K_lNeRNPHisW0e5hYtfu6unDRjJUop-yItGHO0,762
 certora_cli/EVMVerifier/certoraConfigIO.py,sha256=zlXcSAXPXQEhCdOqbogNLgIRSURFQgArYjFKd3VMkfg,4693
 certora_cli/EVMVerifier/certoraContext.py,sha256=52YMEYYm67F_AsDZoIFjgcR34gQQDTnlmhiH9VrLCYE,21649
-certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=isgfD4OnD6XkaM-WKHrTUuQDK-W6r4TiltF6O6TsJOU,57019
+certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=c-1geSWJNdzRH2Vmlz2RHle-u5Sz1QuC24o6VComqcI,57073
 certora_cli/EVMVerifier/certoraContextClass.py,sha256=qdHYmrzI4zeQaAaMnonw4C-h1PFrPEhI84trrgvxFj0,210
 certora_cli/EVMVerifier/certoraContextValidator.py,sha256=8zbhc8J6-5ODEEzlJFBiyK4yse4mat1YMGbB1bGPIBM,37569
 certora_cli/EVMVerifier/certoraContractFuncs.py,sha256=W3lAvKotGKK7ZGJLg4yYh0FzTwwSQJbZMpizyGaYXZo,6229
@@ -56,13 +56,13 @@ certora_cli/Shared/__init__.py,sha256=QGoFb_Uu87tWp4E4L6C_VtzdG-sfNrzdNtRK79h5_L
 certora_cli/Shared/certoraAttrUtil.py,sha256=hUi1ye5kIAHGZqCR1YbXayn5-ToZi3WAa4MwkI_jdzc,6761
 certora_cli/Shared/certoraLogging.py,sha256=5Lx-XWKl7GnwnWi7KlwTLIfsEvUvCTZ8KeyfNyi_6RU,13323
 certora_cli/Shared/certoraUtils.py,sha256=WmVX8Hz5wMZ7WI2JhYavAilH1kO3fwKLUBsf4hQ4b-o,53676
-certora_cli/Shared/certoraValidateFuncs.py,sha256=qbN2h6MApnLucKvzfJ_dnBa135lLLTGE9Q7MlCBP3Fc,37204
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=_I2AXzayZ7YZL1xjC62HfTCkPfnacNL5wMguqIGbM-s,170
-certora_jars/Typechecker.jar,sha256=xP39zf0ylzcWVUhcYw5E-bjN-DPABLis307nYvplofU,16823807
+certora_cli/Shared/certoraValidateFuncs.py,sha256=7Z3w9EjTbhNmlQIPjtlhNaC6JZ36R1H0Xv-pvO2NpMI,38521
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=MyjUSJoML8cS_16kLuHgqyFU4skTmdpJ7gKEx7bzalQ,170
+certora_jars/Typechecker.jar,sha256=xGFuwFDDVwq0TG3sEZpn-v2QdUkWsoWsLhDA9r5HZDo,16833613
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/METADATA,sha256=3YWfS54YSMvfK96vFh8zqryZucuAu27rZazt4BLEz_o,860
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20250109.12.56.561847.dist-info/RECORD,,
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/METADATA,sha256=QMxWfAqbb0x0_OJMLOvvQyXZBdzynOTJLGP1aSN4lT8,860
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20250109.13.37.711480.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "a913487", "timestamp": "20250109.12.56.561847", "version": "20250109.12.56.561847+a913487"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "f4edc82", "timestamp": "20250109.13.37.711480", "version": "20250109.13.37.711480+f4edc82"}