certora-cli-beta-mirror 8.6.0__tar.gz → 8.6.2__tar.gz

{certora_cli_beta_mirror-8.6.0/certora_cli_beta_mirror.egg-info → certora_cli_beta_mirror-8.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-beta-mirror
-Version: 8.6.0
+Version: 8.6.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-beta-mirror
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 92412cc.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 5e8518f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_beta_mirror-8.6.2/README.md

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

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/CertoraProver/certoraBuildDataClasses.py

@@ -171,7 +171,7 @@ class ContractInSDC:
         """
         return {
             "name": self.name,
-            "original_file": Util.find_filename_in(Util.get_certora_sources_dir(), self.original_file),
+            "original_file": Util.find_filename_in(Util.get_certora_sources_dir(), self.original_file) or self.original_file,
             "lang": self.lang,
             "file": self.report_source_file,
             "address": self.address,

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/CertoraProver/certoraCollectConfigurationLayout.py

@@ -64,7 +64,6 @@ 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:
@@ -297,7 +296,7 @@ def collect_attribute_configs(metadata: dict) -> list[CardContent]:
         # Find or create the subsection (if it doesn't exist)
         if isinstance(attr_value, list):
             content_type = ContentType.SIMPLE
-            if attr_name in ARG_LIST_ATTRIBUTES:
+            if attr_name in Attrs.ARG_FLAG_LIST_ATTRIBUTES:
                 attr_value = split_and_sort_arg_list_value(attr_value)
 
         elif isinstance(attr_value, dict):

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/CertoraProver/certoraContext.py

@@ -582,6 +582,12 @@ def run_local_spec_check(with_typechecking: bool, context: CertoraContext, extra
     """
 
     args = collect_jar_args(context)
+
+    # Add -printAst flag if dump_cvl_ast option is set
+    # We only want the elementary typecheck run to produce a file, not any of the auxiliary ones
+    if hasattr(context, 'dump_cvl_ast') and context.dump_cvl_ast and not extra_args and with_typechecking:
+        args.extend(['-printAst', context.dump_cvl_ast])
+
     if Util.is_java_installed(context.java_version):
         run_typechecker("Typechecker.jar", with_typechecking, args + extra_args, print_errors)
     else:

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/CertoraProver/certoraContextAttributes.py

@@ -1202,6 +1202,17 @@ class EvmAttributes(AttrUtil.Attributes):
         disables_build_cache=False,
     )
 
+    DUMP_CVL_AST = AttrUtil.AttributeDefinition(
+        arg_type=AttrUtil.AttrArgType.STRING,
+        help_msg="Path to output file where the CVL AST will be printed during typechecking",
+        default_desc="",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
     SAFE_CASTING_BUILTIN = AttrUtil.AttributeDefinition(
         arg_type=AttrUtil.AttrArgType.BOOLEAN,
         help_msg="This needs to be set to true for the safeCasting builtin to work",
@@ -1938,6 +1949,8 @@ class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAtt
 
 ATTRIBUTES_CLASS: Optional[Type[AttrUtil.Attributes]] = None
 
+ARG_FLAG_LIST_ATTRIBUTES = ['prover_args', 'java_args']
+
 
 def get_attribute_class() -> Type[AttrUtil.Attributes]:
     if not ATTRIBUTES_CLASS:

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/CertoraProver/certoraContextValidator.py

@@ -41,7 +41,6 @@ validation_logger = logging.getLogger("validation")
 
 KEY_ENV_VAR = "CERTORAKEY"
 
-
 class CertoraContextValidator:
     def __init__(self, context: CertoraContext):
         self.context = context
@@ -143,6 +142,14 @@ class CertoraContextValidator:
                                     f'"{conf_key}": [<comma separated list of values>]{Util.NEW_LINE}{Util.NEW_LINE}'
             raise Util.CertoraUserInputError(f"The value of attribute '{conf_key}' ('{value}')' is not a "
                                              f"list {syntax_suggestion}")
+
+        # Check for duplicates, we exclude ARG_FLAG_LIST_ATTRIBUTES as those can have duplicates e.g.
+        # prover_args value of “-rule rule1 -rule rule2" is valid, although the -rule string appears more than once.
+
+        if conf_key not in Attrs.ARG_FLAG_LIST_ATTRIBUTES:
+            if len(value) != len(set(value)):
+                raise Util.CertoraUserInputError(f"The value of attribute '{conf_key}' contains duplicate entries: {value}")
+
         for v in value:
             if not isinstance(v, str):
                 raise Util.CertoraUserInputError(f"value in {conf_key} {v} in {value} is not a string")

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/EquivalenceCheck/equivCheck.py

@@ -20,7 +20,8 @@ import sys
 import json
 from pathlib import Path
 from argparse import Namespace, ArgumentParser
-from typing import List, Optional
+from typing import List, TypeVar, Union, Optional
+
 
 # Credit for this work goes to Nick and Netanel.
 
@@ -51,6 +52,22 @@ CONTRACTS = "contracts"
 PROVER_ARGS = "prover_args"
 OPTIMISTIC_FALLBACK_SETTING = "optimistic_fallback"
 
+T = TypeVar("T", str, Path)
+
+def append_unique(lst: List[T], item: Union[str, Path]) -> None:
+    """
+    Append item to lst:
+    - If lst is List[Path] and item is str → convert to Path.
+    - If lst is List[str] → leave item as str.
+    """
+    if lst and isinstance(lst[0], Path) and isinstance(item, str):
+        if Path(item) in lst:
+            return
+        lst.append(Path(item))  # type: ignore[arg-type]
+    else:
+        if item in lst:
+            return
+        lst.append(item)  # type: ignore[arg-type]
 
 class EquivalenceChecker:
 
@@ -134,7 +151,7 @@ class EquivalenceChecker:
             solc_i = self.solcs[i]
             with (self.path / SANITY_CONF_PATH).open() as sanity_conf:
                 contents = json.load(sanity_conf)
-                contents[FILES].append(str(file_i))
+                append_unique(contents[FILES], str(file_i))
                 contents[SOLC] = solc_i
                 contents[VERIFY] = f'{contract_i}:{self.path / SANITY_PATH}'
                 contents["build_only"] = True
@@ -165,10 +182,10 @@ class EquivalenceChecker:
             for file in files:
                 # if the conf file contains absolute path already then we use it
                 if Path(file).exists():
-                    self.files.append(file)
+                    append_unique(self.files, file)
                 # otherwise append the relative path to the conf file location to create absolute path
                 else:
-                    self.files.append(resolve_file(self.conf_path.parent / file))
+                    append_unique(self.files, resolve_file(self.conf_path.parent / file))
             # case where either or both of these will be in the conf file
             if not self.functions and FUNCTIONS in contents:
                 # if the user has functions in the conf file but manually inputs different ones
@@ -307,13 +324,13 @@ class EquivalenceChecker:
                 contents['rule_sanity'] = "basic"
                 contents[FILES] = list()
                 for file in self.files:
-                    contents['files'].append(str(file))
+                    append_unique(contents['files'], str(file))
         else:
             # update default conf_file for running
             with (self.path / DEFAULT_CONF_PATH).open() as conf_file:
                 contents = json.load(conf_file)
                 for file in self.files:
-                    contents[FILES].append(str(file))
+                    append_unique(contents[FILES], str(file))
                 if self.args.bitvector is True:
                     contents.setdefault(PROVER_ARGS, []).append(["-smt_bitVectorTheory true"])
                 if self.args.test_mode is True:

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/Shared/certoraUtils.py

@@ -310,6 +310,7 @@ class ExitException(Exception):
         self.exit_code = exit_code  # Store the integer data
 
 MIN_JAVA_VERSION = 19  # minimal java version to run the local type checker jar
+RECOMMENDED_JAVA_VERSION = 21  # recommended java version to run the local type checker jar
 
 
 def text_style(txt: str, style: str) -> str:
@@ -626,20 +627,6 @@ def get_certora_root_directory() -> Path:
 def get_certora_envvar() -> str:
     return os.getenv(ENVVAR_CERTORA, "")
 
-
-def which(filename: str) -> Optional[str]:
-    if is_windows() and not filename.endswith(".exe"):
-        filename += ".exe"
-
-    # TODO: find a better way to iterate over all directories in $Path
-    for dirname in os.environ['PATH'].split(os.pathsep) + [os.getcwd()]:
-        candidate = os.path.join(dirname, filename)
-        if os.path.isfile(candidate) and os.access(candidate, os.X_OK):
-            return filename
-
-    return None
-
-
 def read_json_file(file_name: Path) -> Dict[str, Any]:
     with file_name.open() as json_file:
         json_obj = json.load(json_file)
@@ -1006,7 +993,7 @@ def get_java_version() -> str:
     @return installed java version on success or empty string
     """
     # Check if java exists on the machine
-    java = which("java")
+    java = shutil.which("java")
     if java is None:
         return ''
 
@@ -1028,17 +1015,23 @@ def is_java_installed(java_version: str) -> bool:
     if not java_version:
         typecheck_logger.warning(
             f"`java` is not installed. Installing Java version {MIN_JAVA_VERSION} or later will enable faster "
-            f"CVL specification syntax checking before uploading to the cloud.")
+            f"CVL specification syntax checking before uploading to the cloud.\n"
+            f"The recommended LTS version is {RECOMMENDED_JAVA_VERSION}.")
         return False
 
     else:
         major_java_version = java_version.split('.')[0]
         if int(major_java_version) < MIN_JAVA_VERSION:
             typecheck_logger.warning("Installed Java version is too old to check CVL specification files locally. "
-                                     f" Java version should be at least {MIN_JAVA_VERSION} to allow local java-based "
-                                     "type checking")
+                                     f"Java version should be at least {MIN_JAVA_VERSION} to allow local java-based "
+                                     "type checking\n"
+                                     f"The recommended LTS version is {RECOMMENDED_JAVA_VERSION}.")
 
             return False
+        elif int(major_java_version) < RECOMMENDED_JAVA_VERSION:
+            typecheck_logger.warning(f"Installed Java version ({int(major_java_version)}) is not an LTS release. "
+                                     f"Upgrading is recommended.\n"
+                                     f"The recommended LTS version is {RECOMMENDED_JAVA_VERSION}.")
 
     return True
 
@@ -1319,6 +1312,7 @@ def check_packages_arguments(context: SimpleNamespace) -> None:
             package = package_str.split("=")[0]
             path = package_str.split("=")[1]
             if package in context.package_name_to_path:
+
                 raise CertoraUserInputError(
                     f"package {package} was given two paths: {context.package_name_to_path[package]}, {path}")
             if path.endswith("/"):
@@ -1334,7 +1328,11 @@ def check_packages_arguments(context: SimpleNamespace) -> None:
         if PACKAGE_FILE.exists():
             try:
                 with PACKAGE_FILE.open() as package_json_file:
-                    package_json = json.load(package_json_file)
+                    try:
+                        package_json = json.load(package_json_file)
+                    except json.JSONDecodeError as e:
+                        raise CertoraUserInputError(f"Invalid JSON in package file: {PACKAGE_FILE}", e)
+
                     dict1 = package_json.get("dependencies", {})
                     dict2 = package_json.get("devDependencies", {})
                     dep_conflicts = {key: value for key, value in dict1.items() if key in dict2 and dict2[key] != value}
@@ -1352,7 +1350,7 @@ def check_packages_arguments(context: SimpleNamespace) -> None:
 
         packages_to_path_list += handle_remappings_file(context)
         if len(packages_to_path_list) > 0:
-            keys = [s.split('=')[0] for s in packages_to_path_list]
+            keys = [s.split('=')[0].rstrip('/') for s in packages_to_path_list]  # XXX and XXX/ are the same key
             if len(set(keys)) < len(keys):
                 raise CertoraUserInputError(f"package.json and remappings.txt include duplicated keys in: {keys}")
             context.packages = sorted(packages_to_path_list, key=str.lower)
@@ -1380,7 +1378,9 @@ def get_mappings_from_forge_remappings() -> List[str]:
         for line in remappings_output.strip().split('\n'):
             key, value = line.split('=', 1)
             if key and value:
-                remappings.append(line.strip())
+                new_remapping = line.strip()
+                if new_remapping not in remappings:
+                    remappings.append(new_remapping)
                 for suffix in ['contracts/', 'src/']:
                     if value.endswith(suffix) and not key.endswith(suffix):
                         new_remapping = f"{key}{suffix}={value}"
@@ -1415,30 +1415,38 @@ def check_remapping_file() -> None:
 
 
 def handle_remappings_file(context: SimpleNamespace) -> List[str]:
-    """"
-    Tries to reach packages from remappings.txt.
-    If the file exists in cwd and foundry.toml does not exist in cwd we return the mappings in
-    the file (legacy implementation).
-    In all other cases we add the remappings returned from running the "forge remappings" command. Forge remappings
-    takes into consideration mappings in remappings.txt but also mappings in foundry.toml and mappings from auto scan
-    :return:
     """
-    remappings = []
-    check_remapping_file()
-    if REMAPPINGS_FILE.exists() and not FOUNDRY_TOML_FILE.exists():
+    Tries to fetch packages from remappings.txt. This function should not be called if the packages attribute
+    was set in conf file on in CLI.
+    If forge is installed and foundry.toml is found we run 'forge remappings' to get the package mappings (including possible auto scan).
+    If the remappings.txt exists in cwd and foundry is not installed we parse the file (legacy behavior).
+    """
+
+    def parse_remappings_file() -> List[str]:
         try:
             with REMAPPINGS_FILE.open() as remappings_file:
                 remappings_set = set(filter(lambda x: x != "", map(lambda x: x.strip(), remappings_file.readlines())))
-            remappings = list(remappings_set)
+            return list(remappings_set)
         except CertoraUserInputError as e:
             raise e from None
         except Exception as e:
             # create CertoraUserInputError from other exceptions
             raise CertoraUserInputError(f"Invalid remappings file: {REMAPPINGS_FILE}", e)
-    elif find_nearest_foundry_toml():
+
+    check_remapping_file()
+    foundry_toml_exist = find_nearest_foundry_toml()
+    remappings_text_exist_in_cwd = REMAPPINGS_FILE.exists()
+    foundry_installed = shutil.which("forge") is not None
+    remappings = []
+    if foundry_installed and foundry_toml_exist:
         remappings = get_mappings_from_forge_remappings()
+    elif remappings_text_exist_in_cwd:
+        remappings = parse_remappings_file()
 
-    context.forge_remappings = remappings
+    if foundry_toml_exist and not foundry_installed:
+        context_logger.warning("foundry.toml was found but `forge` command not found. To add support for foundry "
+                               "please install `foundry` following instructions at "
+                               "https://book.getfoundry.sh/getting-started/installation")
 
     return remappings
 

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/certora_cli/certoraRun.py

@@ -17,7 +17,7 @@
 import sys
 import time
 import logging
-from typing import List, Optional, Type
+from typing import List, Optional, Type, Any
 from pathlib import Path
 
 scripts_dir_path = Path(__file__).parent.resolve()  # containing directory
@@ -27,6 +27,7 @@ from Shared import certoraUtils as Util
 from CertoraProver.certoraCloudIO import CloudVerification
 
 from CertoraProver.certoraBuild import build
+from CertoraProver.certoraContextClass import CertoraContext
 import CertoraProver.certoraContext as Ctx
 import CertoraProver.certoraApp as App
 
@@ -110,7 +111,11 @@ def run_certora(args: List[str], app: Type[App.CertoraApp] = App.EvmApp,
         if context.test == str(Util.TestValue.AFTER_BUILD):
             raise Util.TestResultsReady(context)
 
-    if context.build_only:
+    if context.build_only or context.compilation_steps_only:
+        # build_only does not perform CVL typechecking, just Solidity/Vyper building.
+        # compilation_steps_only includes the CVL typechecking
+        if context.compilation_steps_only:
+            run_syntax_and_typechecking_with_timings(context, timings)
         return return_value
 
     # either we skipped building (TAC MODE) or build succeeded
@@ -133,13 +138,7 @@ def run_certora(args: List[str], app: Type[App.CertoraApp] = App.EvmApp,
             if not result:
                 exit_code = 1
     else:  # Remote run
-        # Syntax checking and typechecking
-        if Cv.mode_has_spec_file(context):
-            if Ctx.should_run_local_speck_check(context):
-                typechecking_start = time.perf_counter()
-                Ctx.run_local_spec_check(True, context)
-                typechecking_end = time.perf_counter()
-                timings['typecheckingTime'] = round(typechecking_end - typechecking_start, 4)
+        run_syntax_and_typechecking_with_timings(context, timings)
 
         # Remove debug logger and run remote verification
         logging_manager.remove_debug_logger()
@@ -149,6 +148,16 @@ def run_certora(args: List[str], app: Type[App.CertoraApp] = App.EvmApp,
     return handle_exit(exit_code, return_value)
 
 
+def run_syntax_and_typechecking_with_timings(context: CertoraContext, timings: dict[Any, Any]) -> None:
+    # Syntax checking and typechecking
+    if Cv.mode_has_spec_file(context):
+        if Ctx.should_run_local_speck_check(context):
+            typechecking_start = time.perf_counter()
+            Ctx.run_local_spec_check(True, context)
+            typechecking_end = time.perf_counter()
+            timings['typecheckingTime'] = round(typechecking_end - typechecking_start, 4)
+
+
 def latest_emv_dir() -> Optional[Path]:
     """
     Returns the latest emv-... directory.

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2/certora_cli_beta_mirror.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-beta-mirror
-Version: 8.6.0
+Version: 8.6.2
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-beta-mirror
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 92412cc.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 5e8518f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_beta_mirror-8.6.2/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -0,0 +1 @@
+{"name": "certora-cli-beta-mirror", "tag": "8.6.2", "branch": "", "commit": "5e8518f", "timestamp": "20251215.5.17.070907", "version": "8.6.2"}

{certora_cli_beta_mirror-8.6.0 → certora_cli_beta_mirror-8.6.2}/setup.py

@@ -3,11 +3,11 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli-beta-mirror",
-    version="8.6.0",
+    version="8.6.2",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit 92412cc.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit 5e8518f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
     long_description_content_type="text/markdown",
     url="https://pypi.org/project/certora-cli-beta-mirror",
     packages=setuptools.find_packages(),

certora_cli_beta_mirror-8.6.0/README.md

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

certora_cli_beta_mirror-8.6.0/certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +0,0 @@
-{"name": "certora-cli-beta-mirror", "tag": "8.6.0", "branch": "", "commit": "92412cc", "timestamp": "20251127.6.22.749789", "version": "8.6.0"}