astreum 0.3.9__py3-none-any.whl → 0.3.16__py3-none-any.whl

astreum/__init__.py

@@ -1,6 +1,6 @@
-
+
 from astreum.consensus import Account, Accounts, Block, Chain, Fork, Receipt, Transaction
-from astreum.machine import Env, Expr
+from astreum.machine import Env, Expr, parse, tokenize
 from astreum.node import Node
 
 
@@ -15,4 +15,6 @@ __all__: list[str] = [
     "Transaction",
     "Account",
     "Accounts",
+    "parse",
+    "tokenize",
 ]

astreum/communication/handlers/handshake.py

@@ -31,45 +31,11 @@ def handle_handshake(node: "Node", addr: Sequence[object], message: Message) ->
         return True
     peer_address = (host, port)
 
-    old_key_bytes = node.addresses.get(peer_address)
-    node.addresses[peer_address] = sender_public_key_bytes
-
-    if old_key_bytes is None:
-        try:
-            peer = Peer(
-                node_secret_key=node.relay_secret_key,
-                peer_public_key=sender_key,
-                address=peer_address,
-            )
-        except Exception:
-            return True
-
-        node.add_peer(sender_public_key_bytes, peer)
-        node.peer_route.add_peer(sender_public_key_bytes, peer)
-
-        node.logger.info(
-            "Handshake accepted from %s:%s; peer added",
-            peer_address[0],
-            peer_address[1],
-        )
-        response = Message(
-            handshake=True,
-            sender=node.relay_public_key,
-            content=int(node.config["incoming_port"]).to_bytes(2, "big", signed=False),
-        )
-        node.outgoing_queue.put((response.to_bytes(), peer_address))
-        return True
-
-    if old_key_bytes == sender_public_key_bytes:
-        peer = node.get_peer(sender_public_key_bytes)
-        if peer is not None:
-            peer.address = peer_address
+    existing_peer = node.get_peer(sender_public_key_bytes)
+    if existing_peer is not None:
+        existing_peer.address = peer_address
         return False
 
-    try:
-        node.peer_route.remove_peer(old_key_bytes)
-    except Exception:
-        pass
     try:
         peer = Peer(
             node_secret_key=node.relay_secret_key,
@@ -79,11 +45,18 @@ def handle_handshake(node: "Node", addr: Sequence[object], message: Message) ->
     except Exception:
         return True
 
-    node.replace_peer(old_key_bytes, sender_public_key_bytes, peer)
+    node.add_peer(sender_public_key_bytes, peer)
     node.peer_route.add_peer(sender_public_key_bytes, peer)
+
     node.logger.info(
-        "Peer at %s:%s replaced due to key change",
+        "Handshake accepted from %s:%s; peer added",
         peer_address[0],
         peer_address[1],
     )
-    return False
+    response = Message(
+        handshake=True,
+        sender=node.relay_public_key,
+        content=int(node.config["incoming_port"]).to_bytes(2, "big", signed=False),
+    )
+    node.outgoing_queue.put((response.to_bytes(), peer_address))
+    return True

astreum/communication/processors/peer.py

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+import time
+from datetime import datetime, timedelta, timezone
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from .. import Node
+
+
+def manage_peer(node: "Node") -> None:
+    """Continuously evict peers whose timestamps exceed the configured timeout."""
+    node.logger.info(
+        "Peer manager started (timeout=%3ds, interval=%3ds)",
+        node.config["peer_timeout"],
+        node.config["peer_timeout_interval"],
+    )
+    while True:
+        timeout_seconds = node.config["peer_timeout"]
+        interval_seconds = node.config["peer_timeout_interval"]
+        try:
+            peers = getattr(node, "peers", None)
+            peer_route = getattr(node, "peer_route", None)
+            if not isinstance(peers, dict) or peer_route is None:
+                time.sleep(interval_seconds)
+                continue
+
+            cutoff = datetime.now(timezone.utc) - timedelta(seconds=timeout_seconds)
+            stale_keys = []
+            with node.peers_lock:
+                for peer_key, peer in list(peers.items()):
+                    if peer.timestamp < cutoff:
+                        stale_keys.append(peer_key)
+
+            removed_count = 0
+            for peer_key in stale_keys:
+                removed = node.remove_peer(peer_key)
+                if removed is None:
+                    continue
+                removed_count += 1
+                try:
+                    peer_route.remove_peer(peer_key)
+                except Exception:
+                    node.logger.debug(
+                        "Unable to remove peer %s from route",
+                        peer_key.hex(),
+                    )
+                node.logger.debug(
+                    "Evicted stale peer %s last seen at %s",
+                    peer_key.hex(),
+                    getattr(removed, "timestamp", None),
+                )
+
+            if removed_count:
+                node.logger.info("Peer manager removed %s stale peer(s)", removed_count)
+        except Exception:
+            node.logger.exception("Peer manager iteration failed")
+
+        time.sleep(interval_seconds)

astreum/communication/setup.py

@@ -18,6 +18,7 @@ from .processors.incoming import (
     populate_incoming_messages,
 )
 from .processors.outgoing import process_outgoing_messages
+from .processors.peer import manage_peer
 from .util import address_str_to_host_and_port
 from ..utils.bytes import hex_to_bytes
 
@@ -122,13 +123,14 @@ def communication_setup(node: "Node", config: dict):
     # other workers & maps
     # track atom requests we initiated; guarded by atom_requests_lock on the node
     node.peer_manager_thread  = threading.Thread(
-        target=node._relay_peer_manager,
+        target=manage_peer,
+        args=(node,),
         daemon=True
     )
     node.peer_manager_thread.start()
 
     with node.peers_lock:
-        node.peers, node.addresses = {}, {} # peers: Dict[bytes,Peer], addresses: Dict[(str,int),bytes]
+        node.peers = {} # Dict[bytes,Peer]
 
     latest_block_hex = config.get("latest_block_hash")
     if latest_block_hex:

astreum/consensus/validator.py

@@ -11,15 +11,19 @@ from ..storage.models.atom import ZERO32
 from ..utils.integer import bytes_to_int, int_to_bytes
 
 
+SLOT_DURATION_SECONDS = 2
+
+
 def current_validator(
     node: Any,
     block_hash: bytes,
     target_time: Optional[int] = None,
 ) -> Tuple[bytes, Accounts]:
     """
-    Determine the validator for the requested target_time, halving stakes each second
-    between the referenced block and the target time. Returns the validator key and
-    the updated accounts snapshot reflecting stake and balance adjustments.
+    Determine the validator for the requested target_time, halving stakes once per
+    slot (currently 2 seconds) between the referenced block and the target time.
+    Returns the validator key and the updated accounts snapshot reflecting stake and
+    balance adjustments.
     """
 
     block = Block.from_atom(node, block_hash)
@@ -74,6 +78,8 @@ def current_validator(
         if current_amount <= 0:
             raise ValueError("validator stake must be positive")
         new_amount = current_amount // 2
+        if new_amount < 1:
+            new_amount = 1
         returned_amount = current_amount - new_amount
         stakes[validator_key] = new_amount
         stake_trie.put(node, validator_key, int_to_bytes(new_amount))
@@ -86,10 +92,13 @@ def current_validator(
         accounts.set_account(validator_key, validator_account)
         accounts.set_account(TREASURY_ADDRESS, treasury_account)
 
-    iteration_target = block_timestamp + 1
-    while True:
+    delta = target_timestamp - block_timestamp
+    slots_to_process = max(1, (delta + SLOT_DURATION_SECONDS - 1) // SLOT_DURATION_SECONDS)
+
+    selected_validator = pick_validator()
+    halve_stake(selected_validator)
+    for _ in range(1, slots_to_process):
         selected_validator = pick_validator()
         halve_stake(selected_validator)
-        if iteration_target == target_timestamp:
-            return selected_validator, accounts
-        iteration_target += 1
+
+    return selected_validator, accounts

astreum/consensus/workers/validation.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import math
 import time
 from queue import Empty
 from typing import Any, Callable
@@ -203,7 +204,9 @@ def make_validation_worker(
 
             now = time.time()
             min_allowed = new_block.previous_block.timestamp + 1
-            new_block.timestamp = max(int(now), min_allowed)
+            nonce_time_seconds = node.nonce_time_ms / 1000.0
+            expected_blocktime = now + nonce_time_seconds
+            new_block.timestamp = max(int(math.ceil(expected_blocktime)), min_allowed)
 
             new_block.delay_difficulty = Block.calculate_delay_difficulty(
                 previous_timestamp=previous_block.timestamp,
@@ -212,7 +215,10 @@ def make_validation_worker(
             )
             
             try:
+                nonce_started = time.perf_counter()
                 new_block.generate_nonce(difficulty=previous_block.delay_difficulty)
+                elapsed_ms = int((time.perf_counter() - nonce_started) * 1000)
+                setattr(node, "nonce_time_ms", elapsed_ms)
                 node.logger.debug(
                     "Found nonce %s for block #%s at difficulty %s",
                     new_block.nonce,
@@ -223,18 +229,39 @@ def make_validation_worker(
                 node.logger.exception("Failed while searching for block nonce")
                 time.sleep(0.5)
                 continue
+            
+            # wait until the block timestamp is reached before propagating
+            now = time.time()
+            if now > (new_block.timestamp + 2):
+                node.logger.warning(
+                    "Skipping block #%s propagation; timestamp %s already elapsed (now=%s)",
+                    new_block.number,
+                    new_block.timestamp,
+                    now,
+                )
+                continue
 
+            spread_delay = new_block.timestamp - now
+            if spread_delay > 0:
+                node.logger.debug(
+                    "Delaying distribution for %.3fs to reach block timestamp %s",
+                    spread_delay,
+                    new_block.timestamp,
+                )
+                time.sleep(spread_delay)
+                
             # atomize block
             new_block_hash, new_block_atoms = new_block.to_atom()
             # put as own latest block hash
             node.latest_block_hash = new_block_hash
             node.latest_block = new_block
             node.logger.info(
-                "Validated block #%s with hash %s (%d atoms)",
+                "Created block #%s with hash %s (%d atoms)",
                 new_block.number,
                 new_block_hash.hex(),
                 len(new_block_atoms),
             )
+            
 
             # ping peers in the validation route to update their records
             if node.validation_route and node.outgoing_queue and node.peers:

astreum/node.py

@@ -54,7 +54,10 @@ class Node:
         self.environments: Dict[uuid.UUID, Env] = {}
         self.machine_environments_lock = threading.RLock()
         self.is_connected = False
-
+        self.latest_block_hash = None
+        self.latest_block = None
+        self.nonce_time_ms = 0  # rolling measurement of last nonce search duration
+        
     connect = connect_to_network_and_verify
     validate = process_blocks_and_transactions
 

astreum/utils/config.py

@@ -1,9 +1,11 @@
-
+
 from pathlib import Path
 from typing import Dict
 
 DEFAULT_HOT_STORAGE_LIMIT = 1 << 30  # 1 GiB
 DEFAULT_COLD_STORAGE_LIMIT = 10 << 30  # 10 GiB
+DEFAULT_PEER_TIMEOUT_SECONDS = 15 * 60  # 15 minutes
+DEFAULT_PEER_TIMEOUT_INTERVAL_SECONDS = 10  # 10 seconds
 
 
 def config_setup(config: Dict = {}):
@@ -45,4 +47,30 @@ def config_setup(config: Dict = {}):
     else:
         config["cold_storage_path"] = None
 
+    peer_timeout_raw = config.get("peer_timeout", DEFAULT_PEER_TIMEOUT_SECONDS)
+    try:
+        peer_timeout = int(peer_timeout_raw)
+    except (TypeError, ValueError) as exc:
+        raise ValueError(
+            f"peer_timeout must be an integer: {peer_timeout_raw!r}"
+        ) from exc
+
+    if peer_timeout <= 0:
+        raise ValueError("peer_timeout must be a positive integer")
+
+    config["peer_timeout"] = peer_timeout
+
+    interval_raw = config.get("peer_timeout_interval", DEFAULT_PEER_TIMEOUT_INTERVAL_SECONDS)
+    try:
+        interval = int(interval_raw)
+    except (TypeError, ValueError) as exc:
+        raise ValueError(
+            f"peer_timeout_interval must be an integer: {interval_raw!r}"
+        ) from exc
+
+    if interval <= 0:
+        raise ValueError("peer_timeout_interval must be a positive integer")
+
+    config["peer_timeout_interval"] = interval
+
     return config

{astreum-0.3.9.dist-info → astreum-0.3.16.dist-info}/METADATA

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

{astreum-0.3.9.dist-info → astreum-0.3.16.dist-info}/RECORD

@@ -1,11 +1,11 @@
-astreum/__init__.py,sha256=GkEW_ReYore8_0nEOvPnZLUa3lO7CgMWu6LeEjrGXEk,325
-astreum/node.py,sha256=naKGkn97M3Khux3r8mZ81wsiAI6JFr4uhly4X_BspmU,2689
+astreum/__init__.py,sha256=ohPOPq9IdKln63LvbLR6HwWjMnvInelwlW-FXRFXa2M,370
+astreum/node.py,sha256=Rl4SdsA5olkgY33Q_d8XpKQfECKvqfTN_Y2FkCx6uE0,2852
 astreum/communication/__init__.py,sha256=wNxzsAk8Fol9cGMPuVvY4etrrMqn3SjZq1dE82kFrxw,228
-astreum/communication/setup.py,sha256=We43HOZG0v18TZhEdkc8MWCvI9YvHw8s4fmauHEXDUc,5887
+astreum/communication/setup.py,sha256=tDf4koYu04u_iOCeuvYyTaJaxQm6-yIGkedXCoWjT8w,5876
 astreum/communication/start.py,sha256=wxL1cgChebhnaeEaY9flS6qybo_cFW2-tcRvjLxC8Hw,1823
 astreum/communication/util.py,sha256=fS3u3giOOXmvN0_reb0oIaXsFESHAWz-bbAuzdzdGQ4,1575
 astreum/communication/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-astreum/communication/handlers/handshake.py,sha256=79Y5ei8RHg53WIwzP1eO4dpDYdKvhr1qrbWMECf9D-E,2781
+astreum/communication/handlers/handshake.py,sha256=LZLW06tufhiLAW0k1yC8n6wvTPT5VaUAvncHl8fm5n8,1910
 astreum/communication/handlers/object_request.py,sha256=n_ThJomdYXm6HPfkLMmCqRxO58xPCUOHXf1ddmG-OC8,7163
 astreum/communication/handlers/object_response.py,sha256=X5MfYxd_b4SfKq3129Fi29ZfLynWNRyhGuoISiMHy20,3959
 astreum/communication/handlers/ping.py,sha256=2fVynfVIsbWHtf7lpM6fTYWmeG0I1WSU3tmgCh9di7A,916
@@ -19,11 +19,12 @@ astreum/communication/models/route.py,sha256=NdmnI1J1wFs2pkm6W0Kv-29JeqGiHcKlw4-
 astreum/communication/processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/communication/processors/incoming.py,sha256=10l6Az-Ul_2BvYpTXgPiL9bL0te1q3GB3aET0JednKE,3325
 astreum/communication/processors/outgoing.py,sha256=09nAeTzvo3jGWl3SLgIQr8vfmO_IvdDqSG7_ZKThYPk,593
+astreum/communication/processors/peer.py,sha256=1P_-F1stJtXCPI3vlDtLcsQpQRTQQl1dNyJBDeFRGP4,2129
 astreum/consensus/__init__.py,sha256=VZR_NyGSD5VvZp3toD2zpdYwFDLBIcckeVZXFPlruuU,425
 astreum/consensus/genesis.py,sha256=RI9AzQFmDTgNFuiiTmW2dDiGcURIUGmThdRpxWrUOBk,1962
 astreum/consensus/setup.py,sha256=lrEapfpJXKqw4iwST11-tqPAI2VW2h3H6Ue4JDAtrP4,3142
 astreum/consensus/start.py,sha256=DM45Pw6JL5rew-KpcspINguH43ZUHr4v99tXjYqaEkE,2551
-astreum/consensus/validator.py,sha256=cqcmw1WEB8DkznNX_Mn8tmE956rVSNCPv1FicdL8EAQ,3647
+astreum/consensus/validator.py,sha256=Jj9_ndZ358yAqVzQpLyjr4lkBjdCscAYoqAi-Ja3Qoo,3871
 astreum/consensus/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/consensus/models/account.py,sha256=3QcT59QUZynysLSbiywidFYVzYJ3LR6qia7JwXOwn4I,2690
 astreum/consensus/models/accounts.py,sha256=iUMs6LvmMea-gxd6-ujkFjqhWmuW1cl9XTWGXQkpLys,2388
@@ -34,7 +35,7 @@ astreum/consensus/models/receipt.py,sha256=KjKKjYp_LnP2zkX1FLIwD_4hqKV1b2TPfp43t
 astreum/consensus/models/transaction.py,sha256=AYa1Q-BaYW3mkOv1e3WbvDFEsYamKMiFrja-eO2zU_Y,7475
 astreum/consensus/workers/__init__.py,sha256=bS5FjbevbIR5FHbVGnT4Jli17VIld_5auemRw4CaHFU,278
 astreum/consensus/workers/discovery.py,sha256=u6HyxamMVJjYnPFPa_U95I2pN9UzHRQ-LOa7YYZT808,2453
-astreum/consensus/workers/validation.py,sha256=uBkZVduHtwz8hUwDf_gFDiY8TfFaoYj40jx-s-EzuEU,13358
+astreum/consensus/workers/validation.py,sha256=geHcKaTUIbCnYvAHj9xTbiSMQTpvH6kJ4O5b5sCFUwk,14540
 astreum/consensus/workers/verify.py,sha256=tBBrAHH8Xcg3uopmQSjT6iuZd1s-9FkLnJ_JgeW5HdU,3423
 astreum/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/crypto/chacha20poly1305.py,sha256=01VtLx_bdJC86ifQeTA494ZdKbPM2MswDTLmAs9bl8c,2479
@@ -61,11 +62,11 @@ astreum/storage/actions/set.py,sha256=8MvlZS3MFvLc-apDb6mucxt1JBxw82lxMVoa0sTvdo
 astreum/storage/models/atom.py,sha256=FY_bgtoju59Yo7TL1DTFTr9_pRMNBuH6-u59D6bz2fc,3163
 astreum/storage/models/trie.py,sha256=Bn3ssPGI7YGS4iUH5ESvpG1NE6Ljx2Xo7wkEpQhjKUY,17587
 astreum/utils/bytes.py,sha256=9QTWC2JCdwWLB5R2mPtmjPro0IUzE58DL3uEul4AheE,846
-astreum/utils/config.py,sha256=jiobdNFiF44BMmoifAG3feq57ZPIhjUG4FG71cn-kgY,1527
+astreum/utils/config.py,sha256=MASHeLYzaPHG8Z6vLUd14vRH9JByfAL05tvgZWKrhNM,2517
 astreum/utils/integer.py,sha256=iQt-klWOYVghu_NOT341MmHbOle4FDT3by4PNKNXscg,736
 astreum/utils/logging.py,sha256=mRDtWSCj8vKt58WGKLNSkK9Oa0graNVSoS8URby4Q9g,6684
-astreum-0.3.9.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.3.9.dist-info/METADATA,sha256=vlvV1wwS4GiKwUQhpEg3FqJ_I_5m4efioshBzwhs4bk,7766
-astreum-0.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astreum-0.3.9.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.3.9.dist-info/RECORD,,
+astreum-0.3.16.dist-info/licenses/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.3.16.dist-info/METADATA,sha256=X6_Ea1a8-C-7At3YvK1OjeUsuqh0zmE1SoeUjJaB7qk,7767
+astreum-0.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astreum-0.3.16.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.3.16.dist-info/RECORD,,