certora-cli-alpha-master 20241230.22.32.888836__tar.gz → 20250102.17.29.509991__tar.gz

{certora_cli_alpha_master-20241230.22.32.888836/certora_cli_alpha_master.egg-info → certora_cli_alpha_master-20250102.17.29.509991}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241230.22.32.888836
+Version: 20250102.17.29.509991
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -24,4 +24,4 @@ Requires-Dist: tomli
 Requires-Dist: universalmutator
 Requires-Dist: jinja2
 
-Commit f3cb489.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 72e434f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

certora_cli_alpha_master-20250102.17.29.509991/README.md

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

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991}/certora_cli/EVMVerifier/certoraBuildRust.py

@@ -1,4 +1,5 @@
 import glob
+import os
 import shutil
 from pathlib import Path
 from typing import Set
@@ -60,10 +61,16 @@ 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 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)
+    additional_files = (getattr(context, 'solana_inlining', None) or []) + \
+                       (getattr(context, 'solana_summaries', None) or [])
 
-    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)
+    for file in additional_files:
+        file_path = Path(file).resolve()
+        shutil.copy(file_path, Util.get_build_dir() / file_path.name)
+        shutil.copy(file_path,
+                    Util.get_certora_sources_dir() / os.path.relpath(file_path, context.rust_project_directory))
+
+    if rust_logs := getattr(context, 'rust_logs_stdout', None):
+        shutil.copy(Path(rust_logs), Util.get_build_dir() / Path(rust_logs).name)
+    if rust_logs := getattr(context, 'rust_logs_stderr', None):
+        shutil.copy(Path(rust_logs), Util.get_build_dir() / Path(rust_logs).name)

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991}/certora_cli/EVMVerifier/certoraCloudIO.py

@@ -749,11 +749,20 @@ class CloudVerification:
 
                 files_list.append(Util.get_build_dir() / Path(self.context.rust_executables).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)
+                # 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)
+
+                additional_files = (getattr(self.context, 'solana_inlining', None) or []) + \
+                                   (getattr(self.context, 'solana_summaries', None) or [])
+                for file in additional_files:
+                    files_list.append(Util.get_build_dir() / Path(file).name)
+
+                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))

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991}/certora_cli/EVMVerifier/certoraContextAttributes.py

@@ -1455,9 +1455,11 @@ class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAtt
 
     SOLANA_INLINING = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_readable_file,
-        help_msg="a path for the inlining file for Solana contract",
+        arg_type=AttrUtil.AttrArgType.LIST,
+        help_msg="a list of paths for the inlining files of Solana contracts",
         argparse_args={
-            'action': AttrUtil.UniqueStore
+            'nargs': AttrUtil.ONE_OR_MORE_OCCURRENCES,
+            'action': AttrUtil.APPEND
         },
         affects_build_cache_key=False,
         disables_build_cache=False
@@ -1465,9 +1467,11 @@ class SolanaProverAttributes(CommonAttributes, InternalUseAttributes, BackendAtt
 
     SOLANA_SUMMARIES = AttrUtil.AttributeDefinition(
         attr_validation_func=Vf.validate_readable_file,
-        help_msg="a path for the summaries file for Solana contract",
+        arg_type=AttrUtil.AttrArgType.LIST,
+        help_msg="a list of paths for the summaries files of Solana contracts",
         argparse_args={
-            'action': AttrUtil.UniqueStore
+            'nargs': AttrUtil.ONE_OR_MORE_OCCURRENCES,
+            'action': AttrUtil.APPEND
         },
         affects_build_cache_key=False,
         disables_build_cache=False

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991}/certora_cli/EVMVerifier/certoraParseBuildScript.py

@@ -41,6 +41,9 @@ def run_script_and_parse_json(context: CertoraContext) -> None:
         context.rust_project_directory = json_obj.get("project_directory")
         context.rust_sources = json_obj.get("sources")
         context.rust_executables = json_obj.get("executables")
+        if json_obj.get("log") is not None:
+            context.rust_logs_stdout = json_obj.get("log").get('stdout')
+            context.rust_logs_stderr = json_obj.get("log").get('stderr')
 
         if context.test == str(Util.TestValue.AFTER_BUILD_RUST):
             raise Util.TestResultsReady(None)

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991/certora_cli_alpha_master.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certora-cli-alpha-master
-Version: 20241230.22.32.888836
+Version: 20250102.17.29.509991
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -24,4 +24,4 @@ Requires-Dist: tomli
 Requires-Dist: universalmutator
 Requires-Dist: jinja2
 
-Commit f3cb489.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 72e434f.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

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

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

{certora_cli_alpha_master-20241230.22.32.888836 → certora_cli_alpha_master-20250102.17.29.509991}/setup.py

@@ -3,11 +3,11 @@ import setuptools
 
 setuptools.setup(
     name="certora-cli-alpha-master",
-    version="20241230.22.32.888836",
+    version="20250102.17.29.509991",
     author="Certora",
     author_email="support@certora.com",
     description="Runner for the Certora Prover",
-    long_description="Commit f3cb489.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.",
+    long_description="Commit 72e434f.                    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(),

certora_cli_alpha_master-20241230.22.32.888836/README.md

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

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

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