certora-cli-alpha-master 20241229.15.7.448763__py3-none-macosx_10_9_universal2.whl → 20250102.15.39.446615__py3-none-macosx_10_9_universal2.whl

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/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/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/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-20241229.15.7.448763.dist-info → certora_cli_alpha_master-20250102.15.39.446615.dist-info}/METADATA

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

{certora_cli_alpha_master-20241229.15.7.448763.dist-info → certora_cli_alpha_master-20250102.15.39.446615.dist-info}/RECORD

@@ -12,13 +12,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=5cMp9goJ2tGpi0stDmPZaV0hOxm_NSllJQ3YO_QvOc4,3008
-certora_cli/EVMVerifier/certoraCloudIO.py,sha256=JJlXoej6jLFEZs9CAl1YghRNd9EQw9_lreS1_EnSP-k,53453
+certora_cli/EVMVerifier/certoraBuildRust.py,sha256=GN5r8avFmhXen8ugaOa0RDr8UK3a3Z0jCQB4ct8oPso,3305
+certora_cli/EVMVerifier/certoraCloudIO.py,sha256=B8d_DKnDiKH1nkQhzToVyKwVEfa88luFg42dAorgw44,53976
 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=zlXcSAXPXQEhCdOqbogNLgIRSURFQgArYjFKd3VMkfg,4693
 certora_cli/EVMVerifier/certoraContext.py,sha256=52YMEYYm67F_AsDZoIFjgcR34gQQDTnlmhiH9VrLCYE,21649
-certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=sg2IOEV4tdubHkRdmEWDY8bAHVAZLh6iWSgSK3OjecY,56738
+certora_cli/EVMVerifier/certoraContextAttributes.py,sha256=sukGq7f08e6GodDr9G9N1bZdK4l5XhMmRo7Ao4kBLzg,56946
 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=e_rvwH4dh0XvO2khGy2EW7x9aqf4G3R7glJ1_AXt-M0,2276
+certora_cli/EVMVerifier/certoraParseBuildScript.py,sha256=GG0VVRNUT--4Wu7F_4pLIWmpzz4sDyX5UdftvJD32b4,2466
 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=hUi1ye5kIAHGZqCR1YbXayn5-ToZi3WAa4M
 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=qbN2h6MApnLucKvzfJ_dnBa135lLLTGE9Q7MlCBP3Fc,37204
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=pni1HHwlbeUVVhBFcKGEdyXuNyzEfQjFuGxDkubVdTg,168
-certora_jars/Typechecker.jar,sha256=iOyJF3MHhqGJYdMTYhch5m2FFiuIdvIABKXWJyKqCb8,16816756
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=hUexzmgKYkRbNBi_kxHuHeLMNuS8Yop8TfMP5-kVniI,170
+certora_jars/Typechecker.jar,sha256=lbObkgIk0J64JKCkKmWTY9sk1DnDPaZpHmiDvKDT8E8,16816756
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/METADATA,sha256=aR9tlKwDs1n_dfv3Aa8eNaPfmJUp5Wdwa6Ttfqf8KJM,859
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20241229.15.7.448763.dist-info/RECORD,,
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/LICENSE,sha256=VeEBJLgfzZqyAUfjLoKUztf7KJBBUjtZ1ap99eQubOo,1065
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/METADATA,sha256=CfTInQdRNGbMUW6-sENswHThOJNWqNDaUT-jY20kDy4,860
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/WHEEL,sha256=N3Zagyg8u7FcZiPCx4UnuNyRRYq7IQpu24eWYyuhGOQ,110
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/entry_points.txt,sha256=x2dyit80wAtF72k5CQj9F5lnWZEmP9ioseqvrEGWyFc,389
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20250102.15.39.446615.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "c943bd8", "timestamp": "20241229.15.7.448763", "version": "20241229.15.7.448763+c943bd8"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "e6644f0", "timestamp": "20250102.15.39.446615", "version": "20250102.15.39.446615+e6644f0"}