certora-cli-alpha-master 20250617.10.38.101609__py3-none-macosx_10_9_universal2.whl → 20250618.12.44.279419__py3-none-macosx_10_9_universal2.whl

certora_cli/CertoraProver/certoraBuild.py

@@ -3729,8 +3729,7 @@ def build_from_scratch(context: CertoraContext,
 
 def build_from_cache_or_scratch(context: CertoraContext,
                                 certora_build_generator: CertoraBuildGenerator,
-                                certora_verify_generator: CertoraVerifyGenerator,
-                                certora_build_cache_manager: CertoraBuildCacheManager) \
+                                certora_verify_generator: CertoraVerifyGenerator) \
         -> Tuple[bool, bool, CachedFiles]:
     """
     Builds either from cache (fast path) or from scratch (slow path)
@@ -3747,10 +3746,10 @@ def build_from_cache_or_scratch(context: CertoraContext,
                                           False)
         return cache_hit, False, cached_files
 
-    build_cache_applicable = certora_build_cache_manager.cache_is_applicable(context)
+    build_cache_applicable = CertoraBuildCacheManager.cache_is_applicable(context)
 
     if not build_cache_applicable:
-        build_cache_disabling_options = certora_build_cache_manager.cache_disabling_options(context)
+        build_cache_disabling_options = CertoraBuildCacheManager.cache_disabling_options(context)
         build_logger.warning("Requested to enable the build cache, but the build cache is not applicable "
                              f"to this run because of the given options: {build_cache_disabling_options}")
         cached_files = build_from_scratch(context, certora_build_generator,
@@ -3758,7 +3757,7 @@ def build_from_cache_or_scratch(context: CertoraContext,
                                           False)
         return cache_hit, False, cached_files
 
-    cached_files = certora_build_cache_manager.build_from_cache(context)
+    cached_files = CertoraBuildCacheManager.build_from_cache(context)
     # if no match, will rebuild from scratch
     if cached_files is not None:
         # write to .certora_build.json
@@ -3797,7 +3796,7 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
 
     try:
         input_config = InputConfig(context)
-
+        context.main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
         # Create generators
         certora_build_generator = CertoraBuildGenerator(input_config, context)
 
@@ -3813,12 +3812,9 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
             else:
                 Ctx.run_local_spec_check(False, context)
 
-        certora_build_cache_manager = CertoraBuildCacheManager()
-
         cache_hit, build_cache_enabled, cached_files = build_from_cache_or_scratch(context,
                                                                                    certora_build_generator,
-                                                                                   certora_verify_generator,
-                                                                                   certora_build_cache_manager)
+                                                                                   certora_verify_generator)
 
         # avoid running the same test over and over again for each split run, context.split_rules is true only for
         # the first run and is set to [] for split runs
@@ -3838,7 +3834,7 @@ def build(context: CertoraContext, ignore_spec_syntax_check: bool = False) -> No
 
         # save in build cache
         if not cache_hit and build_cache_enabled and cached_files.may_store_in_build_cache:
-            certora_build_cache_manager.save_build_cache(context, cached_files)
+            CertoraBuildCacheManager.save_build_cache(context, cached_files)
 
         certora_verify_generator.update_certora_verify_struct(True)
         certora_verify_generator.dump()  # second dump with properly rooted specs

certora_cli/CertoraProver/certoraBuildCacheManager.py

@@ -66,10 +66,9 @@ class CertoraBuildCacheManager:
         @returns None if no cache hit, otherwise - the matching `.certora_build.json` file, and a set of source files
         """
         build_cache_dir = Util.get_certora_build_cache_dir()
-        main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
-        main_cache_entry_dir = build_cache_dir / main_cache_key
+        main_cache_entry_dir = build_cache_dir / context.main_cache_key
         if not main_cache_entry_dir.exists():
-            build_cache_logger.info(f"cache miss on build cache key {main_cache_key}")
+            build_cache_logger.info(f"cache miss on build cache key {context.main_cache_key}")
             return None
 
         # here's the tricky matching part:
@@ -92,7 +91,7 @@ class CertoraBuildCacheManager:
                     build_cache_logger.debug(f"Current sub build cache key computed for {file_list_file} is invalid")
                     continue
                 elif sub_cache_key_current_for_list == sub_cache_key_from_saved_entry:
-                    build_cache_logger.info(f"We have a match on build cache key {main_cache_key} and "
+                    build_cache_logger.info(f"We have a match on build cache key {context.main_cache_key} and "
                                             f"{sub_cache_key_current_for_list}")
                     sub_cache_key = sub_cache_key_current_for_list
                     all_contract_files = set([Path(f) for f in file_list])
@@ -103,24 +102,24 @@ class CertoraBuildCacheManager:
 
         if sub_cache_key is None:
             build_cache_logger.info("All sub-cache-key file list files missed, cache miss on build cache key "
-                                    f"{main_cache_key}")
+                                    f"{context.main_cache_key}")
             return None
 
         # cache hit
         certora_build_file = main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.certora_build_suffix}"
         if not certora_build_file.exists():
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and {sub_cache_key} "
                                        "but .certora_build.json file does not exist")
             return None
 
         if all_contract_files is None:  # should not be feasible
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
-                                       "but file list file does not exist")
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and "
+                                       f"{sub_cache_key} but file list file does not exist")
             return None
 
         build_output_props_file = main_cache_entry_dir / f"{sub_cache_key}.{CachedFiles.build_output_props_suffix}"
         if not build_output_props_file.exists():
-            build_cache_logger.warning(f"Got a cache-hit on build cache key {main_cache_key} and {sub_cache_key} "
+            build_cache_logger.warning(f"Got a cache-hit on build cache key {context.main_cache_key} and {sub_cache_key} "
                                        f"but {CachedFiles.build_output_props_suffix} file does not exist")
             return None
 
@@ -131,26 +130,26 @@ class CertoraBuildCacheManager:
     @staticmethod
     def save_build_cache(context: CertoraContext, cached_files: CachedFiles) -> None:
         build_cache_dir = Util.get_certora_build_cache_dir()
-        main_cache_key = CertoraBuildCacheManager.get_main_cache_key(context)
-        main_cache_entry_dir = build_cache_dir / main_cache_key
+        main_cache_entry_dir = build_cache_dir / context.main_cache_key
         sub_cache_key = CertoraBuildCacheManager.get_sub_cache_key(cached_files.all_contract_files)
         if sub_cache_key is None:
-            build_cache_logger.warning(f"Cannot save cache for main build cache key {main_cache_key} "
+            build_cache_logger.warning(f"Cannot save cache for main build cache key {context.main_cache_key} "
                                        "as sub-cache-key could not be computed")
             return
 
         if main_cache_entry_dir.exists():
-            build_cache_logger.info(f"main build cache key already exists {main_cache_key}, "
+            build_cache_logger.info(f"main build cache key already exists {context.main_cache_key}, "
                                     f"saving sub build cache key {sub_cache_key}")
             if cached_files.all_exist(main_cache_entry_dir, sub_cache_key):
                 build_cache_logger.debug("cache already saved under this build cache key, override")
             else:
-                build_cache_logger.debug(f"cache was corrupted, need to re-save build cache key {main_cache_key} "
-                                         f"and sub cache key {sub_cache_key}")
+                build_cache_logger.debug(f"cache was corrupted, need to re-save build cache key "
+                                         f"{context.main_cache_key} and sub cache key {sub_cache_key}")
             CertoraBuildCacheManager.save_files(cached_files, main_cache_entry_dir,
                                                 sub_cache_key)
         else:
-            build_cache_logger.info(f"saving main build cache key {main_cache_key} and sub cache key {sub_cache_key}")
+            build_cache_logger.info(f"saving main build cache key {context.main_cache_key} and sub cache key "
+                                    f"{sub_cache_key}")
             safe_create_dir(main_cache_entry_dir)
             CertoraBuildCacheManager.save_files(cached_files, main_cache_entry_dir,
                                                 sub_cache_key)

{certora_cli_alpha_master-20250617.10.38.101609.dist-info → certora_cli_alpha_master-20250618.12.44.279419.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: certora-cli-alpha-master
-Version: 20250617.10.38.101609
+Version: 20250618.12.44.279419
 Summary: Runner for the Certora Prover
 Home-page: https://pypi.org/project/certora-cli-alpha-master
 Author: Certora
@@ -38,4 +38,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-Commit 5dff57a.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.
+Commit 83b38e8.                    Build and Run scripts for executing the Certora Prover on Solidity smart contracts.

{certora_cli_alpha_master-20250617.10.38.101609.dist-info → certora_cli_alpha_master-20250618.12.44.279419.dist-info}/RECORD

@@ -10,8 +10,8 @@ certora_cli/certoraSolanaProver.py,sha256=7hu-YJJNA_P5eAJq_jYh6IGjiUf0PegGUBRCJ5
 certora_cli/certoraSorobanProver.py,sha256=qE6b_vicC8KgOvUz7UTOaDuXT3UW0MMhq3keQgUVvzs,2865
 certora_cli/rustMutator.py,sha256=6AvOGU8Ijz89zW_ZJCWlfXkeobJsk7EsqZhK7Eqwn-Y,14544
 certora_cli/CertoraProver/__init__.py,sha256=QHNr-PJQAoyuPgTkO7gg23GRchiWSXglWNG7yLSQZvs,849
-certora_cli/CertoraProver/certoraBuild.py,sha256=OOIRWyCZE7QVduKCmW0ZTwhV-xBQqXLWBIqCzv0Lf4I,212376
-certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=dzXC8A-V9gr1GGsPYglQLlFLoR2Tk4dTJuMHaxXBfgw,13257
+certora_cli/CertoraProver/certoraBuild.py,sha256=PofVFPe6Xc2gd3J_gNV4UJRM0GkwWWBp6idSQM8QEN8,212184
+certora_cli/CertoraProver/certoraBuildCacheManager.py,sha256=I60x0ykMFPzciD193cPXihsHh0fdV--UOmNKbIZW6Rc,13238
 certora_cli/CertoraProver/certoraBuildDataClasses.py,sha256=8tPny9-pasC7CCRKQclaVQ3qcEDNa6EdOUu1ZWh0MZY,14704
 certora_cli/CertoraProver/certoraBuildRust.py,sha256=ofKvmtqzUGTrgVm5crcybV7gbElbjiUc6Z4FphPEjz0,6016
 certora_cli/CertoraProver/certoraCloudIO.py,sha256=w3mqA5ANgIX6dsb6Nxg4jl9zBRdAX5kw9xLeYmA-iHc,53062
@@ -65,12 +65,12 @@ certora_cli/Shared/certoraUtils.py,sha256=xTVCh7bWdMDQR37SA6jLUHSelxsk3mbSYi26XK
 certora_cli/Shared/certoraValidateFuncs.py,sha256=EGoCGTtGMRzWdN-T5GducwkYbyqZBcSjQZHpau0fWnQ,41922
 certora_cli/Shared/proverCommon.py,sha256=PqkjycZ3TdZr0RNWoPuA_VZ5b7EAAsu9ewymNH6kIm4,11291
 certora_cli/Shared/rustProverCommon.py,sha256=NIZ5ECbhuiMegyRAl07CV3r68MFG2tBNKgUAQoV4uLI,2049
-certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=q_yxPQ6efZgAQDzeRW1bfUVhB1cxus0X0ln8rdHfjR4,170
-certora_jars/Typechecker.jar,sha256=dTfsgEuT0Fd5i9OT2PxQJVGMsG_pQWf2RVYxA4sGkoY,17142966
+certora_jars/CERTORA-CLI-VERSION-METADATA.json,sha256=3cuCdKBIRB29Hr0WahkzwJ5la1y3BHaetXx3AyX6XgY,170
+certora_jars/Typechecker.jar,sha256=DdmVVzOJPVGI1HwukqFj_bBTMT1D4Fe2j7F2WDZrzME,17142966
 certora_jars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/METADATA,sha256=yOH-3PUZzn81vpWOYSuxdpuzvzP44ZgpNQfb9fYUELk,1271
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
-certora_cli_alpha_master-20250617.10.38.101609.dist-info/RECORD,,
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/LICENSE,sha256=UGKSKIJSetF8m906JLKqNLkUS2CL60XfQdNvxBvpQXo,620
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/METADATA,sha256=zK3yv8NXotUzp3OG1MHjKKaXitiXpUxQjCM_3ThiWVk,1271
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/WHEEL,sha256=9Ig2YBzm5cpS_YWKLeuYxVAxcKv_uDQsCzy9XJbRZ_g,110
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/entry_points.txt,sha256=_SQ5_uYOAJXtqEW992nIvq7blW9cWFSUVEdbMGuy--4,443
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/top_level.txt,sha256=8C77w3JLanY0-NW45vpJsjRssyCqVP-qmPiN9FjWiX4,38
+certora_cli_alpha_master-20250618.12.44.279419.dist-info/RECORD,,

certora_jars/CERTORA-CLI-VERSION-METADATA.json

@@ -1 +1 @@
-{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "5dff57a", "timestamp": "20250617.10.38.101609", "version": "20250617.10.38.101609+5dff57a"}
+{"name": "certora-cli-alpha-master", "tag": "", "branch": "master", "commit": "83b38e8", "timestamp": "20250618.12.44.279419", "version": "20250618.12.44.279419+83b38e8"}