astreum 0.3.25__tar.gz → 0.3.50__tar.gz

{astreum-0.3.25/src/astreum.egg-info → astreum-0.3.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astreum
-Version: 0.3.25
+Version: 0.3.50
 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
@@ -33,6 +33,8 @@ When initializing an `astreum.Node`, pass a dictionary with any of the options b
 | `hot_storage_limit`         | int        | `1073741824`   | Maximum bytes kept in the hot cache before new atoms are skipped (1 GiB).                                                                                                         |
 | `cold_storage_limit`        | int        | `10737418240`  | Cold storage write threshold (10 GiB by default); set to `0` to skip the limit.                                                                                                   |
 | `cold_storage_path`         | string     | `None`         | Directory where persisted atoms live; Astreum creates it on startup and skips cold storage when unset.                                                                            |
+| `atom_fetch_interval`       | float      | `0.25`         | Poll interval (seconds) while waiting for missing atoms in `get_atom_list_from_storage`; `0` disables waiting.                                                                    |
+| `atom_fetch_retries`        | int        | `8`            | Number of poll attempts for missing atoms; max wait is roughly `interval * retries`, `0` disables waiting.                                                                        |
 | `logging_retention_days`    | int        | `90`           | Number of days to keep rotated log files (daily gzip).                                                                                                                           |
 | `chain_id`                  | int        | `0`            | Chain identifier used for validation (0 = test, 1 = main).                                                                                                                        |
 | `verbose`                   | bool       | `False`        | When **True**, also mirror JSON logs to stdout with a human-readable format.                                                                                                     |
@@ -45,11 +47,18 @@ When initializing an `astreum.Node`, pass a dictionary with any of the options b
 | `validation_secret_key`  | hex string  | `None`                | Optional Ed25519 key that lets the node join the validation route; leave blank to opt out of validation. |
 | `use_ipv6`               | bool        | `False`               | Bind the incoming/outgoing sockets on IPv6 (the OS still listens on IPv4 if a peer speaks both).         |
 | `incoming_port`          | int         | `52780`                | UDP port the relay binds to; pass `0` or omit to let the OS pick an ephemeral port.                       |
-| `default_seeds`          | list\[str\] | `["bootstrap.astreum.org:52780"]` | Default addresses to ping before joining; pass `[]` to disable the built-in default.          |
-| `additional_seeds`       | list\[str\] | `[]`                  | Extra addresses appended to `default_seeds`; each must look like `host:port` or `[ipv6]:port`.           |
+| `default_seed`           | string     | `"bootstrap.astreum.org:52780"` | Default address to ping before joining; set to `None` to disable the built-in default.          |
+| `additional_seeds`       | list\[str\] | `[]`                  | Extra addresses appended to the bootstrap list; each must look like `host:port` or `[ipv6]:port`.        |
 | `peer_timeout`           | int         | `900`                 | Evict peers that have not been seen within this many seconds (15 minutes).                               |
 | `peer_timeout_interval`  | int         | `10`                  | How often (seconds) the peer manager checks for stale peers.                                             |
 | `bootstrap_retry_interval` | int       | `30`                  | How often (seconds) to retry bootstrapping when the peer list is empty.                                  |
+| `storage_index_interval` | int         | `600`                 | How often (seconds) to re-advertise entries in `node.atom_advertisments` to the closest known peer.       |
+| `incoming_queue_size_limit` | int     | `67108864`            | Soft cap (bytes) for inbound queue usage tracked by `enqueue_incoming`; set to `0` to disable.           |
+| `incoming_queue_timeout` | float      | `1.0`                 | When > 0, `enqueue_incoming` waits up to this many seconds for space before dropping the payload.        |
+| `outgoing_queue_size_limit` | int     | `67108864`            | Soft cap (bytes) for `enqueue_outgoing`-tracked outgoing queue usage; set to `0` to disable.            |
+| `outgoing_queue_timeout` | float      | `1.0`                 | When > 0, `enqueue_outgoing` waits up to this many seconds for space before dropping the payload.        |
+
+Advertisements: `node.atom_advertisments` holds `(atom_id, payload_type, expires_at)` tuples. Use `node.add_atom_advertisement` or `node.add_atom_advertisements` to enqueue entries (`expires_at=None` keeps them indefinite). Validators automatically advertise block, transaction (main and detail lists), receipt, and account trie lists for 15 minutes by default.
 
 > **Note**
 > The peer‑to‑peer *route* used for object discovery is always enabled.
@@ -68,7 +77,7 @@ config = {
     "cold_storage_path": "./data/node1",
     "incoming_port": 52780,
     "use_ipv6": False,
-    "default_seeds": [],
+    "default_seed": None,
     "additional_seeds": [
         "127.0.0.1:7374"
     ]
@@ -175,6 +184,7 @@ python3 -m unittest tests.node.test_current_validator
 python3 -m unittest tests.node.test_node_connection
 python3 -m unittest tests.node.test_node_init
 python3 -m unittest tests.node.test_node_validation
+python3 -m unittest tests.node.config.default_seed
 python3 -m unittest tests.node.tokenize
 python3 -m unittest tests.node.parse
 python3 -m unittest tests.node.function

{astreum-0.3.25 → astreum-0.3.50}/README.md

@@ -12,28 +12,37 @@ When initializing an `astreum.Node`, pass a dictionary with any of the options b
 
 | Parameter                   | Type       | Default        | Description                                                                                                                                                                      |
 | --------------------------- | ---------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `hot_storage_limit`         | int        | `1073741824`   | Maximum bytes kept in the hot cache before new atoms are skipped (1 GiB).                                                                                                         |
-| `cold_storage_limit`        | int        | `10737418240`  | Cold storage write threshold (10 GiB by default); set to `0` to skip the limit.                                                                                                   |
-| `cold_storage_path`         | string     | `None`         | Directory where persisted atoms live; Astreum creates it on startup and skips cold storage when unset.                                                                            |
+| `hot_storage_limit`         | int        | `1073741824`   | Maximum bytes kept in the hot cache before new atoms are skipped (1 GiB).                                                                                                         |
+| `cold_storage_limit`        | int        | `10737418240`  | Cold storage write threshold (10 GiB by default); set to `0` to skip the limit.                                                                                                   |
+| `cold_storage_path`         | string     | `None`         | Directory where persisted atoms live; Astreum creates it on startup and skips cold storage when unset.                                                                            |
+| `atom_fetch_interval`       | float      | `0.25`         | Poll interval (seconds) while waiting for missing atoms in `get_atom_list_from_storage`; `0` disables waiting.                                                                    |
+| `atom_fetch_retries`        | int        | `8`            | Number of poll attempts for missing atoms; max wait is roughly `interval * retries`, `0` disables waiting.                                                                        |
 | `logging_retention_days`    | int        | `90`           | Number of days to keep rotated log files (daily gzip).                                                                                                                           |
 | `chain_id`                  | int        | `0`            | Chain identifier used for validation (0 = test, 1 = main).                                                                                                                        |
-| `verbose`                   | bool       | `False`        | When **True**, also mirror JSON logs to stdout with a human-readable format.                                                                                                     |
+| `verbose`                   | bool       | `False`        | When **True**, also mirror JSON logs to stdout with a human-readable format.                                                                                                     |
 
 ### Communication
 
 | Parameter                | Type        | Default               | Description                                                                                             |
 | ------------------------ | ----------- | --------------------- | ------------------------------------------------------------------------------------------------------- |
-| `relay_secret_key`       | hex string  | Auto-generated        | X25519 private key used for the relay route; a new keypair is created when this field is omitted.        |
-| `validation_secret_key`  | hex string  | `None`                | Optional Ed25519 key that lets the node join the validation route; leave blank to opt out of validation. |
-| `use_ipv6`               | bool        | `False`               | Bind the incoming/outgoing sockets on IPv6 (the OS still listens on IPv4 if a peer speaks both).         |
-| `incoming_port`          | int         | `52780`                | UDP port the relay binds to; pass `0` or omit to let the OS pick an ephemeral port.                       |
-| `default_seeds`          | list\[str\] | `["bootstrap.astreum.org:52780"]` | Default addresses to ping before joining; pass `[]` to disable the built-in default.          |
-| `additional_seeds`       | list\[str\] | `[]`                  | Extra addresses appended to `default_seeds`; each must look like `host:port` or `[ipv6]:port`.           |
-| `peer_timeout`           | int         | `900`                 | Evict peers that have not been seen within this many seconds (15 minutes).                               |
-| `peer_timeout_interval`  | int         | `10`                  | How often (seconds) the peer manager checks for stale peers.                                             |
-| `bootstrap_retry_interval` | int       | `30`                  | How often (seconds) to retry bootstrapping when the peer list is empty.                                  |
-
-> **Note**
+| `relay_secret_key`       | hex string  | Auto-generated        | X25519 private key used for the relay route; a new keypair is created when this field is omitted.        |
+| `validation_secret_key`  | hex string  | `None`                | Optional Ed25519 key that lets the node join the validation route; leave blank to opt out of validation. |
+| `use_ipv6`               | bool        | `False`               | Bind the incoming/outgoing sockets on IPv6 (the OS still listens on IPv4 if a peer speaks both).         |
+| `incoming_port`          | int         | `52780`                | UDP port the relay binds to; pass `0` or omit to let the OS pick an ephemeral port.                       |
+| `default_seed`           | string     | `"bootstrap.astreum.org:52780"` | Default address to ping before joining; set to `None` to disable the built-in default.          |
+| `additional_seeds`       | list\[str\] | `[]`                  | Extra addresses appended to the bootstrap list; each must look like `host:port` or `[ipv6]:port`.        |
+| `peer_timeout`           | int         | `900`                 | Evict peers that have not been seen within this many seconds (15 minutes).                               |
+| `peer_timeout_interval`  | int         | `10`                  | How often (seconds) the peer manager checks for stale peers.                                             |
+| `bootstrap_retry_interval` | int       | `30`                  | How often (seconds) to retry bootstrapping when the peer list is empty.                                  |
+| `storage_index_interval` | int         | `600`                 | How often (seconds) to re-advertise entries in `node.atom_advertisments` to the closest known peer.       |
+| `incoming_queue_size_limit` | int     | `67108864`            | Soft cap (bytes) for inbound queue usage tracked by `enqueue_incoming`; set to `0` to disable.           |
+| `incoming_queue_timeout` | float      | `1.0`                 | When > 0, `enqueue_incoming` waits up to this many seconds for space before dropping the payload.        |
+| `outgoing_queue_size_limit` | int     | `67108864`            | Soft cap (bytes) for `enqueue_outgoing`-tracked outgoing queue usage; set to `0` to disable.            |
+| `outgoing_queue_timeout` | float      | `1.0`                 | When > 0, `enqueue_outgoing` waits up to this many seconds for space before dropping the payload.        |
+
+Advertisements: `node.atom_advertisments` holds `(atom_id, payload_type, expires_at)` tuples. Use `node.add_atom_advertisement` or `node.add_atom_advertisements` to enqueue entries (`expires_at=None` keeps them indefinite). Validators automatically advertise block, transaction (main and detail lists), receipt, and account trie lists for 15 minutes by default.
+
+> **Note**
 > The peer‑to‑peer *route* used for object discovery is always enabled.
 > If `validation_secret_key` is provided the node automatically joins the validation route too.
 
@@ -47,14 +56,14 @@ config = {
     "validation_secret_key": "12…34",        # optional – validator
     "hot_storage_limit": 1073741824,         # cap hot cache at 1 GiB
     "cold_storage_limit": 10737418240,       # cap cold storage at 10 GiB
-    "cold_storage_path": "./data/node1",
-    "incoming_port": 52780,
-    "use_ipv6": False,
-    "default_seeds": [],
-    "additional_seeds": [
-        "127.0.0.1:7374"
-    ]
-}
+    "cold_storage_path": "./data/node1",
+    "incoming_port": 52780,
+    "use_ipv6": False,
+    "default_seed": None,
+    "additional_seeds": [
+        "127.0.0.1:7374"
+    ]
+}
 
 node = Node(config)
 # … your code …
@@ -132,7 +141,7 @@ except ParseError as e:
 Every `Node` instance wires up structured logging automatically:
 
 - Logs land in per-instance files named `node.log` under `%LOCALAPPDATA%\Astreum\lib-py\logs/<instance_id>` on Windows and `$XDG_STATE_HOME` (or `~/.local/state`)/`Astreum/lib-py/logs/<instance_id>` on other platforms. The `<instance_id>` is the first 16 hex characters of a BLAKE3 hash of the caller's file path, so running the node from different entry points keeps their logs isolated.
-- Files rotate at midnight UTC with gzip compression (`node-YYYY-MM-DD.log.gz`) and retain 90 days by default. Override via `config["logging_retention_days"]`.
+- Files rotate at midnight UTC with gzip compression (`node-YYYY-MM-DD.log.gz`) and retain 90 days by default. Override via `config["logging_retention_days"]`.
 - Each event is a single JSON line containing timestamp, level, logger, message, process/thread info, module/function, and the derived `instance_id`.
 - Set `config["verbose"] = True` to mirror logs to stdout in a human-friendly format like `[2025-04-13-42-59] [info] Starting Astreum Node`.
 - The very first entry emitted is the banner `Starting Astreum Node`, signalling that the logging pipeline is live before other subsystems spin up.
@@ -157,6 +166,7 @@ python3 -m unittest tests.node.test_current_validator
 python3 -m unittest tests.node.test_node_connection
 python3 -m unittest tests.node.test_node_init
 python3 -m unittest tests.node.test_node_validation
+python3 -m unittest tests.node.config.default_seed
 python3 -m unittest tests.node.tokenize
 python3 -m unittest tests.node.parse
 python3 -m unittest tests.node.function

{astreum-0.3.25 → astreum-0.3.50}/pyproject.toml

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

{astreum-0.3.25 → astreum-0.3.50}/src/astreum/__init__.py

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

{astreum-0.3.25 → astreum-0.3.50}/src/astreum/communication/__init__.py

@@ -1,11 +1,15 @@
-from .models.message import Message
-from .models.peer import Peer
-from .models.route import Route
-from .setup import communication_setup
-
-__all__ = [
-    "Message",
-    "Peer",
-    "Route",
-    "communication_setup",
-]
+from .models.message import Message
+from .models.peer import Peer
+from .models.route import Route
+from .incoming_queue import enqueue_incoming
+from .outgoing_queue import enqueue_outgoing
+from .setup import communication_setup
+
+__all__ = [
+    "Message",
+    "Peer",
+    "Route",
+    "enqueue_incoming",
+    "enqueue_outgoing",
+    "communication_setup",
+]

astreum-0.3.50/src/astreum/communication/difficulty.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .. import Node
+
+
+def message_difficulty(node: "Node") -> int:
+    """Compute current message difficulty based on incoming queue pressure."""
+    size = node.incoming_queue_size
+    limit = node.incoming_queue_size_limit
+
+    if limit <= 0:
+        return 1
+
+    pressure = size / limit
+    if pressure < 0.70:
+        value = 1
+    elif pressure < 0.75:
+        value = 3
+    elif pressure < 0.80:
+        value = 5
+    elif pressure < 0.85:
+        value = 8
+    elif pressure < 0.90:
+        value = 12
+    elif pressure < 0.93:
+        value = 16
+    elif pressure < 0.95:
+        value = 19
+    elif pressure < 0.97:
+        value = 22
+    elif pressure < 0.98:
+        value = 24
+    else:
+        value = 26
+
+    return max(1, min(255, value))

{astreum-0.3.25 → astreum-0.3.50}/src/astreum/communication/handlers/handshake.py

@@ -1,18 +1,20 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Sequence
-
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PublicKey
-
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Sequence
+
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PublicKey
+
+from ..outgoing_queue import enqueue_outgoing
 from ..models.peer import Peer
 from ..models.message import Message, MessageTopic
 from ..models.ping import Ping
-
-if TYPE_CHECKING:
-    from .... import Node
-
-
+from ..difficulty import message_difficulty
+
+if TYPE_CHECKING:
+    from .... import Node
+
+
 def handle_handshake(node: "Node", addr: Sequence[object], message: Message) -> bool:
     """Handle incoming handshake messages.
 
@@ -25,6 +27,7 @@ def handle_handshake(node: "Node", addr: Sequence[object], message: Message) ->
         try:
             ping_payload = Ping(
                 is_validator=bool(getattr(node, "validation_public_key", None)),
+                difficulty=message_difficulty(node),
                 latest_block=latest_block,
             ).to_bytes()
             ping_msg = Message(
@@ -33,7 +36,12 @@ def handle_handshake(node: "Node", addr: Sequence[object], message: Message) ->
                 sender=node.relay_public_key,
             )
             ping_msg.encrypt(peer.shared_key_bytes)
-            node.outgoing_queue.put((ping_msg.to_bytes(), peer_address))
+            enqueue_outgoing(
+                node,
+                peer_address,
+                message=ping_msg,
+                difficulty=peer.difficulty,
+            )
         except Exception as exc:
             node.logger.debug(
                 "Failed sending handshake ping to %s:%s: %s",
@@ -41,48 +49,57 @@ def handle_handshake(node: "Node", addr: Sequence[object], message: Message) ->
                 peer_address[1],
                 exc,
             )
-    sender_public_key_bytes = message.sender_bytes
-    try:
-        sender_key = X25519PublicKey.from_public_bytes(sender_public_key_bytes)
-    except Exception as exc:
-        node.logger.warning("Error extracting sender key bytes: %s", exc)
-        return True
-
-    try:
-        host = addr[0]
-        port = int.from_bytes(message.content[:2], "big", signed=False)
-    except Exception:
-        return True
-    peer_address = (host, port)
-
+    sender_public_key_bytes = message.sender_bytes
+    try:
+        sender_key = X25519PublicKey.from_public_bytes(sender_public_key_bytes)
+    except Exception as exc:
+        node.logger.warning("Error extracting sender key bytes: %s", exc)
+        return True
+
+    try:
+        host = addr[0]
+        port = int.from_bytes(message.content[:2], "big", signed=False)
+    except Exception:
+        return True
+    peer_address = (host, port)
+    default_seed_ips = getattr(node, "default_seed_ips", None)
+    is_default_seed = bool(default_seed_ips) and host in default_seed_ips
+
     existing_peer = node.get_peer(sender_public_key_bytes)
     if existing_peer is not None:
         existing_peer.address = peer_address
+        existing_peer.is_default_seed = is_default_seed
         _queue_handshake_ping(existing_peer, peer_address)
         return False
-
-    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)
-
+
+    try:
+        peer = Peer(
+            node_secret_key=node.relay_secret_key,
+            peer_public_key=sender_key,
+            address=peer_address,
+            is_default_seed=is_default_seed,
+        )
+    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))
+    enqueue_outgoing(
+        node,
+        peer_address,
+        message=response,
+        difficulty=peer.difficulty,
+    )
     _queue_handshake_ping(peer, peer_address)
     return True

astreum-0.3.50/src/astreum/communication/handlers/object_request.py

@@ -0,0 +1,273 @@
+import logging
+import socket
+from enum import IntEnum
+from typing import Optional, TYPE_CHECKING, Tuple
+
+from .object_response import (
+    ObjectResponse,
+    ObjectResponseType,
+    OBJECT_FOUND_ATOM_PAYLOAD,
+    OBJECT_FOUND_LIST_PAYLOAD,
+    encode_object_found_atom_payload,
+    encode_object_found_list_payload,
+)
+from ..outgoing_queue import enqueue_outgoing
+from ..models.message import Message, MessageTopic
+from ..util import xor_distance
+from ...storage.providers import provider_id_for_payload, provider_payload_for_id
+
+if TYPE_CHECKING:
+    from .. import Node
+    from ..models.peer import Peer
+
+
+class ObjectRequestType(IntEnum):
+    OBJECT_GET = 0
+    OBJECT_PUT = 1
+
+
+class ObjectRequest:
+    type: ObjectRequestType
+    data: bytes
+    atom_id: bytes
+    payload_type: Optional[int]
+
+    def __init__(
+        self,
+        type: ObjectRequestType,
+        data: bytes = b"",
+        atom_id: bytes = None,
+        payload_type: Optional[int] = None,
+    ):
+        self.type = type
+        self.data = data
+        self.atom_id = atom_id
+        self.payload_type = payload_type
+
+    def to_bytes(self):
+        if self.type == ObjectRequestType.OBJECT_PUT and self.payload_type is None:
+            raise ValueError("OBJECT_PUT requires payload_type")
+        if self.payload_type is not None:
+            payload = bytes([self.payload_type]) + self.data
+        else:
+            payload = self.data
+        return bytes([self.type.value]) + self.atom_id + payload
+
+    @classmethod
+    def from_bytes(cls, data: bytes) -> "ObjectRequest":
+        # need at least 1 byte for type + 32 bytes for hash
+        if len(data) < 1 + 32:
+            raise ValueError(f"Too short for ObjectRequest ({len(data)} bytes)")
+
+        type_val = data[0]
+        try:
+            req_type = ObjectRequestType(type_val)
+        except ValueError:
+            raise ValueError(f"Unknown ObjectRequestType: {type_val!r}")
+
+        atom_id_bytes = data[1:33]
+        payload = data[33:]
+        if req_type == ObjectRequestType.OBJECT_GET:
+            if payload:
+                payload_type = payload[0]
+                payload = payload[1:]
+            else:
+                payload_type = None
+            return cls(req_type, payload, atom_id_bytes, payload_type=payload_type)
+        if req_type == ObjectRequestType.OBJECT_PUT:
+            if not payload:
+                raise ValueError("OBJECT_PUT missing payload type")
+            payload_type = payload[0]
+            payload = payload[1:]
+            return cls(req_type, payload, atom_id_bytes, payload_type=payload_type)
+        return cls(req_type, payload, atom_id_bytes)
+
+
+def encode_peer_contact_bytes(peer: "Peer") -> bytes:
+    """Return a fixed-width peer contact payload (32-byte key + IPv4 + port)."""
+    host, port = peer.address
+    key_bytes = peer.public_key_bytes
+    try:
+        ip_bytes = socket.inet_aton(host)
+    except OSError as exc:  # pragma: no cover - inet_aton raises for invalid hosts
+        raise ValueError(f"invalid IPv4 address: {host}") from exc
+    if not (0 <= port <= 0xFFFF):
+        raise ValueError(f"port out of range (0-65535): {port}")
+    port_bytes = int(port).to_bytes(2, "big", signed=False)
+    return key_bytes + ip_bytes + port_bytes
+
+
+def handle_object_request(node: "Node", peer: "Peer", message: Message) -> None:
+    if message.content is None:
+        node.logger.warning("OBJECT_REQUEST from %s missing content", peer.address)
+        return
+
+    try:
+        object_request = ObjectRequest.from_bytes(message.content)
+    except Exception as exc:
+        node.logger.warning("Error decoding OBJECT_REQUEST from %s: %s", peer.address, exc)
+        return
+
+    match object_request.type:
+        case ObjectRequestType.OBJECT_GET:
+            atom_id = object_request.atom_id
+            node.logger.debug("Handling OBJECT_GET for %s from %s", atom_id.hex(), peer.address)
+            payload_type = object_request.payload_type
+            if payload_type is None:
+                payload_type = OBJECT_FOUND_ATOM_PAYLOAD
+
+            if payload_type == OBJECT_FOUND_ATOM_PAYLOAD:
+                local_atom = node.get_atom_from_local_storage(atom_id=atom_id)
+                if local_atom is not None:
+                    node.logger.debug("Object %s found locally; returning to %s", atom_id.hex(), peer.address)
+                    resp = ObjectResponse(
+                        type=ObjectResponseType.OBJECT_FOUND,
+                        data=encode_object_found_atom_payload(local_atom),
+                        atom_id=atom_id
+                    )
+                    obj_res_msg  = Message(
+                        topic=MessageTopic.OBJECT_RESPONSE,
+                        body=resp.to_bytes(),
+                        sender=node.relay_public_key,
+                    )
+                    obj_res_msg.encrypt(peer.shared_key_bytes)
+                    enqueue_outgoing(
+                        node,
+                        peer.address,
+                        message=obj_res_msg,
+                        difficulty=peer.difficulty,
+                    )
+                    return
+            elif payload_type == OBJECT_FOUND_LIST_PAYLOAD:
+                local_atoms = node.get_atom_list_from_local_storage(root_hash=atom_id)
+                if local_atoms is not None:
+                    node.logger.debug("Object list %s found locally; returning to %s", atom_id.hex(), peer.address)
+                    resp = ObjectResponse(
+                        type=ObjectResponseType.OBJECT_FOUND,
+                        data=encode_object_found_list_payload(local_atoms),
+                        atom_id=atom_id
+                    )
+                    obj_res_msg  = Message(
+                        topic=MessageTopic.OBJECT_RESPONSE,
+                        body=resp.to_bytes(),
+                        sender=node.relay_public_key,
+                    )
+                    obj_res_msg.encrypt(peer.shared_key_bytes)
+                    enqueue_outgoing(
+                        node,
+                        peer.address,
+                        message=obj_res_msg,
+                        difficulty=peer.difficulty,
+                    )
+                    return
+            else:
+                node.logger.warning(
+                    "Unknown OBJECT_GET payload type %s for %s",
+                    payload_type,
+                    atom_id.hex(),
+                )
+
+            if atom_id in node.storage_index:
+                provider_id = node.storage_index[atom_id]
+                provider_bytes = provider_payload_for_id(node, provider_id)
+                if provider_bytes is not None:
+                    node.logger.debug("Known provider for %s; informing %s", atom_id.hex(), peer.address)
+                    resp = ObjectResponse(
+                        type=ObjectResponseType.OBJECT_PROVIDER,
+                        data=provider_bytes,
+                        atom_id=atom_id
+                    )
+                    obj_res_msg = Message(
+                        topic=MessageTopic.OBJECT_RESPONSE,
+                        body=resp.to_bytes(),
+                        sender=node.relay_public_key,
+                    )
+                    obj_res_msg.encrypt(peer.shared_key_bytes)
+                    enqueue_outgoing(
+                        node,
+                        peer.address,
+                        message=obj_res_msg,
+                        difficulty=peer.difficulty,
+                    )
+                    return
+                node.logger.warning(
+                    "Unknown provider id %s for %s",
+                    provider_id,
+                    atom_id.hex(),
+                )
+
+            nearest_peer = node.peer_route.closest_peer_for_hash(atom_id)
+            if nearest_peer:
+                node.logger.debug("Forwarding requester %s to nearest peer for %s", peer.address, atom_id.hex())
+                peer_info = encode_peer_contact_bytes(nearest_peer)
+                resp = ObjectResponse(
+                    type=ObjectResponseType.OBJECT_PROVIDER,
+                    # type=ObjectResponseType.OBJECT_NEAREST_PEER,
+                    data=peer_info,
+                    atom_id=atom_id
+                )
+                obj_res_msg = Message(
+                    topic=MessageTopic.OBJECT_RESPONSE,
+                    body=resp.to_bytes(),
+                    sender=node.relay_public_key,
+                )
+                obj_res_msg.encrypt(nearest_peer.shared_key_bytes)
+                enqueue_outgoing(
+                    node,
+                    peer.address,
+                    message=obj_res_msg,
+                    difficulty=peer.difficulty,
+                )
+
+        case ObjectRequestType.OBJECT_PUT:
+            node.logger.debug("Handling OBJECT_PUT for %s from %s", object_request.atom_id.hex(), peer.address)
+
+            nearest_peer = node.peer_route.closest_peer_for_hash(object_request.atom_id)
+            is_self_closest = False
+            if nearest_peer is None or nearest_peer.address is None:
+                is_self_closest = True
+            else:
+                try:
+                    self_distance = xor_distance(object_request.atom_id, node.relay_public_key_bytes)
+                    peer_distance = xor_distance(object_request.atom_id, nearest_peer.public_key_bytes)
+                except Exception as exc:
+                    node.logger.warning(
+                        "Failed distance comparison for OBJECT_PUT %s: %s",
+                        object_request.atom_id.hex(),
+                        exc,
+                    )
+                    is_self_closest = True
+                else:
+                    is_self_closest = self_distance <= peer_distance
+
+            if is_self_closest:
+                node.logger.debug("Storing provider info for %s locally", object_request.atom_id.hex())
+                provider_id = provider_id_for_payload(node, object_request.data)
+                node.storage_index[object_request.atom_id] = provider_id
+            else:
+                node.logger.debug(
+                    "Forwarding OBJECT_PUT for %s to nearer peer %s",
+                    object_request.atom_id.hex(),
+                    nearest_peer.address,
+                )
+                fwd_req = ObjectRequest(
+                    type=ObjectRequestType.OBJECT_PUT,
+                    data=object_request.data,
+                    atom_id=object_request.atom_id,
+                    payload_type=object_request.payload_type,
+                )
+                obj_req_msg = Message(
+                    topic=MessageTopic.OBJECT_REQUEST,
+                    body=fwd_req.to_bytes(),
+                    sender=node.relay_public_key,
+                )
+                obj_req_msg.encrypt(nearest_peer.shared_key_bytes)
+                enqueue_outgoing(
+                    node,
+                    nearest_peer.address,
+                    message=obj_req_msg,
+                    difficulty=nearest_peer.difficulty,
+                )
+
+        case _:
+            node.logger.warning("Unknown ObjectRequestType %s from %s", object_request.type, peer.address)