ccf 7.0.0.dev4__py3-none-any.whl → 7.0.0.dev6__py3-none-any.whl

ccf/ledger.py

@@ -956,7 +956,13 @@ class LedgerChunk:
 
         # If the ledger chunk is not yet committed, the ledger header will be empty.
         # Default to reading the file size instead.
+        full_file_size = os.path.getsize(name)
         if self._pos_offset > 0:
+            if self._pos_offset > full_file_size:
+                raise ValueError(
+                    f"Invalid ledger chunk {name}: File header claims offset table is at {self._pos_offset}, yet file is only {full_file_size} bytes"
+                )
+
             self._file_size = self._pos_offset
 
             positions_buffer = _peek_all(self._file, self._pos_offset)
@@ -978,6 +984,14 @@ class LedgerChunk:
 
         self.start_seqno, self.end_seqno = range_from_filename(name)
 
+        if self.end_seqno is not None:
+            tx_count_from_filename = self.end_seqno - self.start_seqno + 1
+            tx_count_from_positions = len(self._positions)
+            if tx_count_from_filename != tx_count_from_positions:
+                raise ValueError(
+                    f"Invalid ledger chunk {name}: Expected to contain {tx_count_from_filename} transactions due to filename, but found {tx_count_from_positions} by reading file"
+                )
+
     def __getitem__(self, key):
         if isinstance(key, int):
             position = self._positions[key]

ccf/ledger_viz.py

@@ -4,11 +4,29 @@
 import ccf.ledger
 import argparse
 import os
-from stringcolor import cs  # type: ignore
 import json
 from typing import Optional
 
 
+COLORS = {
+    "Black": 40,
+    "Red": 41,
+    "Green": 42,
+    "Yellow": 43,
+    "Blue": 44,
+    "Magenta": 45,
+    "Cyan": 46,
+    "White": 47,
+    "Grey": 100,
+}
+
+
+def cs(s: str, background_colour: Optional[str] = None) -> str:
+    if background_colour is not None and background_colour in COLORS:
+        return f"\033[{COLORS[background_colour]}m{s}\033[0m"
+    return s
+
+
 class Liner:
     _line = ""
     _len = 0
@@ -19,8 +37,8 @@ class Liner:
         self._line = ""
         self._len = 0
 
-    def append(self, s: str, colour: str, background_colour: Optional[str] = None):
-        self._line += cs(s, colour, background_colour)
+    def append(self, s: str, background_colour: Optional[str] = None):
+        self._line += cs(s, background_colour)
         self._len += len(s)
         if self._len >= self.MAX_LENGTH:
             self.flush()
@@ -28,17 +46,16 @@ class Liner:
 
 class DefaultLiner(Liner):
     _bg_colour_mapping = {
-        "New Service": "White",
-        "Recovering Service": "Grey",
-        "Service Open": "Magenta",
-        "Governance": "Red",
+        "New Service": "Black",
+        "Recovering Service": "Red",
+        "Service Open": "White",
+        "Governance": "Yellow",
         "Signature": "Green",
-        "Internal": "Orange",
+        "Internal": "Magenta",
         "User Public": "Blue",
-        "User Private": "DarkBlue",
+        "User Private": "Cyan",
     }
     _last_view = None
-    _fg_colour = "Black"
 
     @staticmethod
     def view_to_char(view):
@@ -69,27 +86,20 @@ class DefaultLiner(Liner):
         if self.write_views:
             char = "‾" if not view_change else self.view_to_char(view)
 
-        fg_colour = self._fg_colour
         bg_colour = self._bg_colour_mapping[category]
-        self.append(char, fg_colour, bg_colour)
+        self.append(char, bg_colour)
 
     def help(self):
         print(
             " | ".join(
                 [
-                    f"{category} {cs(' ', 'White', bg_colour)}"
+                    f"{category} {cs(' ', bg_colour)}"
                     for category, bg_colour in self._bg_colour_mapping.items()
                 ]
             )
         )
         if self.write_views:
-            print(
-                " ".join(
-                    [
-                        f"Start of view 3: {cs(self.view_to_char(3), self._fg_colour, 'DarkGrey')}"
-                    ]
-                )
-            )
+            print(" ".join([f"Start of view 3: {cs(self.view_to_char(3), 'Grey')}"]))
         print()
 
 

ccf/read_ledger.py

@@ -9,8 +9,6 @@ import argparse
 from datetime import datetime
 from enum import Enum, auto
 
-from loguru import logger as LOG
-
 
 class PrintMode(Enum):
     Quiet = auto()
@@ -93,9 +91,9 @@ def print_key(key, table_name, tables_format_rules, indent_s, is_removed=False):
     k = find_rule(tables_format_rules, table_name)["key"](key)
 
     if is_removed:
-        LOG.error(f"{indent_s}Removed {k}")
+        print(f"{indent_s}Removed {k}")
     else:
-        LOG.info(f"{indent_s}{k}:")
+        print(f"{indent_s}{k}:")
 
 
 def counted_string(string, name):
@@ -113,22 +111,20 @@ def dump_entry(entry, table_filter, tables_format_rules):
     private_table_size = entry.get_private_domain_size()
     if private_table_size and table_filter is None:
         if not printed_tx_header:
-            LOG.success(tx_header)
+            print(tx_header)
             printed_tx_header = True
 
-        LOG.error(f"{indent(2)}-- private: {private_table_size} bytes")
+        print(f"{indent(2)}-- private: {private_table_size} bytes")
 
     for table_name, records in public_tables.items():
         if table_filter is not None and not table_filter.match(table_name):
             continue
 
         if not printed_tx_header:
-            LOG.success(tx_header)
+            print(tx_header)
             printed_tx_header = True
 
-        LOG.warning(
-            f'{indent(4)}table "{table_name}" ({counted_string(records, "write")}):'
-        )
+        print(f'{indent(4)}table "{table_name}" ({counted_string(records, "write")}):')
         key_indent = indent(6)
         value_indent = indent(8)
         for key, value in records.items():
@@ -142,7 +138,7 @@ def dump_entry(entry, table_filter, tables_format_rules):
                     pass
                 finally:
                     print_key(key, table_name, tables_format_rules, key_indent)
-                    LOG.info(f"{value_indent}{value}")
+                    print(f"{value_indent}{value}")
             else:
                 print_key(
                     key, table_name, tables_format_rules, key_indent, is_removed=True
@@ -171,7 +167,7 @@ def run(
     if is_snapshot:
         snapshot_file = paths[0]
         with ccf.ledger.Snapshot(snapshot_file) as snapshot:
-            LOG.info(
+            print(
                 f"Reading snapshot from {snapshot_file} ({'' if snapshot.is_committed() else 'un'}committed)"
             )
             dump_entry(snapshot, table_filter, tables_format_rules)
@@ -187,12 +183,12 @@ def run(
             read_recovery_files=read_recovery_files,
         )
 
-        LOG.info(f"Reading ledger from {ledger_paths}")
-        LOG.info(f"Contains {counted_string(ledger, 'chunk')}")
+        print(f"Reading ledger from {ledger_paths}")
+        print(f"Contains {counted_string(ledger, 'chunk')}")
 
         try:
             for chunk in ledger:
-                LOG.info(
+                print(
                     f"chunk {chunk.filename()} ({'' if chunk.is_committed() else 'un'}committed)"
                 )
                 for transaction in chunk:
@@ -208,28 +204,22 @@ def run(
                     if validator:
                         validator.add_transaction(transaction)
         except Exception as e:
-            LOG.exception(f"Error parsing ledger: {e}")
+            print(f"Error parsing ledger: {e}")
             has_error = True
         else:
-            LOG.success("Ledger verification complete")
+            print("Ledger verification complete")
             has_error = False
         finally:
             if not validator:
-                LOG.warning("Skipped ledger integrity verification")
+                print("Skipped ledger integrity verification")
             else:
-                LOG.info(
+                print(
                     f"Found {validator.signature_count} signatures, and verified until {validator.last_verified_txid()}"
                 )
         return not has_error
 
 
 def main():
-    LOG.remove()
-    LOG.add(
-        sys.stdout,
-        format="<level>{message}</level>",
-    )
-
     parser = argparse.ArgumentParser(
         description="Read CCF ledger or snapshot",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,

ccf/split_ledger.py

@@ -6,8 +6,6 @@ import argparse
 import os
 from typing import BinaryIO, List
 
-from loguru import logger as LOG
-
 DEFAULT_OUTPUT_DIR_NAME = "split_ledger"
 TEMPORARY_LEDGER_FILE_NAME = "ledger.tmp"
 
@@ -58,7 +56,7 @@ def close_ledger_file(
         ledger_file.name,
         os.path.join(os.path.dirname(ledger_file.name), final_file_name),
     )
-    LOG.info(f"Wrote new ledger file: {final_file_name} (complete: {complete_file})")
+    print(f"Wrote new ledger file: {final_file_name} (complete: {complete_file})")
 
 
 def run(args_):
@@ -92,10 +90,10 @@ def run(args_):
     ledger_file_input = ccf.ledger.LedgerChunk(args.path)
     is_input_file_complete = ledger_file_input.is_complete()
     is_input_file_committed = ledger_file_input.is_committed()
-    LOG.info(
+    print(
         f"Splitting ledger file {args.path} (complete: {is_input_file_complete}/committed: {is_input_file_committed}) at seqno {args.seqno}"
     )
-    LOG.info(f"Output directory: {args.output_dir}")
+    print(f"Output directory: {args.output_dir}")
 
     output_file = None
     found_target_seqno = False
@@ -130,7 +128,7 @@ def run(args_):
                 looking_for_following_signature = True
                 continue
 
-            LOG.debug(f"Found target seqno {args.seqno}")
+            print(f"Found target seqno {args.seqno}")
             found_target_seqno = True
             close_ledger_file(
                 output_file,
@@ -178,10 +176,4 @@ def run(args_):
 
 
 def main():
-    LOG.remove()
-    LOG.add(
-        sys.stdout,
-        format="<level>{message}</level>",
-    )
-
     run(sys.argv[1:])

ccf/verify_ledger_secrets_chain.py

@@ -6,8 +6,6 @@ import sys
 import json
 import argparse
 
-from loguru import logger as LOG
-
 
 def counted_string(string, name):
     return f"{len(string)} {name}{'s' * bool(len(string) != 1)}"
@@ -39,12 +37,12 @@ def run(paths, uncommitted=False):
         read_recovery_files=True,
     )
 
-    LOG.info(f"Reading ledger from {ledger_paths}")
-    LOG.info(f"Contains {counted_string(ledger, 'chunk')}")
+    print(f"Reading ledger from {ledger_paths}")
+    print(f"Contains {counted_string(ledger, 'chunk')}")
     try:
         previous_historical_ledger_entry = None
         for chunk in ledger:
-            LOG.info(
+            print(
                 f"chunk {chunk.filename()} ({'' if chunk.is_committed() else 'un'}committed)"
             )
             for transaction in chunk:
@@ -64,22 +62,19 @@ def run(paths, uncommitted=False):
                                 "txid": txid,
                                 "entry": json.loads(value.decode("utf-8")),
                             }
-                            LOG.info(json.dumps(entry))
+                            print(json.dumps(entry))
                             historical_secrets_invariant(
                                 entry, previous_historical_ledger_entry
                             )
                             previous_historical_ledger_entry = entry
 
     except Exception as e:
-        LOG.exception(f"Error parsing ledger: {e}")
+        print(f"Error parsing ledger: {e}")
         return False
     return True
 
 
 def main():
-    LOG.remove()
-    LOG.add(sys.stdout, format="<level>{message}</level>")
-
     parser = argparse.ArgumentParser(
         description="Verify that the ledger's secrets are valid",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,

{ccf-7.0.0.dev4.dist-info → ccf-7.0.0.dev6.dist-info}/METADATA

@@ -1,21 +1,19 @@
 Metadata-Version: 2.4
 Name: ccf
-Version: 7.0.0.dev4
+Version: 7.0.0.dev6
 Summary: Set of tools and utilities for the Confidential Consortium Framework (CCF)
 Author-email: CCF Team <CCF-Sec@microsoft.com>
 Project-URL: Homepage, https://github.com/microsoft/ccf
 Project-URL: Issues, https://github.com/microsoft/ccf/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: loguru==0.*,>=0.5
-Requires-Dist: cryptography<47,>=44
-Requires-Dist: string-color==1.*,>=1.2.1
-Requires-Dist: cwt==3.*,>=3.1.0
+Requires-Dist: cryptography<47,>=46
+Requires-Dist: cwt<4,>=3.2.0
 Requires-Dist: setuptools<81,>=74
-Requires-Dist: packaging<26,>=24
+Requires-Dist: packaging<26,>=25
 Dynamic: license-file
 
 # CCF Python

ccf-7.0.0.dev6.dist-info/RECORD

@@ -0,0 +1,21 @@
+ccf/__init__.py,sha256=7h-KCpYSfH_Z8x5CFAoDlHfY0wqRNqOn8vTsaGW8dGA,101
+ccf/_versionifier.py,sha256=17vUCXFp_VixNCuhBmMS9SCM74JnHR1OIZnMQSspSs4,2951
+ccf/cose.py,sha256=hueXb_gvswxRkDAcUacmSIdkfqAFegZIWkA66M4yKVk,14950
+ccf/ledger.py,sha256=B0AmyrEU5JPkc0YJqnyhzV2Cipr_ckHPxFe64jXE_0k,43011
+ccf/ledger_code.py,sha256=_malocCXly7TdBwBt8ldY6_yNfFwvyCb5Zkp8T4t9fg,3859
+ccf/ledger_viz.py,sha256=D7eTZVry8mNkAdPuJq0aaP2iy4zAj4xbkoV7kilYUT4,6525
+ccf/merkletree.py,sha256=JHUnGYYHJfi18YUNGiHmNCa1AwmCAwLAN3ias5j61ws,2931
+ccf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ccf/read_ledger.py,sha256=ih_wk6_71SS37a4inLTYLdkZZ6-rDrqgB864t780nME,9147
+ccf/receipt.py,sha256=dySVvy-IqvsB8pj5uooIokbQR853vpT7uC0TQ-IWIQk,2765
+ccf/split_ledger.py,sha256=kUxGMUx6taBm6os_r1eay4Q0JXpgw8nJs7gcc1ZoJd0,5753
+ccf/tx_id.py,sha256=E7XJyUoJ-a8h7Fp36zNQdhSYdyuNdFV-r_aXhoWl1ks,736
+ccf/verify_ledger_secrets_chain.py,sha256=FC0Vil6IcHdZbFhh6c2tVjbFLMTHf8D59bF4sxLqgWQ,3459
+ccf-7.0.0.dev6.data/scripts/keygenerator.sh,sha256=r9i8rURcDUPU8c9NKkxrjweU1qU09Hv3SWc3IFQ648A,2391
+ccf-7.0.0.dev6.data/scripts/submit_recovery_share.sh,sha256=v1L_PjduUASCVYjOJiG7lDwtcSwQPOd3G2CY9ipSUXU,3289
+ccf-7.0.0.dev6.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+ccf-7.0.0.dev6.dist-info/METADATA,sha256=gJRDP-ETEyILSocdf50DejDHDyTzImqXMOo87N358pg,915
+ccf-7.0.0.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ccf-7.0.0.dev6.dist-info/entry_points.txt,sha256=3hbXI2LSOY06QitxM8GQqT9NwY7rCp1RtSU9gGG20A4,365
+ccf-7.0.0.dev6.dist-info/top_level.txt,sha256=I0tWtkKe6KRqXt0nIp8W-ln8j431-vDBb39bQGKkL9Q,4
+ccf-7.0.0.dev6.dist-info/RECORD,,

ccf-7.0.0.dev4.dist-info/RECORD

@@ -1,21 +0,0 @@
-ccf/__init__.py,sha256=7h-KCpYSfH_Z8x5CFAoDlHfY0wqRNqOn8vTsaGW8dGA,101
-ccf/_versionifier.py,sha256=17vUCXFp_VixNCuhBmMS9SCM74JnHR1OIZnMQSspSs4,2951
-ccf/cose.py,sha256=hueXb_gvswxRkDAcUacmSIdkfqAFegZIWkA66M4yKVk,14950
-ccf/ledger.py,sha256=X6ljpGPB8HJ6eAw9F3KkEz_meJpMbPALSr0Fbn6R_cg,42240
-ccf/ledger_code.py,sha256=_malocCXly7TdBwBt8ldY6_yNfFwvyCb5Zkp8T4t9fg,3859
-ccf/ledger_viz.py,sha256=l1p2wKgLDayxquVa9-yzsMcLx9vvygCV8EZ_PrVpvMg,6430
-ccf/merkletree.py,sha256=JHUnGYYHJfi18YUNGiHmNCa1AwmCAwLAN3ias5j61ws,2931
-ccf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ccf/read_ledger.py,sha256=UzmEKAMS2GJmwuaenKBJbkBDZIWeCa9xcXdpZB51SEg,9370
-ccf/receipt.py,sha256=dySVvy-IqvsB8pj5uooIokbQR853vpT7uC0TQ-IWIQk,2765
-ccf/split_ledger.py,sha256=wspNZUFPMSvMgGxmwP3QuSbx7QDzTjrC6ecFFJSp14o,5900
-ccf/tx_id.py,sha256=E7XJyUoJ-a8h7Fp36zNQdhSYdyuNdFV-r_aXhoWl1ks,736
-ccf/verify_ledger_secrets_chain.py,sha256=_UDc4wNro2mNUVbErDkhl24jLeJC0Vr-kECeZEdeHME,3590
-ccf-7.0.0.dev4.data/scripts/keygenerator.sh,sha256=r9i8rURcDUPU8c9NKkxrjweU1qU09Hv3SWc3IFQ648A,2391
-ccf-7.0.0.dev4.data/scripts/submit_recovery_share.sh,sha256=v1L_PjduUASCVYjOJiG7lDwtcSwQPOd3G2CY9ipSUXU,3289
-ccf-7.0.0.dev4.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-ccf-7.0.0.dev4.dist-info/METADATA,sha256=yppnqWwmlb_lb6yLX4KPgvdUutc8c7s6KJVrHVGAj2Q,991
-ccf-7.0.0.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ccf-7.0.0.dev4.dist-info/entry_points.txt,sha256=3hbXI2LSOY06QitxM8GQqT9NwY7rCp1RtSU9gGG20A4,365
-ccf-7.0.0.dev4.dist-info/top_level.txt,sha256=I0tWtkKe6KRqXt0nIp8W-ln8j431-vDBb39bQGKkL9Q,4
-ccf-7.0.0.dev4.dist-info/RECORD,,