astreum 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

astreum/models/merkle.py

@@ -2,18 +2,10 @@ from __future__ import annotations
 
 from typing import Callable, Dict, List, Optional, Tuple
 
-import blake3  # type: ignore
+import blake3
 from ..format import encode, decode
 
 class MerkleNode:
-    """A node in a binary Merkle tree.
-
-    *Leaf*  : ``value`` is **not** ``None``.
-    *Interior*: ``value`` is ``None``.
-    """
-
-    __slots__ = ("left", "right", "value", "_hash")
-
     def __init__(
         self,
         left: Optional[bytes],
@@ -25,9 +17,6 @@ class MerkleNode:
         self.value = value
         self._hash: Optional[bytes] = None
 
-    # ------------------------------------------------------------------
-    # serialisation helpers
-    # ------------------------------------------------------------------
     def to_bytes(self) -> bytes:
         return encode([self.left, self.right, self.value])
 
@@ -36,11 +25,8 @@ class MerkleNode:
         left, right, value = decode(blob)
         return cls(left, right, value)
 
-    # ------------------------------------------------------------------
-    # content hash (blake3)
-    # ------------------------------------------------------------------
     def _compute_hash(self) -> bytes:
-        if self.value is not None:  # leaf
+        if self.value is not None:
             return blake3.blake3(self.value).digest()
         left = self.left or b""
         right = self.right or b""
@@ -52,21 +38,7 @@ class MerkleNode:
         return self._hash
 
 
-# ─────────────────────────────────────────────────────────────────────────────
-# Merkle tree – fixed‑height, no dynamic growth
-# ─────────────────────────────────────────────────────────────────────────────
-
-
 class MerkleTree:
-    """Binary Merkle tree addressed by *leaf position* (0‑based).
-
-    * The number of levels is fixed once the tree is built (``_height``).
-    * ``put`` can **only update** existing leaves; it never adds capacity.
-    """
-
-    # ------------------------------------------------------------------
-    # construction helpers
-    # ------------------------------------------------------------------
     def __init__(
         self,
         node_get: Callable[[bytes], Optional[bytes]],
@@ -84,11 +56,6 @@ class MerkleTree:
         leaves: List[bytes],
         node_get: Callable[[bytes], Optional[bytes]] | None = None,
     ) -> "MerkleTree":
-        """Build a complete tree from *leaves* (left‑to‑right order).
-
-        Missing right siblings in the top levels are allowed; they are encoded
-        as interior nodes with a single child.
-        """
         if not leaves:
             raise ValueError("must supply at least one leaf")
 
@@ -125,9 +92,6 @@ class MerkleTree:
         tree._height = height
         return tree
 
-    # ------------------------------------------------------------------
-    # internal helpers
-    # ------------------------------------------------------------------
     def _fetch(self, h: bytes | None) -> Optional[MerkleNode]:
         if h is None:
             return None
@@ -141,11 +105,10 @@ class MerkleTree:
         return node
 
     def _invalidate(self, node: MerkleNode) -> None:
-        node._hash = None  # type: ignore[attr-defined]
+        node._hash = None
 
     def _ensure_height(self) -> None:
         if self._height is None:
-            # Recompute by traversing leftmost branch
             h = 0
             nh = self.root_hash
             while nh is not None:
@@ -186,11 +149,7 @@ class MerkleTree:
         return leaf.value if leaf else None
 
     def put(self, index: int, value: bytes) -> None:
-        """Overwrite *value* at existing leaf *index*.
-
-        Raises ``IndexError`` if *index* is outside current capacity **or** if
-        the path to that leaf is missing in the stored structure.
-        """
+        # 1 . input validation
         if index < 0:
             raise IndexError("negative index")
         if self.root_hash is None:
@@ -198,6 +157,7 @@ class MerkleTree:
         if index >= self._capacity():
             raise IndexError("index beyond tree capacity")
 
+        # 2 . walk down to the target leaf
         node_hash = self.root_hash
         stack: List[Tuple[MerkleNode, bytes, bool]] = []
         for bit in self._path_bits(index):
@@ -207,28 +167,39 @@ class MerkleTree:
             went_right = bool(bit)
             child_hash = node.right if went_right else node.left
             if child_hash is None:
-                raise IndexError("path leads into non‑existent branch")
+                raise IndexError("path leads into non-existent branch")
             stack.append((node, node.hash(), went_right))
             node_hash = child_hash
 
+        # 3 . update the leaf
         leaf = self._fetch(node_hash)
         if leaf is None or leaf.value is None:
             raise IndexError("target leaf missing")
+
+        old_hash = leaf.hash()
         leaf.value = value
         self._invalidate(leaf)
         new_hash = leaf.hash()
+        
+        if new_hash != old_hash:
+            self.nodes.pop(old_hash, None)
         self.nodes[new_hash] = leaf
-
-        # bubble updated hashes
+        
+        # 4 . bubble the change up
         for parent, old_hash, went_right in reversed(stack):
             if went_right:
                 parent.right = new_hash
             else:
                 parent.left = new_hash
+
             self._invalidate(parent)
             new_hash = parent.hash()
+
             if new_hash != old_hash:
-                del self.nodes[old_hash]
-                self.nodes[new_hash] = parent
+                self.nodes.pop(old_hash, None)
+            self.nodes[new_hash] = parent
+            
+        # 5 . finalise the new root
         self.root_hash = new_hash
 
+

astreum/models/patricia.py

@@ -195,9 +195,12 @@ class PatriciaTrie:
 
             # 4.3 – matched entire key → update value
             if key_pos == total_bits:
-                self._invalidate_hash(node)
+                old_hash = node.hash()
                 node.value = value
+                self._invalidate_hash(node)
                 new_hash = node.hash()
+                if new_hash != old_hash:
+                    self.nodes.pop(old_hash, None)
                 self.nodes[new_hash] = node
                 self._bubble(stack, new_hash)
                 return
@@ -233,12 +236,12 @@ class PatriciaTrie:
         value: bytes,
         stack: List[Tuple[PatriciaNode, bytes, int]],
     ) -> None:
-        # key_pos points to routing bit; leaf stores the rest after that bit
         tail_len = len(key) * 8 - (key_pos + 1)
         tail_bits, tail_len = self._bit_slice(key, key_pos + 1, tail_len)
         leaf = self._make_node(tail_bits, tail_len, value, None, None)
 
-        # attach to parent
+        old_parent_hash = parent.hash()
+        
         if dir_bit:
             parent.child_1 = leaf.hash()
         else:
@@ -246,9 +249,12 @@ class PatriciaTrie:
 
         self._invalidate_hash(parent)
         new_parent_hash = parent.hash()
+        if new_parent_hash != old_parent_hash:
+            self.nodes.pop(old_parent_hash, None)
         self.nodes[new_parent_hash] = parent
         self._bubble(stack, new_parent_hash)
 
+
     def _split_and_insert(
         self,
         node: PatriciaNode,
@@ -277,10 +283,14 @@ class PatriciaTrie:
             lcp + 1,                       # start *after* divergence bit
             node.key_len - lcp - 1         # may be zero
         )
+        old_node_hash = node.hash()
+
         node.key = old_suffix_bits
         node.key_len = old_suffix_len
         self._invalidate_hash(node)
         new_node_hash = node.hash()
+        if new_node_hash != old_node_hash:
+            self.nodes.pop(old_node_hash, None)
         self.nodes[new_node_hash] = node
 
         # ➍—new leaf for the key being inserted (unchanged)
@@ -341,15 +351,21 @@ class PatriciaTrie:
         """
         while stack:
             parent, old_hash, dir_bit = stack.pop()
+
             if dir_bit == 0:
                 parent.child_0 = new_hash
             else:
                 parent.child_1 = new_hash
+
             self._invalidate_hash(parent)
             new_hash = parent.hash()
+            if new_hash != old_hash:
+                self.nodes.pop(old_hash, None)
             self.nodes[new_hash] = parent
+            
         self.root_hash = new_hash
 
+
     def _bit_slice(
         self,
         buf: bytes,

{astreum-0.2.18.dist-info → astreum-0.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.18
+Version: 0.2.20
 Summary: Python library to interact with the Astreum blockchain and its Lispeum virtual machine.
 Author-email: "Roy R. O. Okello" <roy@stelar.xyz>
 Project-URL: Homepage, https://github.com/astreum/lib

{astreum-0.2.18.dist-info → astreum-0.2.20.dist-info}/RECORD

@@ -12,11 +12,11 @@ astreum/lispeum/tokenizer.py,sha256=J-I7MEd0r2ZoVqxvRPlu-Afe2ZdM0tKXXhf1R4SxYTo,
 astreum/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/models/account.py,sha256=sHujGSwtV13rvOGJ5LZXuMrJ4F9XUdvyuWKz-zJ9lkE,2986
 astreum/models/block.py,sha256=YIY3qLneFM7OooY29khLDEs3NIEA7y8VhlXitflkxTo,4564
-astreum/models/merkle.py,sha256=E850dITZmuQS2LmQt2yA_luy0a3QjHgSbL2ibQAmYJc,8627
-astreum/models/patricia.py,sha256=WtfwVufZazFTOjVDnSDI0I3ghetm3GBzAwqNQevOlJ8,12974
+astreum/models/merkle.py,sha256=merV3rx2iRfzvglV6gNusrJf7OMbcVV854T-DUWCC64,6733
+astreum/models/patricia.py,sha256=ohmXrcaz7Ae561tyC4u4iPOkQPkKr8N0IWJek4upFIg,13392
 astreum/models/transaction.py,sha256=yBarvRK2ybMAHHEQPZpubGO7gms4U9k093xQGNQHQ4Q,3043
-astreum-0.2.18.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.18.dist-info/METADATA,sha256=FlvqUo_qpvlxbOzKHONdWYS00SwvCUopk73M1A4AyRA,5478
-astreum-0.2.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.18.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.18.dist-info/RECORD,,
+astreum-0.2.20.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.20.dist-info/METADATA,sha256=rX7NJZZEC1nqxcg84iHqzFg1wY-PB7aF3eePbLXUu9Q,5478
+astreum-0.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.20.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.20.dist-info/RECORD,,