astreum 0.2.42__tar.gz → 0.2.43__tar.gz

{astreum-0.2.42/src/astreum.egg-info → astreum-0.2.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.42
+Version: 0.2.43
 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.42 → astreum-0.2.43}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "astreum"
-version = "0.2.42"
+version = "0.2.43"
 authors = [
   { name="Roy R. O. Okello", email="roy@stelar.xyz" },
 ]

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_consensus/account.py

@@ -33,7 +33,7 @@ class Account:
 
     @classmethod
     def from_atom(cls, node: Any, account_id: bytes) -> "Account":
-        storage_get = node._local_get
+        storage_get = node.storage_get
 
         type_atom = storage_get(account_id)
         if type_atom is None or type_atom.data != b"account":

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_consensus/block.py

@@ -186,9 +186,9 @@ class Block:
         if callable(source):
             storage_get = source
         else:
-            storage_get = getattr(source, "_local_get", None)
+            storage_get = source.storage_get
         if not callable(storage_get):
-            raise TypeError("Block.from_atom requires a node with '_local_get' or a callable storage getter")
+            raise TypeError("Block.from_atom requires a node with 'storage_get' or a callable storage getter")
         # 1) Expect main list
         main_typ = storage_get(block_id)
         if main_typ is None or main_typ.data != b"list":

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_consensus/transaction.py

@@ -76,7 +76,7 @@ class Transaction:
         node: Any,
         transaction_id: bytes,
     ) -> Transaction:
-        storage_get = node._local_get
+        storage_get = node.storage_get
         if not callable(storage_get):
             raise NotImplementedError("node does not expose a storage getter")
 
@@ -204,7 +204,7 @@ def apply_transaction(node: Any, block: object, transaction_hash: bytes) -> None
 
     block.accounts.set_account(address=recipient_account)
 
-    block.transactions.append(transaction)
+    block.transactions.append(transaction_hash)
 
     receipt = Receipt(
         transaction_hash=bytes(transaction_hash),

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_consensus/workers/verify.py

@@ -17,7 +17,7 @@ def _process_peers_latest_block(
         fk.head for fk in node.forks.values() if fk.head != latest_block_hash
     }
 
-    new_fork.validate(storage_get=node._local_get, stop_heads=current_fork_heads)
+    new_fork.validate(storage_get=node.storage_get, stop_heads=current_fork_heads)
 
     if new_fork.validated_upto and new_fork.validated_upto in node.forks:
         ref = node.forks[new_fork.validated_upto]

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_node.py

@@ -25,9 +25,9 @@ class Node:
             communication_setup(node=self, config=config)
         except Exception:
             pass
-        try:
-            from astreum._consensus import consensus_setup  # type: ignore
-            consensus_setup(node=self)
+        try:
+            from astreum._consensus import consensus_setup  # type: ignore
+            consensus_setup(node=self)
         except Exception:
             pass
 
@@ -56,3 +56,15 @@ class Node:
     def _local_set(self, key: bytes, value: Atom) -> None:
         with self.in_memory_storage_lock:
             self.in_memory_storage[key] = value
+
+    def _network_get(self, key: bytes) -> Optional[Atom]:
+        # locate storage provider
+        # query storage provider
+        return None
+
+    def storage_get(self, key: bytes) -> Optional[Atom]:
+        """Retrieve an Atom by checking local storage first, then the network."""
+        atom = self._local_get(key)
+        if atom is not None:
+            return atom
+        return self._network_get(key)

{astreum-0.2.42 → astreum-0.2.43}/src/astreum/_storage/patricia.py

@@ -87,7 +87,7 @@ class PatriciaNode:
         hops = 0
 
         while current != ZERO32 and hops < 4:
-            atom = node._local_get(current)
+            atom = node.storage_get(current)
             if atom is None:
                 raise ValueError("missing atom while decoding Patricia node")
             entries.append(atom.data)
@@ -163,7 +163,7 @@ class PatriciaTrie:
         if cached is not None:
             return cached
 
-        if storage_node._local_get(h) is None:
+        if storage_node.storage_get(h) is None:
             return None
 
         pat_node = PatriciaNode.from_atoms(storage_node, h)

{astreum-0.2.42 → astreum-0.2.43/src/astreum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.2.42
+Version: 0.2.43
 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