certora-cli-beta-mirror 7.30.1__py3-none-any.whl → 8.0.0__py3-none-any.whl

certora_cli/CertoraProver/certoraContext.py

@@ -20,6 +20,8 @@ import os
 import re
 import sys
 import logging
+import fnmatch
+from wcmatch import glob
 
 
 from pathlib import Path
@@ -120,7 +122,11 @@ def get_local_run_cmd(context: CertoraContext) -> List[str]:
     """
     run_args = []
 
-    if Attrs.is_rust_app():
+    if Attrs.is_sui_app():
+        # For local runs, we want path to be relative to cwd instead of zip root.
+        move_rel_path = os.path.relpath(Path(context.move_path), os.getcwd())
+        run_args.extend(['-movePath', move_rel_path])
+    elif Attrs.is_rust_app():
         # For local runs, we want path to be relative to cwd instead of zip root.
         rust_rel_path = os.path.relpath(Path(context.files[0]), os.getcwd())
         run_args.append(rust_rel_path)
@@ -133,7 +139,8 @@ def get_local_run_cmd(context: CertoraContext) -> List[str]:
 
     if Attrs.is_evm_app() and context.cache is not None:
         run_args.extend(['-cache', context.cache])
-
+    if Attrs.is_concord_app():
+        run_args.extend(['-equivalenceCheck', 'true'])
     jar_args = collect_jar_args(context)
     run_args.extend(jar_args)
 
@@ -150,8 +157,6 @@ def get_local_run_cmd(context: CertoraContext) -> List[str]:
         java_cmd.extend(context.java_args.strip().split(' '))
 
     cmd = java_cmd + ["-jar", jar_path] + run_args
-    if context.test == str(Util.TestValue.LOCAL_JAR):
-        raise Util.TestResultsReady(' '.join(cmd))
     return cmd
 
 
@@ -161,12 +166,17 @@ class ProverParser(AttrUtil.ContextAttributeParser):
 
     def format_help(self) -> str:
         console = Console()
-        if Attrs.is_ranger_app():
+        if Attrs.is_concord_app():
+            console.print("\n\nConcord - Certora’s equivalence checker for smart contracts")
+        elif Attrs.is_ranger_app():
             console.print("\n\nRanger - Certora’s bounded model checker for smart contracts")
         else:
             console.print("\n\nThe Certora Prover - A formal verification tool for smart contracts")
         # Using sys.stdout.write() as print() would color some of the strings here
         sys.stdout.write(f"\n\nUsage: {sys.argv[0]} <Files> <Flags>\n\n")
+        if Attrs.is_concord_app():
+            sys.stdout.write("Concord supports only Solidity (.sol/.yul) and configuration (.conf) files.\n"
+                             "Rust and Vyper contracts are not currently supported.\n\n")
         if Attrs.is_ranger_app():
             sys.stdout.write("Ranger supports only Solidity (.sol) and configuration (.conf) files.\n"
                              "Rust and Vyper contracts are not currently supported.\n\n")
@@ -210,6 +220,16 @@ def __get_argparser() -> argparse.ArgumentParser:
     return parser
 
 
+def set_apps_members(context: CertoraContext) -> None:
+    # in many cases accessing context is simpler than accessing Attrs
+    context.is_solana_app = Attrs.is_solana_app()
+    context.is_soroban_app = Attrs.is_soroban_app()
+    context.is_rust_app = Attrs.is_rust_app()
+    context.is_evm_app = Attrs.is_evm_app()
+    context.is_ranger_app = Attrs.is_ranger_app()
+    context.is_concord_app = Attrs.is_concord_app()
+
+
 def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
     """
     Compiles an argparse.Namespace from the given list of command line arguments.
@@ -244,6 +264,7 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
     args = parser.parse_args(args_list)
     context = CertoraContext(**vars(args))
     context.args_list = args_list
+    set_apps_members(context)
 
     __remove_parsing_whitespace(args_list)
     format_input(context)
@@ -251,7 +272,7 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
 
     if context.is_conf:
         read_from_conf_file(context)
-
+    context.process = None
     context.local = Util.is_local(context)
     context.is_tac = context.files and context.files[0].endswith('.tac')
     context.is_vyper = context.files and context.files[0].endswith('.vy')
@@ -260,8 +281,7 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
         Cv.check_mode_of_operation(context)  # Here boolean run characteristics are set
 
     validator = Cv.CertoraContextValidator(context)
-    if Attrs.is_evm_app():
-        validator.handle_ranger_attrs()
+
     validator.validate()
     if Attrs.is_evm_app() or Attrs.is_rust_app():
         current_build_directory = Util.get_build_dir()
@@ -278,6 +298,8 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
     if Attrs.is_evm_app():
         validator.check_args_post_argparse()
         setup_cache(context)  # Here context.cache, context.user_defined_cache are set
+        validator.handle_ranger_attrs()
+        validator.handle_concord_attrs()
     if Attrs.is_rust_app():
         validator.check_rust_args_post_argparse()
 
@@ -285,6 +307,7 @@ def get_args(args_list: Optional[List[str]] = None) -> CertoraContext:
     # Setup defaults (defaults are not recorded in conf file)
     context.expected_file = context.expected_file or "expected.json"
     context.run_source = context.run_source or Vf.RunSources.COMMAND.name.upper()
+    context.java_version = Util.get_java_version()
 
     context_logger.debug("parsed args successfully.")
     context_logger.debug(f"args= {context}")
@@ -403,7 +426,7 @@ def setup_cache(context: CertoraContext) -> None:
     # we have a user defined cache key if the user provided a cache key
     context.user_defined_cache = context.cache is not None
     if not context.disable_auto_cache_key_gen and not os.environ.get("CERTORA_DISABLE_AUTO_CACHE") is not None:
-        if context.is_verify or context.is_assert or context.is_conf:
+        if context.is_verify or context.is_conf:
             # in local mode we don't want to create a cache key if not such is given
             if (context.cache is None) and (not context.local):
                 optimistic_loop = context.optimistic_loop
@@ -524,6 +547,8 @@ def run_typechecker(typechecker_name: str, with_typechecking: bool, args: List[s
     if with_typechecking:
         cmd_str_list.append('-typeCheck')
 
+    context_logger.debug(f"typechecking cmd: {' '.join(cmd_str_list)}")
+
     exit_code = Util.run_jar_cmd(cmd_str_list, False,
                                  custom_error_message="Failed to run Certora Prover locally. Please check the errors "
                                                       "below for problems in the specifications (.spec files) or the "
@@ -547,7 +572,7 @@ def run_local_spec_check(with_typechecking: bool, context: CertoraContext) -> No
     if context.disable_local_typechecking or Util.is_ci_or_git_action():
         return
     args = collect_jar_args(context)
-    if Util.is_java_installed():
+    if Util.is_java_installed(context.java_version):
         run_typechecker("Typechecker.jar", with_typechecking, args)
     else:
         raise Util.CertoraUserInputError("Cannot run local checks because of missing a suitable java installation. "
@@ -615,3 +640,30 @@ def attrs_to_relative(context: CertoraContext) -> None:
     packages_to_relative()
     prover_resource_file_to_relative()
     verify_to_relative()
+
+def get_map_attribute_value(context: CertoraContext, path: Path, attr_name: str) -> Optional[Union[str, bool]]:
+
+    value = getattr(context, attr_name, None)
+    if value:
+        return value
+
+    map_value = getattr(context, f"{attr_name}_map", None)
+    if not map_value:
+        return None  # No map value defined
+    for key, entry_value in map_value.items():
+        # Split key to handle contract:field syntax
+        key_parts = key.split(':')
+        pattern = key_parts[0]
+
+        if Path(pattern).suffix == "":  # This is a contract pattern
+            # Find contracts that match the pattern
+            for contract_name, contract_file_path in context.contract_to_file.items():
+                if fnmatch.fnmatch(contract_name, pattern):
+                    # Check if this contract's file matches our target path
+                    if Path(contract_file_path) == path:
+                        return entry_value
+        else:  # This is a file pattern
+            # Match the file pattern against the path
+            if glob.globmatch(str(path), pattern, flags=glob.GLOBSTAR):
+                return entry_value
+    return None  # No match

certora_cli/CertoraProver/certoraContextAttributes.py

@@ -15,7 +15,6 @@
 
 import logging
 
-import json5
 import sys
 from pathlib import Path
 from typing import Type, List, Optional
@@ -30,6 +29,8 @@ from CertoraProver.certoraCollectConfigurationLayout import AttributeJobConfigDa
 
 attributes_logger = logging.getLogger("attributes")
 
+FORBIDDEN_PROVER_ARGS = ['-solanaInlining', '-solanaSummaries']
+
 
 def validate_prover_args(value: str) -> str:
 
@@ -50,6 +51,11 @@ def validate_prover_args(value: str) -> str:
                 if not attr.temporary_jar_invocation_allowed:
                     raise Util.CertoraUserInputError(
                         f"Use CLI flag '{flag_name}' instead of 'prover_attrs' with {string} as value")
+
+    for string in strings:
+        if string in FORBIDDEN_PROVER_ARGS:
+            raise Util.CertoraUserInputError(
+                f"Use a Prover option instead of 'prover_attrs' with {string} as value")
     return value
 
 
@@ -156,7 +162,9 @@ class CommonAttributes(AttrUtil.Attributes):
             'action': AttrUtil.NotAllowed
         },
         affects_build_cache_key=False,
-        disables_build_cache=False
+        disables_build_cache=False,
+        # Avoiding presentation of this attribute in Config Tab
+        config_data=None
     )
 
     RUN_SOURCE = AttrUtil.AttributeDefinition(
@@ -208,87 +216,58 @@ class CommonAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-
-class DeprecatedAttributes(AttrUtil.Attributes):
-    AUTO_NONDET_DIFFICULT_INTERNAL_FUNCS = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`auto_nondet_difficult_internal_funcs` is deprecated, use `nondet_difficult_funcs` instead",
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-    AUTO_NONDET_MINIMAL_DIFFICULTY = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_non_negative_integer,
-        deprecation_msg="`auto_nondet_minimal_difficulty` is deprecated, use `nondet_minimal_difficulty` instead",
+    URL_VISIBILITY = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_url_visibility,
+        help_msg="Sets the visibility of the generated report link",
+        default_desc="Generate a Private report link",
         argparse_args={
-            'action': AttrUtil.UniqueStore
+            'nargs': AttrUtil.SINGLE_OR_NONE_OCCURRENCES,
+            'action': AttrUtil.UniqueStore,
+            'default': None,  # 'default': when --url_visibility was not used
+            # when --url_visibility was used without an argument its probably because the link should be public
+            'const': str(Vf.UrlVisibilityOptions.PUBLIC)
         },
         affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-    CONTRACT_COMPILER_SKIP_SEVERE_WARNING_AS_ERROR = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`contract_compiler_skip_severe_warning_as_error` is deprecated. "
-                        "Use `ignore_solidity_warnings` instead",
-        affects_build_cache_key=True,
         disables_build_cache=False,
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        }
+        # Avoiding presentation of this attribute in Config Tab
+        config_data=None
     )
 
-    SEND_ONLY = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="'send_only' is deprecated and is now the default. In CI, use 'wait_for_results none' instead",
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
 
-    USE_MEMORY_SAFE_AUTOFINDERS = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`use_memory_safe_autofinders` is deprecated and is turned on by default. To disable it"
-                        " use `no_memory_safe_autofinders`",
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=True,
-        disables_build_cache=False
-    )
-
-    DISABLE_FINDER_FRIENDLY_OPTIMIZER = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`disable_finder_friendly_optimizer` is deprecated, use `strict_solc_optimizer` instead",
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=True,
-        disables_build_cache=False
-    )
+class DeprecatedAttributes(AttrUtil.Attributes):
+    pass
 
-    DO_NOT_USE_MEMORY_SAFE_AUTOFINDERS = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`do_not_use_memory_safe_autofinders` is deprecated, use `no_memory_safe_autofinders` instead",
+    PROCESS = AttrUtil.AttributeDefinition(
         argparse_args={
-            'action': AttrUtil.STORE_TRUE
+            'action': AttrUtil.UniqueStore,
         },
-        affects_build_cache_key=True,
+        deprecation_msg="`process` is deprecated and will be removed in a future release.",
+        affects_build_cache_key=False,
         disables_build_cache=False
     )
 
-    FINDER_FRIENDLY_OPTIMIZER = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        deprecation_msg="`finder_friendly_optimizer` is deprecated and is turned on by default. To disable it"
-                        " use `strict_solc_optimizer`",
+    SOLC_MAP = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_compiler_map,
+        arg_type=AttrUtil.AttrArgType.MAP,
+        deprecation_msg="`solc_map` is deprecated, use `compiler_map` instead",
+        help_msg='Map contracts to the appropriate Solidity compiler in case not all contract files are compiled '
+                 'with the same Solidity compiler version. \n\nCLI Example: '
+                 '\n  --solc_map A=solc8.11,B=solc8.9,C=solc7.5\n\nJSON Example: '
+                 '\n  "solc_map: {"'
+                 '\n    "A": "solc8.11",'
+                 '\n    "B": "solc8.9",'
+                 '\n    "C": "solc7.5"'
+                 '\n  }',
+        default_desc="Uses the same Solidity compiler version for all contracts",
         argparse_args={
-            'action': AttrUtil.STORE_TRUE
+            'action': AttrUtil.UniqueStore,
+            'type': lambda value: Vf.parse_ordered_dict('solc_map', value)
         },
         affects_build_cache_key=True,
-        disables_build_cache=False
+        disables_build_cache=False,
+        config_data=AttributeJobConfigData(
+            main_section=MainSection.SOLIDITY_COMPILER
+        )
     )
 
 
@@ -340,7 +319,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="do not set via_ir during compilation unless solc_via_ir is set",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_via_ir_map', value, bool)
+            'type': lambda value: Vf.parse_ordered_dict('solc_via_ir_map', value, bool)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -382,30 +361,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Uses the same Solidity EVM version for all contracts",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_evm_version_map', value)
-        },
-        affects_build_cache_key=True,
-        disables_build_cache=False,
-        config_data=AttributeJobConfigData(
-            main_section=MainSection.SOLIDITY_COMPILER
-        )
-    )
-
-    SOLC_MAP = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_compiler_map,
-        arg_type=AttrUtil.AttrArgType.MAP,
-        help_msg='Map contracts to the appropriate Solidity compiler in case not all contract files are compiled '
-                 'with the same Solidity compiler version. \n\nCLI Example: '
-                 '\n  --solc_map A=solc8.11,B=solc8.9,C=solc7.5\n\nJSON Example: '
-                 '\n  "solc_map: {"'
-                 '\n    "A": "solc8.11",'
-                 '\n    "B": "solc8.9",'
-                 '\n    "C": "solc7.5"'
-                 '\n  }',
-        default_desc="Uses the same Solidity compiler version for all contracts",
-        argparse_args={
-            'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('solc_evm_version_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -428,7 +384,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Uses the same compiler version for all contracts",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('compiler_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('compiler_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -481,7 +437,7 @@ class EvmAttributes(AttrUtil.Attributes):
         default_desc="Compiles all contracts with the same optimization settings",
         argparse_args={
             'action': AttrUtil.UniqueStore,
-            'type': lambda value: Vf.parse_dict('solc_optimize_map', value)
+            'type': lambda value: Vf.parse_ordered_dict('solc_optimize_map', value)
         },
         affects_build_cache_key=True,
         disables_build_cache=False,
@@ -582,6 +538,16 @@ class EvmAttributes(AttrUtil.Attributes):
         affects_build_cache_key=True,
         disables_build_cache=True
     )
+
+    YUL_OPTIMIZER_STEPS = AttrUtil.AttributeDefinition(
+        # overrides the hardcoded yul optimizer steps, set in certoraBuild.py
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False
+    )
+
     CACHE = AttrUtil.AttributeDefinition(
         argparse_args={
             'action': AttrUtil.UniqueStore
@@ -740,8 +706,7 @@ class EvmAttributes(AttrUtil.Attributes):
             'action': AttrUtil.UniqueStore
         },
         affects_build_cache_key=False,
-        disables_build_cache=False,
-        config_data=None
+        disables_build_cache=False
     )
 
     BUILD_CACHE = AttrUtil.AttributeDefinition(
@@ -813,17 +778,6 @@ class EvmAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-    ASSERT_CONTRACTS = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_assert_contracts,
-        arg_type=AttrUtil.AttrArgType.LIST,
-        argparse_args={
-            'nargs': AttrUtil.ONE_OR_MORE_OCCURRENCES,
-            'action': AttrUtil.APPEND,
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-
     EQUIVALENCE_CONTRACTS = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_equivalence_contracts,
         arg_type=AttrUtil.AttrArgType.STRING,
@@ -1346,12 +1300,10 @@ class BackendAttributes(AttrUtil.Attributes):
         attr_validation_func=Vf.validate_sanity_value,
         help_msg="Select the type of sanity check that will be performed during execution",
         jar_flag='-ruleSanityChecks',
-        default_desc="No sanity checks",
+        default_desc="Basic sanity checks (Vacuity and trivial invariant check)",
         argparse_args={
-            'nargs': AttrUtil.SINGLE_OR_NONE_OCCURRENCES,
             'action': AttrUtil.UniqueStore,
             'default': None,  # 'default': when no --rule_sanity given
-            'const': Vf.RuleSanityValue.BASIC.name.lower()  # 'default': when empty --rule_sanity is given
         },
         affects_build_cache_key=False,
         disables_build_cache=False
@@ -1463,17 +1415,6 @@ class BackendAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-    PROCESS = AttrUtil.AttributeDefinition(
-        argparse_args={
-            'action': AttrUtil.UniqueStore,
-            'default': 'emv'
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False,
-        # Avoiding presentation of this attribute in Config Tab
-        config_data=None
-    )
-
     PROVER_ARGS = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.LIST,
         attr_validation_func=validate_prover_args,
@@ -1652,16 +1593,6 @@ class BackendAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
-    ALLOW_SOLIDITY_CALLS_IN_QUANTIFIERS = AttrUtil.AttributeDefinition(
-        arg_type=AttrUtil.AttrArgType.BOOLEAN,
-        jar_flag='-allowSolidityQuantifierCalls',
-        argparse_args={
-            'action': AttrUtil.STORE_TRUE
-        },
-        affects_build_cache_key=False,
-        disables_build_cache=False
-    )
-
 
 class RustAttributes(AttrUtil.Attributes):
 
@@ -1697,10 +1628,11 @@ class RustAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
+
 class EvmProverAttributes(CommonAttributes, DeprecatedAttributes, EvmAttributes, InternalUseAttributes,
                           BackendAttributes):
     FILES = AttrUtil.AttributeDefinition(
-        attr_validation_func=Vf.validate_input_file,
+        attr_validation_func=Vf.validate_evm_input_file,
         arg_type=AttrUtil.AttrArgType.LIST,
         help_msg="Solidity or Vyper contract files for analysis or a conf file",
         default_desc="",
@@ -1715,22 +1647,46 @@ class EvmProverAttributes(CommonAttributes, DeprecatedAttributes, EvmAttributes,
     )
 
 
+class ConcordAttributes(EvmProverAttributes):
+    CHECK_METHOD = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_check_method_flag,
+        help_msg="the method to be checked by Concord equivalent checker",
+        default_desc="Mandatory for Concord",
+        jar_flag='-method',
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
+    @classmethod
+    def unsupported_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
+        return [cls.VERIFY, cls.MSG, cls.PROTOCOL_NAME, cls.PROTOCOL_AUTHOR, cls.RULE, cls.EXCLUDE_RULE,
+                cls.SPLIT_RULES, cls.EXCLUDE_METHOD, cls.PARAMETRIC_CONTRACTS, cls.COVERAGE_INFO, cls.FOUNDRY,
+                cls.INDEPENDENT_SATISFY, cls.MULTI_ASSERT_CHECK, cls.MULTI_EXAMPLE, cls.PROJECT_SANITY,
+                cls.RULE_SANITY, cls.ADDRESS, cls.CONTRACT_EXTENSIONS, cls.CONTRACT_RECURSION_LIMIT, cls.LINK,
+                cls.OPTIMISTIC_CONTRACT_RECURSION, cls.STRUCT_LINK, cls.DYNAMIC_BOUND, cls.DYNAMIC_DISPATCH,
+                cls.PROTOTYPE, cls.METHOD]
+
+
 class RangerAttributes(EvmProverAttributes):
     @classmethod
-    def ranger_unsupported_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
+    def unsupported_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
         return [cls.PROJECT_SANITY, cls.RULE_SANITY, cls.COVERAGE_INFO, cls.FOUNDRY, cls.INDEPENDENT_SATISFY,
-                cls.MULTI_ASSERT_CHECK, cls.MULTI_EXAMPLE]
+                cls.MULTI_ASSERT_CHECK, cls.MULTI_EXAMPLE, cls.VYPER]
 
     @classmethod
-    def ranger_true_by_default_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
+    def true_by_default_attributes(cls) -> List[AttrUtil.AttributeDefinition]:
         return [cls.OPTIMISTIC_LOOP, cls.OPTIMISTIC_FALLBACK, cls.AUTO_DISPATCHER, cls.OPTIMISTIC_HASHING]
 
     @classmethod
     def hide_attributes(cls) -> List[str]:
         # do not show these attributes in the help message
-        combined_list = cls.ranger_unsupported_attributes() + cls.ranger_true_by_default_attributes()
+        combined_list = cls.unsupported_attributes() + cls.true_by_default_attributes()
         return [attr.name for attr in combined_list] + [cls.LOOP_ITER.name, cls.RANGER_FAILURE_LIMIT.name]
 
+
 class SorobanProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes, RustAttributes):
     FILES = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_soroban_extension,
@@ -1748,6 +1704,36 @@ class SorobanProverAttributes(CommonAttributes, InternalUseAttributes, BackendAt
     )
 
 
+class SuiProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes):
+    FILES = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_dir,
+        arg_type=AttrUtil.AttrArgType.LIST,
+        argparse_args={
+            'nargs': AttrUtil.MULTIPLE_OCCURRENCES
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False,
+        config_data=AttributeJobConfigData(
+            main_section=MainSection.NEW_SECTION
+        )
+    )
+
+    MOVE_PATH = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_dir,
+        arg_type=AttrUtil.AttrArgType.STRING,
+        help_msg="path to a directory which includes all binary .mv files for the Prover",
+        default_desc="",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=True,
+        disables_build_cache=False,
+        config_data=AttributeJobConfigData(
+            main_section=MainSection.NEW_SECTION
+        )
+    )
+
+
 class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAttributes, RustAttributes):
     FILES = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_solana_extension,
@@ -1806,70 +1792,6 @@ def set_attribute_class(cls: Type[AttrUtil.Attributes]) -> None:
     cls.set_attribute_list()
 
 
-def detect_application_class(args: List[str]) -> Type[AttrUtil.Attributes]:
-
-    attributes_logger.debug("calling detect_application_class")
-
-    def application_by_suffix(file: str) -> Type[AttrUtil.Attributes]:
-        if file.endswith(Util.EVM_EXTENSIONS):
-            return EvmProverAttributes
-        elif file.endswith(Util.SOROBAN_EXEC_EXTENSION):
-            return SorobanProverAttributes
-        elif file.endswith(Util.SOLANA_EXEC_EXTENSION):
-            return SolanaProverAttributes
-        elif file.endswith('.conf'):
-            raise Util.CertoraUserInputError(f"Cannot use conf files inside a conf file: {file}")
-        else:
-            raise Util.CertoraUserInputError(f"Unsupported file type: {file}")
-
-    cli_files = []
-    cli_conf_files = []
-    files = []
-    build_script = None
-    for arg in args:
-        if arg.startswith('-'):
-            break  # Stop processing when a flag is detected
-        cli_files.append(arg)
-        if arg.endswith('.conf'):
-            cli_conf_files.append(arg)
-
-    if len(cli_conf_files) == 1:
-        conf_file_path = Path(cli_conf_files[0])
-
-        with conf_file_path.open() as conf_file:
-            configuration = json5.load(conf_file, allow_duplicate_keys=False)
-            files = configuration.get('files', [])
-            build_script = configuration.get('build_script')
-
-    if build_script:
-        return SorobanProverAttributes
-
-    if len(cli_conf_files) == 0:
-        files = cli_files
-
-    if len(cli_conf_files) > 1:
-        raise Util.CertoraUserInputError(f"multiple conf files: {cli_conf_files})")
-
-    candidate = None
-
-    for file in files:
-        file = file.split(':')[0]  # remove contract part if exist
-        app = application_by_suffix(file)
-        if not candidate:
-            candidate = app
-        elif candidate == app:
-            continue
-        else:
-            raise Util.CertoraUserInputError(f"Illegal files combination: {files})")
-
-    if candidate:
-        attributes_logger.debug(f"detect_application_class returns {candidate}")
-        return candidate
-    else:
-        attributes_logger.debug(f"detect_application_class returns {EvmProverAttributes}")
-        return EvmProverAttributes
-
-
 def is_solana_app() -> bool:
     return get_attribute_class() == SolanaProverAttributes
 
@@ -1881,12 +1803,19 @@ def is_soroban_app() -> bool:
 def is_rust_app() -> bool:
     return is_soroban_app() or is_solana_app()
 
-# Ranger will also return true for this function
+
+# Ranger and Concord will also return true for this function
 def is_evm_app() -> bool:
     return issubclass(get_attribute_class(), EvmProverAttributes)
 
+
 def is_ranger_app() -> bool:
     return get_attribute_class() == RangerAttributes
 
-def is_sophy_app() -> bool:
-    return False  # wait for the tool to be added
+
+def is_concord_app() -> bool:
+    return get_attribute_class() == ConcordAttributes
+
+
+def is_sui_app() -> bool:
+    return get_attribute_class() == SuiProverAttributes