astreum 0.2.42__py3-none-any.whl → 0.2.43__py3-none-any.whl

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

@@ -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.dist-info → astreum-0.2.43.dist-info}/RECORD

@@ -1,5 +1,5 @@
 astreum/__init__.py,sha256=9tzA27B_eG5wRF1SAWJIV7xTmCcR1QFc123b_cvFOa4,345
-astreum/_node.py,sha256=3fpfULVs3MrPBR-ymlvPyuZMi8lv0a8JBnxPb2oFOTU,2214
+astreum/_node.py,sha256=Nyb4NZWWDjfCcIgljWIDAGyX5QTMr1lwBirnWzg13hQ,2642
 astreum/format.py,sha256=X4tG5GGPweNCE54bHYkLFiuLTbmpy5upO_s1Cef-MGA,2711
 astreum/node.py,sha256=MmlK3jaANTMB3ZAxR8IaSc82OS9meJmVawYIVURADbg,39689
 astreum/_communication/__init__.py,sha256=XJui0yOcfAur4HKt-8sSRlwB-MSU1rchkuOAY-nKDOE,207
@@ -10,19 +10,19 @@ astreum/_communication/route.py,sha256=fbVXY0xF3O-k7dY9TuCsr6_XxD3m7Cb9ugVacQZ6G
 astreum/_communication/setup.py,sha256=TzXpc8dajV31BJhHQMMcb5UdaFrxb1xlYSj58vc_5mg,9072
 astreum/_communication/util.py,sha256=bJ3td3naDzmCelAJQpLwiDMoRBkijQl9YLROjsWyOrI,1256
 astreum/_consensus/__init__.py,sha256=gOCpvnIeO17CGjUGr0odaKNvGEggmDRXfT5IuyrYtcM,376
-astreum/_consensus/account.py,sha256=XCBWRapmFMrLCzz0wLtuuIaDRyNN9IKyOGc4dEl8W0s,3294
+astreum/_consensus/account.py,sha256=ClMB1e07ky5Wf7BwR4yhEjTSaWK2wiCmpvzio9AsZAY,3295
 astreum/_consensus/accounts.py,sha256=zGq2BCMJPtD_lzcj4jqMzB2Foc3ptxXSPhc9zypB1T0,1106
-astreum/_consensus/block.py,sha256=v6U2y8br9PVKGn0Q8fLVOtEODlXayPtEd_Wqprem_TU,12358
+astreum/_consensus/block.py,sha256=HybdVcV1D9f1wUE9XeFRnCGF9HH8YI1bgo-y1h-RS5o,12342
 astreum/_consensus/chain.py,sha256=WwUeLrdg7uj--ZsUxse6xFlzO2QeQQggyKSL49KhfU0,2768
 astreum/_consensus/fork.py,sha256=dK5DtT9hWCj_rQs6MS1c1bcGBbkgVTBPIOudYbqS9vw,3825
 astreum/_consensus/genesis.py,sha256=oED7AHw0fPJgMu0OmhbbikJcbItw_bxVBVU8RlB2rJM,4766
 astreum/_consensus/receipt.py,sha256=GPLspqVJHnyBr1cKmBoClsJyeEUecYmg3_acz4L4rRo,6031
 astreum/_consensus/setup.py,sha256=agwqfOemdLqE0Z1zrPV2XHVmZ9sAxp8Bh4k6e2u-t8w,2385
-astreum/_consensus/transaction.py,sha256=VRp06ExbjAebiPcTZEX7PH-zwjzy4CLcf5kclyooL1k,7475
+astreum/_consensus/transaction.py,sha256=q9r0nQzB_67dV-9cIThCzpiJkTojP--8QENPOKxN5yw,7481
 astreum/_consensus/workers/__init__.py,sha256=bS5FjbevbIR5FHbVGnT4Jli17VIld_5auemRw4CaHFU,278
 astreum/_consensus/workers/discovery.py,sha256=X1yjKGjLSApMJ9mgWbnc7N21ALD09khDf-in-M45Mis,1683
 astreum/_consensus/workers/validation.py,sha256=WcHLOs2NLMTrJpErghBXWeW2aqtX3-xGPo-HcySdEZ8,4814
-astreum/_consensus/workers/verify.py,sha256=uqmf2UICj_eBFeGDpGyzKQLtz9qeCbOtz5euwNqkZmw,1924
+astreum/_consensus/workers/verify.py,sha256=wNkfh5qMARew79B-yyGL2UiExaSoGpOIq0fXUkDzpdw,1925
 astreum/_lispeum/__init__.py,sha256=LAy2Z-gBBQlByBHRGUKaaQrOB7QzFEEyGRtInmwTpfU,304
 astreum/_lispeum/environment.py,sha256=pJ0rjp9GoQxHhDiPIVei0jP7dZ_Pznso2O_tpp94-Ik,328
 astreum/_lispeum/expression.py,sha256=io8tbCer_1TJee77yRbcNI5q-DPFGa8xZiC80tGvRRQ,1063
@@ -33,7 +33,7 @@ astreum/_lispeum/parser.py,sha256=WOW3sSZWkIzPEy3fYTyl0lrtkMxHL9zRrNSYztPDemQ,22
 astreum/_lispeum/tokenizer.py,sha256=P68uIj4aPKzjuCJ85jfzRi67QztpuXIOC1vvLQueBI4,552
 astreum/_storage/__init__.py,sha256=EmKZNAZmo3UVE3ekOOuckwFnBVjpa0Sy8Oxg72Lgdxc,53
 astreum/_storage/atom.py,sha256=YFjvfMhniInch13iaKGpw4CCxxgyWonniryb-Rfse4A,4177
-astreum/_storage/patricia.py,sha256=Eh8AO2_J8WCai4kyuML_0Jb_zntgGlq-VPljnSjss10,14851
+astreum/_storage/patricia.py,sha256=7kvhW8RJWZ_EOHjNgEHue2E60FeQfJaKWtLIbM-6G2E,14853
 astreum/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/crypto/ed25519.py,sha256=FRnvlN0kZlxn4j-sJKl-C9tqiz_0z4LZyXLj3KIj1TQ,1760
 astreum/crypto/quadratic_form.py,sha256=pJgbORey2NTWbQNhdyvrjy_6yjORudQ67jBz2ScHptg,4037
@@ -47,8 +47,8 @@ astreum/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/storage/object.py,sha256=knFlvw_tpcC4twSu1DGNpHX31wlANN8E5dgEqIfU--Q,2041
 astreum/storage/setup.py,sha256=1-9ztEFI_BvRDvAA0lAn4mFya8iq65THTArlj--M3Hg,626
 astreum/utils/integer.py,sha256=iQt-klWOYVghu_NOT341MmHbOle4FDT3by4PNKNXscg,736
-astreum-0.2.42.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.42.dist-info/METADATA,sha256=xb_Bi75R1izIliHmHZQiJ93TxWPn6l9Z9EiN4IqVTAc,6181
-astreum-0.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.42.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.42.dist-info/RECORD,,
+astreum-0.2.43.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.43.dist-info/METADATA,sha256=IjEYvHsaHI08xcD8hrZ5Pn9EZmwEPTNErSTqmv18t7Q,6181
+astreum-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.43.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.43.dist-info/RECORD,,