certora-cli-alpha-master 20241225.10.19.754960__py3-none-any.whl → 20241225.17.56.777880__py3-none-any.whl

certora_cli/EVMVerifier/certoraBuildRust.py

@@ -60,10 +60,10 @@ def copy_files_to_build_dir(context: CertoraContext, root_directory: Path) -> No
     rust_executable = root_directory / context.rust_executables
     shutil.copyfile(rust_executable, Util.get_build_dir() / rust_executable.name)
 
-    if context.prover_resource_files:
-        for value in context.prover_resource_files:
-            _, file_path = value.split(':')
-            cur_path = (Path(context.conf_file).parent / file_path).resolve()
-            shutil.copy(cur_path, Util.get_build_dir() / cur_path.name)
-            if cur_path.suffix == '.txt':
-                shutil.copy(cur_path, Util.get_certora_sources_dir() / cur_path.name)
+    if hasattr(context, 'solana_inlining') and context.solana_inlining:
+        solana_inlining = Path(context.solana_inlining).resolve()
+        shutil.copy(solana_inlining, Util.get_build_dir() / solana_inlining.name)
+
+    if hasattr(context, 'solana_summaries') and context.solana_summaries:
+        solana_summaries = Path(context.solana_summaries).resolve()
+        shutil.copy(solana_summaries, Util.get_build_dir() / solana_summaries.name)

certora_cli/EVMVerifier/certoraCloudIO.py

@@ -749,11 +749,11 @@ class CloudVerification:
 
                 files_list.append(Util.get_build_dir() / Path(self.context.rust_executables).name)
 
-                if self.context.prover_resource_files:
-                    for value in self.context.prover_resource_files:
-                        _, file_path = value.split(':')
-                        cur_path = (Path(self.context.conf_file).parent / Path(file_path)).resolve()
-                        files_list.append(Util.get_build_dir() / cur_path.name)
+                if hasattr(self.context, 'solana_inlining') and self.context.solana_inlining:
+                    files_list.append(Util.get_build_dir() / Path(self.context.solana_inlining).name)
+
+                if hasattr(self.context, 'solana_summaries') and self.context.solana_summaries:
+                    files_list.append(Util.get_build_dir() / Path(self.context.solana_summaries).name)
 
                 result = compress_files(self.ZipFilePath, *files_list,
                                         short_output=Ctx.is_minimal_cli_output(self.context))

certora_cli/EVMVerifier/certoraConfigIO.py

@@ -61,7 +61,7 @@ def read_from_conf_file(context: CertoraContext) -> None:
         try:
             check_conf_content(configuration, context)
         except Util.CertoraUserInputError as e:
-            raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}", e) from None
+            raise Util.CertoraUserInputError(f"Error when reading {conf_file_path}: {str(e)}", e) from None
         context.conf_file = str(conf_file_path)
 
 
@@ -86,10 +86,12 @@ def check_conf_content(conf: Dict[str, Any], context: CertoraContext) -> None:
         else:
             raise Util.CertoraUserInputError(f"{option} appears in the conf file but is not a known attribute. ")
 
-    if 'files' not in conf:
-        if Attrs.is_rust_app() and hasattr(context, 'build_script') and context.build_script is not None:
-            context.files = conf.get('files', None)  # Override the current .conf file
-        else:
-            raise Util.CertoraUserInputError("Mandatory 'files' attribute is missing from the configuration")
-    else:
-        context.files = conf['files']  # Override the current .conf file
+    if Attrs.is_evm_app() and 'files' not in conf:
+        raise Util.CertoraUserInputError("Mandatory 'files' attribute is missing from the configuration")
+
+    if Attrs.is_rust_app():
+        has_build_script = getattr(context, 'build_script', False)
+        if not has_build_script and 'files' not in conf:
+            raise Util.CertoraUserInputError("Mandatory 'build_script' or 'files' attribute is missing from the configuration")
+
+    context.files = conf.get('files')

certora_cli/EVMVerifier/certoraContextAttributes.py

@@ -1389,7 +1389,8 @@ class BackendAttributes(AttrUtil.Attributes):
 class RustAttributes(AttrUtil.Attributes):
 
     BUILD_SCRIPT = AttrUtil.AttributeDefinition(
-        help_msg="Python script to build the project",
+        attr_validation_func=Vf.validate_exec_file,
+        help_msg="script to build a rust project",
         default_desc="Using default building command",
         argparse_args={
             'action': AttrUtil.UniqueStore
@@ -1398,6 +1399,16 @@ class RustAttributes(AttrUtil.Attributes):
         disables_build_cache=False
     )
 
+    CARGO_FEATURES = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_non_empty_string,
+        help_msg="a white space separated list of strings that are extra features passed to the build_script",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
 
 class EvmProverAttributes(CommonAttributes, DeprecatedAttributes, EvmAttributes, InternalUseAttributes,
                           BackendAttributes):
@@ -1442,6 +1453,26 @@ class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAtt
         disables_build_cache=False
     )
 
+    SOLANA_INLINING = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_readable_file,
+        help_msg="a path for the inlining file for Solana contract",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
+    SOLANA_SUMMARIES = AttrUtil.AttributeDefinition(
+        attr_validation_func=Vf.validate_readable_file,
+        help_msg="a path for the summaries file for Solana contract",
+        argparse_args={
+            'action': AttrUtil.UniqueStore
+        },
+        affects_build_cache_key=False,
+        disables_build_cache=False
+    )
+
 
 ATTRIBUTES_CLASS: Optional[Type[AttrUtil.Attributes]] = None
 

certora_cli/EVMVerifier/certoraParseBuildScript.py

@@ -13,7 +13,12 @@ def run_script_and_parse_json(context: CertoraContext) -> None:
         return
     try:
         build_script_logger.info(f"Building from script {context.build_script}")
-        result = subprocess.run([context.build_script, '--json'], capture_output=True, text=True)
+        run_cmd = [context.build_script, '--json']
+        if context.cargo_features is not None:
+            run_cmd.append('--cargo_features')
+            for feature in context.cargo_features.split(' '):
+                run_cmd.append(feature)
+        result = subprocess.run(run_cmd, capture_output=True, text=True)
 
         # Check if the script executed successfully
         if result.returncode != 0:
@@ -21,13 +26,27 @@ def run_script_and_parse_json(context: CertoraContext) -> None:
 
         json_obj = json.loads(result.stdout)
 
-        if not json_obj or not json_obj.get("success"):
-            raise Util.CertoraUserInputError(f"{result.stderr}\nBuild from {context.build_script} failed")
+        if not json_obj:
+            raise Util.CertoraUserInputError(f"No JSON output from build script {context.build_script}")
+
+        if missing_keys := [key for key in ["success", "project_directory", "sources", "executables"] if key not in json_obj]:
+            raise Util.CertoraUserInputError(f"Missing required keys in build script response: {', '.join(missing_keys)}")
+
+        if not json_obj.get("success"):
+            raise Util.CertoraUserInputError(
+                f"Compilation failed using build script: {context.build_script}\n"
+                f"Success value in JSON response is False."
+            )
 
         context.rust_project_directory = json_obj.get("project_directory")
         context.rust_sources = json_obj.get("sources")
         context.rust_executables = json_obj.get("executables")
 
+        if context.test == str(Util.TestValue.AFTER_BUILD_RUST):
+            raise Util.TestResultsReady(None)
+
+    except Util.TestResultsReady as e:
+        raise e
     except FileNotFoundError as e:
         raise Util.CertoraUserInputError(f"File not found: {e}")
     except json.JSONDecodeError as e:

certora_cli/Shared/certoraAttrUtil.py

@@ -100,7 +100,7 @@ class AttributeDefinition:
                 self.attr_validation_func(value)
             except Util.CertoraUserInputError as e:
                 msg = f"attribute/flag '{self.name.lower()}': {e}"
-                if cli_flag and isinstance(value, str) and value.strip()[0] == '-':
+                if cli_flag and isinstance(value, str) and value and value.strip()[0] == '-':
                     flag_error = f'{value}: Please remember, CLI flags should be preceded with double dashes. ' \
                                  f'{Util.NEW_LINE}For more help run the tool with the option --help'
                     msg = flag_error + msg

certora_cli/Shared/certoraValidateFuncs.py

@@ -152,6 +152,17 @@ def validate_non_negative_integer(string: str) -> str:
     return string
 
 
+def validate_non_empty_string(value: str) -> str:
+    """
+    :param value: A string
+    :return: The same string, if the string represents a non-empty string
+    :raises CertoraUserInputError if the string is empty
+    """
+    if not value:
+        raise Util.CertoraUserInputError('expected a non-empty string')
+    return value
+
+
 def validate_manual_mutants(value: Any) -> Any:
     return validate_mutant_attributes(value, Constants.MANUAL_MUTANTS)
 

{certora_cli_alpha_master-20241225.10.19.754960.dist-info → certora_cli_alpha_master-20241225.17.56.777880.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241225.10.19.754960
+Version: 20241225.17.56.777880
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -22,5 +22,6 @@ Requires-Dist: tqdm
 Requires-Dist: StrEnum
 Requires-Dist: tomli
 Requires-Dist: universalmutator
+Requires-Dist: jinja2
 
-Commit 2b6e11a.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit b803960.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20241225.10.19.754960.dist-info → certora_cli_alpha_master-20241225.17.56.777880.dist-info}/RECORD

@@ -11,13 +11,13 @@ certora_cli/EVMVerifier/__init__.py,sha256=AJxj90KAGh1JqAsxKqDBTL2rFbqgtkhDfW_Xm
 certora_cli/EVMVerifier/certoraBuild.py,sha256=SNpafLfTRInMrns6OuI9WUrJXP7Yt4Fv53pUnpI_j60,203520
 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=uOKog69nYxmevt6iPnAZa38d5u5bKZM7HywL-Dc_G60,2973
-certora_cli/EVMVerifier/certoraCloudIO.py,sha256=RyNqdVkttNa7oy4NT_WdPdn49jDoA77-bo-cCFkKsi0,53418
+certora_cli/EVMVerifier/certoraBuildRust.py,sha256=5cMp9goJ2tGpi0stDmPZaV0hOxm_NSllJQ3YO_QvOc4,3008
+certora_cli/EVMVerifier/certoraCloudIO.py,sha256=JJlXoej6jLFEZs9CAl1YghRNd9EQw9_lreS1_EnSP-k,53453
 certora_cli/EVMVerifier/certoraCollectRunMetadata.py,sha256=selEf-p7UW8_70-AbPfa5659ki6WcGrBwfPkUQWKhFU,10322
 certora_cli/EVMVerifier/certoraCompilerParameters.py,sha256=PDKW3K_lNeRNPHisW0e5hYtfu6unDRjJUop-yItGHO0,762
-certora_cli/EVMVerifier/certoraConfigIO.py,sha256=oyNOyBjVWFfB1dmj0jNnEwvokM7UMoGZ91luSh-cFGk,4634
+certora_cli/EVMVerifier/certoraConfigIO.py,sha256=zlXcSAXPXQEhCdOqbogNLgIRSURFQgArYjFKd3VMkfg,4693
 certora_cli/EVMVerifier/certoraContext.py,sha256=52YMEYYm67F_AsDZoIFjgcR34gQQDTnlmhiH9VrLCYE,21649
-certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=Lx1vi9PgPiUcv0xRsdQncvknkpdvMWagGsT-Tw0saX4,55636
+certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=sg2IOEV4tdubHkRdmEWDY8bAHVAZLh6iWSgSK3OjecY,56738
 certora_cli/EVMVerifier/certoraContextClass.py,sha256=qdHYmrzI4zeQaAaMnonw4C-h1PFrPEhI84trrgvxFj0,210
 certora_cli/EVMVerifier/certoraContextValidator.py,sha256=_vS3CDY8cJRqxtujwiz7rwRFVgDVxNb40YgUU4t4BPM,37585
 certora_cli/EVMVerifier/certoraContractFuncs.py,sha256=W3lAvKotGKK7ZGJLg4yYh0FzTwwSQJbZMpizyGaYXZo,6229
@@ -25,7 +25,7 @@ certora_cli/EVMVerifier/certoraExtensionInfo.py,sha256=bHjEBKg3qQ1lS419KSU6v6HKb
 certora_cli/EVMVerifier/certoraJobList.py,sha256=JlPOANEzNHP6cDrM5UKfO314pmWYokuhAPTkH3ezNb4,10768
 certora_cli/EVMVerifier/certoraMiniSpecParser.py,sha256=Thtcr1BLmCz9xOiOkaP04mSnrDaqIUOUSCM81TrqD_s,8970
 certora_cli/EVMVerifier/certoraNodeFilters.py,sha256=0e8iPdj4cWjwReaAhfJhpdnSUYc8gephmKQzOOP5X_g,2140
-certora_cli/EVMVerifier/certoraParseBuildScript.py,sha256=HiBfBRXCl7ER1aBSzJFARgBWj8Z4doT6ApcicdhHNnU,1425
+certora_cli/EVMVerifier/certoraParseBuildScript.py,sha256=e_rvwH4dh0XvO2khGy2EW7x9aqf4G3R7glJ1_AXt-M0,2276
 certora_cli/EVMVerifier/certoraSourceFinders.py,sha256=fZLYGjNgntIySnG76DwsjRZ-UHiy0zEkM6xNP7cYpDE,18342
 certora_cli/EVMVerifier/certoraType.py,sha256=TPrgRwUnY-krN1SxpCHGB0zwN-TR1bxb-NFdnaigA-k,28626
 certora_cli/EVMVerifier/certoraVerifyGenerator.py,sha256=OT5zrtQMXDoaVdGfQ4_gbAnITin3nlXgXTgw3msqlNQ,9452
@@ -52,16 +52,16 @@ certora_cli/Mutate/mutateUtil.py,sha256=O3ub9gJe6LWQTDPbWyDqdfBhupwYl0ZrlfRX4kSn
 certora_cli/Mutate/mutateValidate.py,sha256=mCLxAyrzXEp3UFQpr1NGrC3zmJ5Y_WQRmV5jebLkYQ0,6745
 certora_cli/Shared/ExpectedComparator.py,sha256=rDDY3-FaE3OS_ZjZ-nOyvUTlUp8eQCHwryJMAefxIeo,17767
 certora_cli/Shared/__init__.py,sha256=QGoFb_Uu87tWp4E4L6C_VtzdG-sfNrzdNtRK79h5_Lw,333
-certora_cli/Shared/certoraAttrUtil.py,sha256=IbIIvTbtPzmPSSrK7VIWZNitkz1iwvW_e0ggX1e2joY,6751
+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=OOjPAkcfrURZDD4oDjOMBFTvY6wwQSXboXzu-47AUbY,36871
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=Fc5FoJEcvJf1PUSfMAf2RGnfLl7b1z92X25X43V-44E,170
-certora_jars/Typechecker.jar,sha256=FN9LwaQKIavYSxGvfefI84Jb7j89JYOJGqbUa1IsTR0,16816756
+certora_cli/Shared/certoraValidateFuncs.py,sha256=qbN2h6MApnLucKvzfJ_dnBa135lLLTGE9Q7MlCBP3Fc,37204
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=i7ctp7fXwYYpJgbuENh7Jr9BEWGtUYJPHSwPxyHumas,170
+certora_jars/Typechecker.jar,sha256=7X1kCEhj3M0n9jReooloRUJ3PCFJbRgUIlLBptMapEk,16816756
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/METADATA,sha256=ccjef4jzNVwsVrS6fOy2vKjAUi1guPDZ75fzBk9wIE8,838
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20241225.10.19.754960.dist-info/RECORD,,
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/METADATA,sha256=6jOvTyrbcwWV7ucxMKHJSPummbzlVkT0HL9QvhmTzzk,860
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20241225.17.56.777880.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "2b6e11a", "timestamp": "20241225.10.19.754960", "version": "20241225.10.19.754960+2b6e11a"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "b803960", "timestamp": "20241225.17.56.777880", "version": "20241225.17.56.777880+b803960"}