certora-cli-alpha-master 20241224.22.35.130611__py3-none-macosx_10_9_universal2.whl → 20241225.17.24.261853__py3-none-macosx_10_9_universal2.whl

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

certora_cli/EVMVerifier/certoraParseBuildScript.py

@@ -21,13 +21,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_alpha_master-20241224.22.35.130611.dist-info → certora_cli_alpha_master-20241225.17.24.261853.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241224.22.35.130611
+Version: 20241225.17.24.261853
 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 cbc5345.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 9f06838.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20241224.22.35.130611.dist-info → certora_cli_alpha_master-20241225.17.24.261853.dist-info}/RECORD

@@ -16,9 +16,9 @@ certora_cli/EVMVerifier/certoraBuildRust.py,sha256=uOKog69nYxmevt6iPnAZa38d5u5bK
 certora_cli/EVMVerifier/certoraCloudIO.py,sha256=RyNqdVkttNa7oy4NT_WdPdn49jDoA77-bo-cCFkKsi0,53418
 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=BJBY1qZSMIyD2vyCLx-_cAl0zl4EmogQJYeyLA2KXy0,55684
 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
@@ -26,7 +26,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=920bFG0fTLvpl63Gt_ylmwNazVHBH_DvKUN6bbxnzgo,2054
 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
@@ -57,12 +57,12 @@ certora_cli/Shared/certoraAttrUtil.py,sha256=IbIIvTbtPzmPSSrK7VIWZNitkz1iwvW_e0g
 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=-H_R2CoB5Juss4rXOrwFeJ6bvkZAaP3S2s5EU7L-0Cs,170
-certora_jars/Typechecker.jar,sha256=JAvBs_Z1HMqVPG7zzVaQ1WAibwbHqNXlHm7R7aYQnqw,16812998
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=N6Wj1OlOeFh9Asf-9DucS0Q3qQRNSnW2Y3WWaAt87tQ,170
+certora_jars/Typechecker.jar,sha256=x5W30bIFGl6jnLoSHPfd-qqFYhgGjCX6Vqk6xx2mIl4,16816756
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/METADATA,sha256=U9oiKtwM7J9-BBaA4_7UlcBWguls0kEoNR_BrL5Vwwc,838
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20241224.22.35.130611.dist-info/RECORD,,
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/METADATA,sha256=jxHalbewhF6gmX7l2hoTviNRZCKWAsIG3eJklMsULro,860
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20241225.17.24.261853.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "cbc5345", "timestamp": "20241224.22.35.130611", "version": "20241224.22.35.130611+cbc5345"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "9f06838", "timestamp": "20241225.17.24.261853", "version": "20241225.17.24.261853+9f06838"}