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

certora_cli/CertoraProver/certoraCloudIO.py

@@ -43,7 +43,6 @@ from tqdm import tqdm
 
 import logging
 
-
 cloud_logger = logging.getLogger("cloud")
 
 MAX_FILE_SIZE = 25 * 1024 * 1024
@@ -74,11 +73,12 @@ class EcoEnum(Util.NoValEnum):
     EVM = Util.auto()
     SOROBAN = Util.auto()
     SOLANA = Util.auto()
+    SUI = Util.auto()
 
 class ProductEnum(Util.NoValEnum):
     PROVER = Util.auto()
     RANGER = Util.auto()
-    SOPHY = Util.auto()
+    CONCORD = Util.auto()
 
 
 class TimeError(Exception):
@@ -587,7 +587,7 @@ class CloudVerification:
         """
 
         auth_data = {
-            "process": self.context.process, "runName": self.runName,
+            "runName": self.runName,
             "run_source": self.context.run_source,
             "group_id": self.context.group_id,
             "branch": self.context.prover_version if self.context.prover_version else '',
@@ -624,6 +624,13 @@ class CloudVerification:
                     rust_jar_settings.append(paths_in_source_dir(self.context.solana_inlining))
 
             auth_data["jarSettings"] = rust_jar_settings + jar_settings
+
+        elif Attrs.is_sui_app():
+            sui_jar_settings = ['-movePath', Path(self.context.move_path).name]
+            auth_data["jarSettings"] = sui_jar_settings + jar_settings
+
+        elif Attrs.is_concord_app():
+            auth_data["jarSettings"] = jar_settings + ["-equivalenceCheck", "true"]
         else:
             auth_data["jarSettings"] = jar_settings
 
@@ -645,13 +652,15 @@ class CloudVerification:
             auth_data["ecosystem"] = EcoEnum.SOLANA.name
         elif Attrs.is_soroban_app():
             auth_data["ecosystem"] = EcoEnum.SOROBAN.name
+        elif Attrs.is_sui_app():
+            auth_data["ecosystem"] = EcoEnum.SUI.name
         else:
             auth_data["ecosystem"] = EcoEnum.EVM.name
 
         if Attrs.is_ranger_app():
             auth_data["product"] = ProductEnum.RANGER.name
-        elif Attrs.is_sophy_app():
-            auth_data["product"] = ProductEnum.SOPHY.name
+        elif Attrs.is_concord_app():
+            auth_data["product"] = ProductEnum.CONCORD.name
         else:
             auth_data["product"] = ProductEnum.PROVER.name
 
@@ -686,12 +695,12 @@ class CloudVerification:
 
     def print_output_links(self) -> None:
         print(f"Manage your jobs at {self.get_domain()}")
-        print(f"Follow your job and see verification results at {self.reportUrl}", flush=True)
+        print(f"Follow your job and see verification results at {self.url_print_format()}", flush=True)
 
     def print_verification_summary(self) -> None:
         report_exists = self.check_file_exists(params={"filename": "index.html", "certoraKey": self.context.key})
         if report_exists:
-            print(f"Job is completed! View the results at {self.reportUrl}")
+            print(f"Job is completed! View the results at {self.url_print_format()}")
         print("Finished verification request", flush=True)
 
     def __send_verification_request(self, cl_args: str) -> bool:
@@ -760,42 +769,30 @@ class CloudVerification:
                           Util.get_configuration_layout_data_file(),
                           Util.get_build_dir() / Path(self.context.files[0]).name]
 
+            if Util.get_debug_log_file().exists():
+                files_list.append(Util.get_debug_log_file())
+
             if Util.get_certora_sources_dir().exists():
                 files_list.append(Util.get_certora_sources_dir())
 
             if hasattr(self.context, 'build_script') and self.context.build_script:
-                result = compress_files(self.logZipFilePath, Util.get_debug_log_file(),
-                                        short_output=Ctx.is_minimal_cli_output(self.context))
-
-                if not result:
-                    return False
-                files_list.append(self.logZipFilePath)
-
-                # Create a .RustExecution file to classify zipInput as a rust source code
-                rust_execution_file = Util.get_build_dir() / ".RustExecution"
-                rust_execution_file.touch(exist_ok=True)
-                files_list.append(rust_execution_file)
-
                 if attr_file := getattr(self.context, 'rust_logs_stdout', None):
                     files_list.append(Util.get_build_dir() / Path(attr_file).name)
                 if attr_file := getattr(self.context, 'rust_logs_stderr', None):
                     files_list.append(Util.get_build_dir() / Path(attr_file).name)
 
-                result = compress_files(self.ZipFilePath, *files_list,
-                                        short_output=Ctx.is_minimal_cli_output(self.context))
+            result = compress_files(self.ZipFilePath, *files_list,
+                                    short_output=Ctx.is_minimal_cli_output(self.context))
+        elif Attrs.is_sui_app():
+            files_list = [Util.get_certora_metadata_file(),
+                          Util.get_configuration_layout_data_file(),
+                          Util.get_build_dir() / Path(self.context.move_path).name]
 
-            elif Attrs.is_solana_app() or Attrs.is_soroban_app():
-                for file in self.context.files:
-                    files_list.append(Path(file))
+            if Util.get_certora_sources_dir().exists():
+                files_list.append(Util.get_certora_sources_dir())
 
-                result = compress_files(self.ZipFilePath, *files_list,
-                                        short_output=Ctx.is_minimal_cli_output(self.context))
-            else:
-                raise Util.CertoraUserInputError(
-                    'When running rust application, context should either have attribute "rust_executables" '
-                    'provided by build_script execution, '
-                    'or either is_solana_app(), is_soroban_app() should be set to True'
-                )
+            result = compress_files(self.ZipFilePath, *files_list,
+                                    short_output=Ctx.is_minimal_cli_output(self.context))
 
         else:
             # Zip the log file first separately and again with the rest of the files, so it will not be decompressed
@@ -873,7 +870,7 @@ class CloudVerification:
             self.runName, self.reportUrl, self.msg, self.get_domain(), str(self.userId), self.anonymousKey)
 
         # Generate a json file for the VS Code extension with the relevant url
-        self.vscode_extension_info_writer.add_field("verification_report_url", self.reportUrl)
+        self.vscode_extension_info_writer.add_field("verification_report_url", self.url_print_format())
         self.vscode_extension_info_writer.write_file()
 
         if not wait_for_results or wait_for_results == str(Vf.WaitForResultOptions.NONE):
@@ -953,6 +950,8 @@ class CloudVerification:
         for i in range(self.verification_request_retries):
             try:
                 response = requests.post(verify_url, json=auth_data, headers=headers, timeout=60)
+                cloud_logger.debug(f"\n\n=================\n\nresponse - Status Code: {response.status_code}\n\n"
+                                   f"Headers:\n {response.headers}\n\nText:\n {response.text}\n\n=================\n\n")
                 if response is None:
                     continue
                 status = response.status_code
@@ -1160,6 +1159,12 @@ class CloudVerification:
         Util.remove_file(self.ZipFilePath)
         Util.remove_file(self.logZipFilePath)
 
+    def url_print_format(self) -> str:
+        if self.reportUrl and self.context.url_visibility == str(Vf.UrlVisibilityOptions.PRIVATE):
+            return self.privatize_url()
+        else:
+            return self.reportUrl
+
     @lru_cache(maxsize=1, typed=False)
     def get_domain(self) -> str:
         """
@@ -1175,3 +1180,7 @@ class CloudVerification:
             domain = Util.SupportedServers.PRODUCTION.value
 
         return domain
+
+    @lru_cache(maxsize=1)
+    def privatize_url(self) -> str:
+        return self.reportUrl.split('?anonymousKey=')[0]

certora_cli/CertoraProver/certoraCollectConfigurationLayout.py

@@ -25,12 +25,13 @@ sys.path.insert(0, str(scripts_dir_path))
 import CertoraProver.certoraContextAttributes as Attrs
 from CertoraProver.certoraCollectRunMetadata import RunMetaData, MetadataEncoder
 import Shared.certoraUtils as Utils
+from typing import List
 
 
 class MainSection(Enum):
     GENERAL = "GENERAL"
+    OPTIONS = "OPTIONS"
     SOLIDITY_COMPILER = "SOLIDITY_COMPILER"
-    GIT = "GIT"
     NEW_SECTION = "NEW_SECTION"
 
 
@@ -47,13 +48,11 @@ class InnerContent:
     content: Any
     doc_link: str = ''
     tooltip: str = ''
-    unsound: str = 'false'
+    unsound: bool = False
 
     def __post_init__(self) -> None:
         if isinstance(self.content, bool):
             self.content = 'true' if self.content else 'false'
-        if isinstance(self.unsound, bool):
-            self.unsound = 'true' if self.unsound else 'false'
 
 
 @dataclasses.dataclass
@@ -65,6 +64,7 @@ class CardContent:
 
 DOC_LINK_PREFIX = 'https://docs.certora.com/en/latest/docs/'
 GIT_ATTRIBUTES = ['origin', 'revision', 'branch', 'dirty']
+ARG_LIST_ATTRIBUTES = ['prover_args', 'java_args']
 
 
 class AttributeJobConfigData:
@@ -73,13 +73,13 @@ class AttributeJobConfigData:
     This should be added to the AttributeDefinition and configured for every new attribute
     presented in the Rule report.
 
-    Note: Attributes which do not contain specific information will be assigned as a Flag in the General main section!
+    Note: Attributes that do not contain specific information will be presented in the OPTIONS main section!
 
     arguments:
     - main_section : MainSection -- the main section inside the config tab
-        default: MainSection.GENERAL
-    - subsection : str -- the subsection within the main_section (e.g Flags)
-        default: Flags
+        default: MainSection.OPTIONS
+    - subsection : str -- the subsection within the main_section
+        default: None - they will be presented inside the OPTIONS card
     - doc_link : Optional[str] -- a link to the Documentation page of this attribute (if exists)
         default: 'https://docs.certora.com/en/latest/docs/' + Solana/EVM path + #<attribute_name>
     - tooltip : Optional[str] -- a description of this attribute to present in the config tab
@@ -88,7 +88,7 @@ class AttributeJobConfigData:
         default: False
     """
 
-    def __init__(self, main_section: MainSection = MainSection.GENERAL, subsection: str = '',
+    def __init__(self, main_section: MainSection = MainSection.OPTIONS, subsection: str = '',
                  doc_link: Optional[str] = '', tooltip: Optional[str] = '', unsound: bool = False):
         self.main_section = main_section
         self.subsection = subsection
@@ -201,6 +201,40 @@ def create_or_get_card_content(output: list[CardContent], name: str) -> CardCont
     return main_section
 
 
+def split_and_sort_arg_list_value(args_list: List[str]) -> List[str]:
+    """
+    Splits a unified CLI argument list of strings into a sorted list of flag+value groups.
+    This is useful mainly for --prover_args and --java_args.
+
+    For example:
+    "-depth 15 -adaptiveSolverConfig false" → ["-adaptiveSolverConfig false", "-depth 15"]
+
+    Assumes each flag starts with '-' and its value follows immediately, if exists.
+    Lines are sorted alphabetically.
+    """
+    unified_args = ''.join(args_list)
+
+    if not unified_args.strip():
+        return []
+
+    lines: List[str] = []
+    tokens = unified_args.split()
+    curr_line = ""
+
+    for token in tokens:
+        if token.startswith('-'):
+            if curr_line:
+                lines.append(curr_line)
+            curr_line = token
+        else:
+            curr_line += f" {token}"
+
+    if curr_line:
+        lines.append(curr_line)
+
+    return sorted(lines)
+
+
 def create_inner_content(name: str, content_type: ContentType, value: Any, doc_link: str,
                          config_data: AttributeJobConfigData) -> InnerContent:
     return InnerContent(
@@ -209,7 +243,7 @@ def create_inner_content(name: str, content_type: ContentType, value: Any, doc_l
         content=value,
         doc_link=doc_link,
         tooltip=config_data.tooltip or '',
-        unsound='true' if config_data.unsound else 'false'
+        unsound=config_data.unsound
     )
 
 
@@ -260,35 +294,23 @@ def collect_attribute_configs(metadata: dict) -> list[CardContent]:
             )
             continue
 
-        # Find or create the subsection (if it exists)
+        # Find or create the subsection (if it doesn't exist)
         if isinstance(attr_value, list):
-            current_section: Any = main_section
             content_type = ContentType.SIMPLE
+            if attr_name in ARG_LIST_ATTRIBUTES:
+                attr_value = split_and_sort_arg_list_value(attr_value)
 
         elif isinstance(attr_value, dict):
-            current_section = main_section
             content_type = ContentType.COMPLEX
             attr_value = [
                 create_inner_content(key, ContentType.FLAG, value, doc_link, config_data)
                 for key, value in attr_value.items()
             ]
         else:
-            # this attribute is a value attribute without a subsection, it will be placed in flags.
-            subsection_key = config_data.subsection.lower() if config_data.subsection else 'flags'
-            current_section = next((section for section in main_section.content
-                                    if section.inner_title == subsection_key), None)
-            if current_section is None:
-                current_section = InnerContent(
-                    inner_title=subsection_key,
-                    content_type=ContentType.COMPLEX.value,
-                    content=[]
-                )
-                main_section.content.append(current_section)
-
             content_type = ContentType.FLAG
 
         # Update the current section with attribute details
-        current_section.content.append(
+        main_section.content.append(
             create_inner_content(attr_name, content_type, attr_value, doc_link, config_data)
         )
 
@@ -300,37 +322,23 @@ def collect_run_config_from_metadata(attributes_configs: list[CardContent], meta
     Adding CLI and Git configuration from metadata
     """
 
-    # Define a mapping of metadata attributes to their keys in general_section
-    metadata_mappings = {
-        'CLI Version': metadata.get('CLI_version'),
-        'Verify': metadata.get('conf', {}).get('verify'),
-    }
-
     general_section = create_or_get_card_content(attributes_configs, MainSection.GENERAL.value.lower())
 
-    # Add metadata attributes dynamically if they exist
-    for key, value in metadata_mappings.items():
-        if value:
-            general_section.content.append(InnerContent(
-                inner_title=key,
-                content_type=ContentType.FLAG.value,
-                content=value,
-            ))
+    if cli_version := metadata.get('CLI_version'):
+        general_section.content.append(InnerContent(
+            inner_title='CLI Version',
+            content_type=ContentType.FLAG.value,
+            content=cli_version,
+        ))
 
-    # Adding GIT configuration from metadata only if attributes are found
-    git_content = []
     for attr in GIT_ATTRIBUTES:
         if attr_value := metadata.get(attr):
-            git_content.append(InnerContent(
+            general_section.content.append(InnerContent(
                 inner_title=attr,
                 content_type=ContentType.FLAG.value,
                 content=attr_value,
             ))
 
-    if git_content:
-        git_section = create_or_get_card_content(attributes_configs, MainSection.GIT.value.lower())
-        git_section.content = git_content
-
     return attributes_configs
 
 
@@ -338,14 +346,17 @@ def sort_configuration_layout(data: list[CardContent]) -> list[CardContent]:
     """
     Sorts a configuration layout:
     - Top-level sorted by 'card_title'
-    - Nested content sorted by 'inner_title', with 'Verify' first
+    - Nested content sorted by 'inner_title', with 'verify' first
     """
     priority = {
-        "Verify": 0,
+        # Priorities for top-level cards
         "general": 0,
+        "files": 1,
+        "options": 2,
+        # Top level items inside their respective cards
+        "verify": 0,
         "solc": 0,
-        "CLI Version": 1,
-        "flags": 2
+        "CLI Version": 0
     }
 
     def inner_sort_key(item: Any) -> Any:

certora_cli/CertoraProver/certoraCollectRunMetadata.py

@@ -31,6 +31,7 @@ import CertoraProver.certoraContextAttributes as Attrs
 
 metadata_logger = logging.getLogger("metadata")
 
+
 def collect_args_with_jar_flags() -> List[str]:
     return_array = []
     for attr in Attrs.get_attribute_class().attribute_list():
@@ -70,10 +71,18 @@ class RunMetaData:
     dirty -- true iff the git repository has changes (git diff is not empty)
     main_spec -- the relative path to the main spec file that should be displayed by default at the web report
     conf_path -- the relative path form the cwd_relative to the configuration file
+    group_id -- optional identifier for grouping this run
+    java_version -- version of Java used during the run, if available
+    python_version -- version of Python running the process
+    certora_ci_client -- name of the CI client if available, derived from environment
+    timestamp -- UTC timestamp when the run metadata was generated
+    CLI_package_name -- name of the CLI package
+    CLI_version -- version of the CLI
+    jar_flag_info -- CLI attributes which are jarFlags
     """
     def __init__(self, raw_args: List[str], conf: Dict[str, Any], origin: str, revision: str,
                  branch: str, cwd_relative: Path, dirty: bool, main_spec: Optional[str],
-                 conf_path: Optional[Path], group_id: Optional[str]):
+                 conf_path: Optional[Path], group_id: Optional[str], java_version: str):
         self.raw_args = raw_args
         self.conf = conf
         self.origin = origin
@@ -85,6 +94,7 @@ class RunMetaData:
         self.conf_path = conf_path
         self.group_id = group_id
         self.python_version = ".".join(str(x) for x in sys.version_info[:3])
+        self.java_version = java_version
         self.certora_ci_client = Utils.get_certora_ci_name()
         self.timestamp = str(datetime.now(timezone.utc).timestamp())
         _, self.CLI_package_name, self.CLI_version = Utils.get_package_and_version()
@@ -105,6 +115,7 @@ class RunMetaData:
             f" conf_path: {self.conf_path}\n"
             f" group_id: {self.group_id}\n"
             f" python_version: {self.python_version}\n"
+            f" java_version: {self.java_version}\n"
             f" CertoraCI client: {self.certora_ci_client}\n"
             f" jar_flag_info: {self.jar_flag_info}\n"
         )
@@ -182,7 +193,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], context: CertoraContext)
                            dirty=True,
                            main_spec=None,
                            conf_path=None,
-                           group_id=None)
+                           group_id=None,
+                           java_version=context.java_version)
 
     # collect information about current git snapshot
     cwd_abs = wd.absolute()
@@ -210,7 +222,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], context: CertoraContext)
                            dirty=True,
                            main_spec=get_main_spec(context),
                            conf_path=conf_path,
-                           group_id=context.group_id)
+                           group_id=context.group_id,
+                           java_version=context.java_version)
 
     try:
         sha_out = subprocess.run(['git', 'rev-parse', 'HEAD'], cwd=wd,
@@ -245,7 +258,8 @@ def collect_run_metadata(wd: Path, raw_args: List[str], context: CertoraContext)
                            dirty=dirty,
                            main_spec=get_main_spec(context),
                            conf_path=conf_path,
-                           group_id=context.group_id)
+                           group_id=context.group_id,
+                           java_version=context.java_version)
 
         metadata_logger.debug(f' collected data:\n{str(data)}')
 
@@ -263,4 +277,5 @@ def collect_run_metadata(wd: Path, raw_args: List[str], context: CertoraContext)
                            dirty=True,
                            main_spec=get_main_spec(context),
                            conf_path=conf_path,
-                           group_id=context.group_id)
+                           group_id=context.group_id,
+                           java_version=context.java_version)

certora_cli/CertoraProver/certoraConfigIO.py

@@ -17,6 +17,7 @@ import json5
 import logging
 from pathlib import Path
 from typing import Dict, Any
+from collections import OrderedDict
 
 import CertoraProver.certoraContext as Ctx
 import CertoraProver.certoraContextAttributes as Attrs
@@ -75,11 +76,11 @@ def read_from_conf_file(context: CertoraContext) -> None:
 
     try:
         with conf_file_path.open() as conf_file:
-            context.conf_file_attr = json5.load(conf_file, allow_duplicate_keys=False)
+            context.conf_file_attr = json5.load(conf_file, allow_duplicate_keys=False, object_pairs_hook=OrderedDict)
             try:
                 check_conf_content(context)
             except Util.CertoraUserInputError as e:
-                raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}: {str(e)}", e) from None
+                raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}: {e}") from None
             context.conf_file = str(conf_file_path)
     except FileNotFoundError:
         raise Util.CertoraUserInputError(f"read_from_conf_file: {conf_file_path}: not found") from None
@@ -96,22 +97,24 @@ def handle_override_base_config(context: CertoraContext) -> None:
     """
 
     if context.override_base_config:
-        with Path(context.override_base_config).open() as conf_file:
-            try:
-                override_base_config_attrs = json5.load(conf_file, allow_duplicate_keys=False)
+        try:
+            with Path(context.override_base_config).open() as conf_file:
+                override_base_config_attrs = json5.load(conf_file, allow_duplicate_keys=False,
+                                                        object_pairs_hook=OrderedDict)
                 context.conf_file_attr = {**override_base_config_attrs, **context.conf_file_attr}
 
                 if 'override_base_config' in override_base_config_attrs:
                     raise Util.CertoraUserInputError("base config cannot include 'override_base_config'")
-            except Exception as e:
-                raise Util.CertoraUserInputError(f"Cannot load base config: {context.override_base_config}\n{e}")
-            for attr in override_base_config_attrs:
-                if hasattr(context, attr):
-                    value = getattr(context, attr, False)
-                    if not value:
-                        setattr(context, attr, override_base_config_attrs.get(attr))
-                else:
-                    raise Util.CertoraUserInputError(f"{attr} appears in the base conf file {context.override_base_config} but is not a known attribute.")
+        except Exception as e:
+            raise Util.CertoraUserInputError(f"Cannot load base config: {context.override_base_config}\n{e}")
+
+        for attr in override_base_config_attrs:
+            if hasattr(context, attr):
+                value = getattr(context, attr, False)
+                if not value:
+                    setattr(context, attr, override_base_config_attrs.get(attr))
+            else:
+                raise Util.CertoraUserInputError(f"{attr} appears in the base conf file {context.override_base_config} but is not a known attribute.")
 
 
 def check_conf_content(context: CertoraContext) -> None: