astreum 0.2.37__py3-none-any.whl → 0.2.38__py3-none-any.whl

astreum/_communication/setup.py

@@ -1,7 +1,8 @@
 import socket, threading
 from queue import Queue
 from typing import Tuple, Optional
-from cryptography.hazmat.primitives.asymmetric import ed25519
+from cryptography.hazmat.primitives.asymmetric import ed25519
+from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric.x25519 import (
     X25519PrivateKey,
     X25519PublicKey,
@@ -67,10 +68,18 @@ def communication_setup(node: "Node", config: dict):
 
     # key loading
     node.relay_secret_key      = load_x25519(config.get('relay_secret_key'))
-    node.validation_secret_key = load_ed25519(config.get('validation_secret_key'))
-
-    # derive pubs + routes
-    node.relay_public_key      = node.relay_secret_key.public_key()
+    node.validation_secret_key = load_ed25519(config.get('validation_secret_key'))
+
+    # derive pubs + routes
+    node.relay_public_key      = node.relay_secret_key.public_key()
+    node.validation_public_key = (
+        node.validation_secret_key.public_key().public_bytes(
+            encoding=serialization.Encoding.Raw,
+            format=serialization.PublicFormat.Raw,
+        )
+        if node.validation_secret_key
+        else None
+    )
     node.peer_route, node.validation_route = make_routes(
         node.relay_public_key,
         node.validation_secret_key

astreum/_validation/setup.py

@@ -2,15 +2,38 @@ from __future__ import annotations
 
 import threading
 import time
-from queue import Queue, Empty
+from dataclasses import dataclass
+from queue import Empty, Queue
 from typing import Any, Dict, Optional, Tuple
 
+from cryptography.hazmat.primitives import serialization
+
 from .block import Block
 from .chain import Chain
 from .fork import Fork
 from .._storage.atom import ZERO32, Atom
 
 
+@dataclass
+class Transaction:
+    """Lightweight transaction view for validation processing."""
+
+    recipient: bytes
+    sender: bytes
+    amount: int
+    counter: int
+
+
+def current_validator(node: Any) -> bytes:
+    """Return the current validator identifier. Override downstream."""
+    raise NotImplementedError("current_validator must be implemented by the host node")
+
+
+def apply_transaction(node: Any, block: object, transaction_hash: bytes) -> None:
+    """Apply transaction to the candidate block. Override downstream."""
+    pass
+
+
 def validation_setup(node: Any) -> None:
     # Shared state
     node.validation_lock = getattr(node, "validation_lock", threading.RLock())
@@ -21,6 +44,10 @@ def validation_setup(node: Any) -> None:
     node.chains = getattr(node, "chains", {})
     node.forks = getattr(node, "forks", {})
 
+    # Pending transactions queue (hash-only entries)
+    node._validation_transaction_queue = getattr(
+        node, "_validation_transaction_queue", Queue()
+    )
     # Single work queue of grouped items: (latest_block_hash, set(peer_ids))
     node._validation_verify_queue = getattr(
         node, "_validation_verify_queue", Queue()
@@ -29,6 +56,14 @@ def validation_setup(node: Any) -> None:
         node, "_validation_stop_event", threading.Event()
     )
 
+    def enqueue_transaction_hash(tx_hash: bytes) -> None:
+        """Schedule a transaction hash for validation processing."""
+        if not isinstance(tx_hash, (bytes, bytearray)):
+            raise TypeError("transaction hash must be bytes-like")
+        node._validation_transaction_queue.put(bytes(tx_hash))
+
+    node.enqueue_transaction_hash = enqueue_transaction_hash
+
     def _process_peers_latest_block(latest_block_hash: bytes, peer_ids: set[Any]) -> None:
         """Assign a peer to a fork for its latest block without merging forks.
 
@@ -130,6 +165,46 @@ def validation_setup(node: Any) -> None:
                 except Exception:
                     pass
 
+    def _validation_worker() -> None:
+        """Consume pending transactions when scheduled to validate."""
+        stop = node._validation_stop_event
+        while not stop.is_set():
+            validation_public_key = getattr(node, "validation_public_key", None)
+            if not validation_public_key:
+                time.sleep(0.5)
+                continue
+
+            scheduled_validator = current_validator(node)
+
+            if scheduled_validator != validation_public_key:
+                time.sleep(0.5)
+                continue
+
+            try:
+                current_hash = node._validation_transaction_queue.get_nowait()
+            except Empty:
+                time.sleep(0.1)
+                continue
+
+            new_block = Block()
+            new_block.validator_public_key = getattr(node, "validation_public_key", None)
+            
+            while True:
+                try:
+                    apply_transaction(node, new_block, current_hash)
+                except NotImplementedError:
+                    node._validation_transaction_queue.put(current_hash)
+                    time.sleep(0.5)
+                    break
+                except Exception:
+                    # Skip problematic transaction; leave block as-is.
+                    pass
+
+                try:
+                    current_hash = node._validation_transaction_queue.get_nowait()
+                except Empty:
+                    break
+
     # Start workers as daemons
     node.validation_discovery_thread = threading.Thread(
         target=_discovery_worker, daemon=True, name="validation-discovery"
@@ -137,5 +212,10 @@ def validation_setup(node: Any) -> None:
     node.validation_verify_thread = threading.Thread(
         target=_verify_worker, daemon=True, name="validation-verify"
     )
+    node.validation_worker_thread = threading.Thread(
+        target=_validation_worker, daemon=True, name="validation-worker"
+    )
     node.validation_discovery_thread.start()
     node.validation_verify_thread.start()
+    if getattr(node, "validation_secret_key", None):
+        node.validation_worker_thread.start()

{astreum-0.2.37.dist-info → astreum-0.2.38.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ astreum/node.py,sha256=SuVm1b0QWl1FpDUaLRH1fiFYnXCrPs6qYeUQlPDae8w,38358
 astreum/_communication/__init__.py,sha256=I6TVFC1KXtwwdCjKUkGjOhsLWfC7cECubjzqmm-SwRs,161
 astreum/_communication/peer.py,sha256=DT2vJOzeLyyOj7vTDQ1u1lF5Vc7Epj0Hhie-YfDrzfA,425
 astreum/_communication/route.py,sha256=enWT_1260LJq-L-zK-jtacQ8LbZGquNO9yj-9IglSXE,1232
-astreum/_communication/setup.py,sha256=IzT23T1LNpseJ2m3G1J4g6oXKdywT14g-Saffi2NSqA,3544
+astreum/_communication/setup.py,sha256=6KH144iaHNec9g4cvC8fcLIBY0dvx5OCjV5WVYKNcZo,3865
 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
@@ -21,7 +21,7 @@ astreum/_validation/block.py,sha256=4ImViawnG0bhN-TiCk3F0byTlPm9U0l6PdSL53u3bsc,
 astreum/_validation/chain.py,sha256=lOFbz5z0AOeMLchQ2YPRSbIZIdQlnHqDyMJvgdwJ-Iw,2532
 astreum/_validation/fork.py,sha256=ZGTOVEhSiYJvvLvlC6FV8Zqe62uLTM-cSS3yKrKrLvA,3602
 astreum/_validation/genesis.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-astreum/_validation/setup.py,sha256=VSuCtLBZ3ieHHlJl3EkI5n4mEjRpgJ9hfKGxeGSrAVo,5592
+astreum/_validation/setup.py,sha256=FLutAEpW1Hh0WpGz1_k18tspc4z2RXA6hOHVaF-BmhY,8442
 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/relay/setup.py,sha256=ynvGaJdlDtw_f5LLiow2Wo7IRzUjvgk8eSr1Sv4_zTg,2090
 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-0.2.37.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.2.37.dist-info/METADATA,sha256=6VjD2A-MyBa-ahLWr_pJN69GO4lBjcFgv4So48JCsvo,6181
-astreum-0.2.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.2.37.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.2.37.dist-info/RECORD,,
+astreum-0.2.38.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.2.38.dist-info/METADATA,sha256=c-g2CirbWXU3Le0Fi6f1LJY_cJvTllbyEuTTM3PkeWE,6181
+astreum-0.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.2.38.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.2.38.dist-info/RECORD,,