astreum 0.2.19__py3-none-any.whl → 0.2.21__py3-none-any.whl

astreum/models/accounts.py

@@ -0,0 +1,80 @@
+"""Account‐state management built on a PatriciaTrie.
+
+Only the *initial skeleton* is provided here per current request:
+  • __init__: wrap an existing trie root (or start empty).
+  • get_account: look up an Account object, using a cache so multiple
+    balance/nonce updates in one block operate on the same instance.
+
+Additional mutation helpers (set_account, change_balance, etc.) will be
+added next, once confirmed.
+"""
+from __future__ import annotations
+
+from typing import Dict, Optional, Callable
+
+from .patricia import PatriciaTrie
+from .account import Account
+
+
+class Accounts:
+    """Light wrapper around a PatriciaTrie (address → body_hash) plus
+    an in‑memory cache of Account objects currently being worked on.
+    """
+
+    # ------------------------------------------------------------
+    # construction
+    # ------------------------------------------------------------
+    def __init__(
+        self,
+        root_hash: Optional[bytes] = None,
+        *,
+        get_node_fn: Optional[Callable[[bytes], Optional[bytes]]] = None,
+    ) -> None:
+        """Wrap an existing state trie *or* start empty (root_hash=None).
+
+        `get_node_fn` (optional) is a callback that retrieves raw node bytes
+        when the underlying PatriciaTrie encounters an unknown hash – useful
+        for disk or network-backed light clients.
+        """
+        self._remote_get = get_node_fn
+        # Instantiate the trie; we pass the external fetcher straight in.
+        # PatriciaTrie is expected to accept `node_get` and `root_hash`.
+        self._trie = PatriciaTrie(node_get=get_node_fn, root_hash=root_hash)
+
+        # Working‑set cache: address → Account instance
+        self._cache: Dict[bytes, Account] = {}
+
+    # ------------------------------------------------------------
+    # public introspection
+    # ------------------------------------------------------------
+    @property
+    def root_hash(self) -> Optional[bytes]:
+        """Current trie root (updates automatically after puts)."""
+        return self._trie.root_hash
+
+    # ------------------------------------------------------------
+    # account access – read‑only for now
+    # ------------------------------------------------------------
+    def get_account(self, address: bytes) -> Optional[Account]:
+        """Return an *Account* for `address`, or *None* if it doesn't exist.
+
+        • First check the in‑memory cache (so repeat reads/updates reuse the
+          same object).
+        • Otherwise look up `body_hash` in the PatriciaTrie.
+        • If found, create a lightweight `Account` wrapper, cache it, and
+          return it.  The Account is initialised with the same external
+          node‑fetcher so its own Merkle lookups can go remote if needed.
+        """
+        # cache hit → hot path
+        if address in self._cache:
+            return self._cache[address]
+
+        # trie lookup (raw body_hash)
+        body_hash: Optional[bytes] = self._trie.get(address)
+        if body_hash is None:
+            return None
+
+        # wrap in Account and cache
+        acc = Account(body_hash, get_node_fn=self._remote_get)
+        self._cache[address] = acc
+        return acc

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.19.dist-info → astreum-0.2.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.19
+Version: 0.2.21
 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.19.dist-info → astreum-0.2.21.dist-info}/RECORD

@@ -11,12 +11,13 @@ astreum/lispeum/parser.py,sha256=jQRzZYvBuSg8t_bxsbt1-WcHaR_LPveHNX7Qlxhaw-M,116
 astreum/lispeum/tokenizer.py,sha256=J-I7MEd0r2ZoVqxvRPlu-Afe2ZdM0tKXXhf1R4SxYTo,1429
 astreum/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/models/account.py,sha256=sHujGSwtV13rvOGJ5LZXuMrJ4F9XUdvyuWKz-zJ9lkE,2986
+astreum/models/accounts.py,sha256=-To0l_COBa9A4hA1zNVvtxCbnKOT4O0bcj_CUMfXQFo,3283
 astreum/models/block.py,sha256=YIY3qLneFM7OooY29khLDEs3NIEA7y8VhlXitflkxTo,4564
 astreum/models/merkle.py,sha256=merV3rx2iRfzvglV6gNusrJf7OMbcVV854T-DUWCC64,6733
-astreum/models/patricia.py,sha256=WtfwVufZazFTOjVDnSDI0I3ghetm3GBzAwqNQevOlJ8,12974
+astreum/models/patricia.py,sha256=ohmXrcaz7Ae561tyC4u4iPOkQPkKr8N0IWJek4upFIg,13392
 astreum/models/transaction.py,sha256=yBarvRK2ybMAHHEQPZpubGO7gms4U9k093xQGNQHQ4Q,3043
-astreum-0.2.19.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.19.dist-info/METADATA,sha256=tnkbLG0OS3__mZJ9T7giW36HKeJxEseV4CxQeF_YBW0,5478
-astreum-0.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.19.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.19.dist-info/RECORD,,
+astreum-0.2.21.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.21.dist-info/METADATA,sha256=naZ-ipusDSvUJg4oNgtVFC2F8oMCrHu0R6ge66lU1cQ,5478
+astreum-0.2.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.21.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.21.dist-info/RECORD,,