certora-cli-alpha-master 20241224.22.35.130611__tar.gz → 20241225.17.24.261853__tar.gz

{certora_cli_alpha_master-20241224.22.35.130611/certora_cli_alpha_master.egg-info → certora_cli_alpha_master-20241225.17.24.261853}/PKG-INFO

@@ -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-20241225.17.24.261853/README.md

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

{certora_cli_alpha_master-20241224.22.35.130611 → certora_cli_alpha_master-20241225.17.24.261853}/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_alpha_master-20241224.22.35.130611 → certora_cli_alpha_master-20241225.17.24.261853}/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_alpha_master-20241224.22.35.130611 → certora_cli_alpha_master-20241225.17.24.261853}/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 → certora_cli_alpha_master-20241225.17.24.261853/certora_cli_alpha_master.egg-info}/PKG-INFO

@@ -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 → certora_cli_alpha_master-20241225.17.24.261853}/certora_cli_alpha_master.egg-info/requires.txt

@@ -9,3 +9,4 @@ tqdm
 StrEnum
 tomli
 universalmutator
+jinja2

certora_cli_alpha_master-20241225.17.24.261853/certora_jars/CERTORA-CLI-VERSION-METADATA.json

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

{certora_cli_alpha_master-20241224.22.35.130611 → certora_cli_alpha_master-20241225.17.24.261853}/setup.py

@@ -3,16 +3,16 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli-alpha-master",
-    version="20241224.22.35.130611",
+    version="20241225.17.24.261853",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit cbc5345.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit 9f06838.                    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-alpha-master",
     packages=setuptools.find_packages(),
     include_package_data=True,
-    install_requires=['click', 'json5', 'pycryptodome', 'requests', 'rich', 'sly', 'tabulate', 'tqdm', 'StrEnum', 'tomli', 'universalmutator'],
+    install_requires=['click', 'json5', 'pycryptodome', 'requests', 'rich', 'sly', 'tabulate', 'tqdm', 'StrEnum', 'tomli', 'universalmutator', 'jinja2'],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",

certora_cli_alpha_master-20241224.22.35.130611/README.md

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

certora_cli_alpha_master-20241224.22.35.130611/certora_jars/CERTORA-CLI-VERSION-METADATA.json

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