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

astreum/machine/evaluations/low_evaluation.py

@@ -143,7 +143,7 @@ def low_eval(self, code: List[bytes], meter: Meter) -> Expr:
                 if idx < 0 or length < 0:
                     return error_expr("low_eval", "bad slice")
 
-                atom = self.storage_get(key=id_b)
+                atom = self.get_atom(atom_id=id_b)
                 if atom is None:
                     return error_expr("low_eval", "unknown atom")
 
@@ -173,7 +173,7 @@ def low_eval(self, code: List[bytes], meter: Meter) -> Expr:
                 if not meter.charge_bytes(len(id1_b) + len(id2_b)):
                     return error_expr("low_eval", "meter limit")
                 
-                atom = self.storage_get(key=id_b)
+                atom = self.get_atom(atom_id=id_b)
                 if atom is None:
                     return error_expr("low_eval", "unknown atom")
 
@@ -195,8 +195,8 @@ def low_eval(self, code: List[bytes], meter: Meter) -> Expr:
                 id2_b = stack.pop()
                 id1_b = stack.pop()
 
-                atom1 = self.storage_get(key=id1_b)
-                atom2 = self.storage_get(key=id2_b)
+                atom1 = self.get_atom(atom_id=id1_b)
+                atom2 = self.get_atom(atom_id=id2_b)
                 if atom1 is None or atom2 is None:
                     return error_expr("low_eval", "unknown atom")
 
@@ -263,7 +263,7 @@ def low_eval(self, code: List[bytes], meter: Meter) -> Expr:
                 if length > 32:
                     return error_expr("low_eval", "load too wide")
 
-                atom = self.storage_get(key=id_b)
+                atom = self.get_atom(atom_id=id_b)
                 if atom is None:
                     return error_expr("low_eval", "unknown atom")
 

astreum/machine/models/expression.py

@@ -46,16 +46,16 @@ class Expr:
         if not isinstance(root_hash, (bytes, bytearray)):
             raise TypeError("root hash must be bytes-like")
 
-        storage_get = getattr(node, "storage_get", None)
-        if not callable(storage_get):
-            raise TypeError("node must provide a callable 'storage_get'")
+        get_atom = getattr(node, "get_atom", None)
+        if not callable(get_atom):
+            raise TypeError("node must provide a callable 'get_atom'")
 
         expr_id = bytes(root_hash)
 
         def _require(atom_id: Optional[bytes], context: str):
             if not atom_id:
                 raise ValueError(f"missing atom id while decoding {context}")
-            atom = storage_get(atom_id)
+            atom = get_atom(atom_id)
             if atom is None:
                 raise ValueError(f"missing atom data while decoding {context}")
             return atom
@@ -197,7 +197,7 @@ def error_expr(topic: str, message: str) -> Expr.ListExpr:
 
 def get_expr_list_from_storage(self, key: bytes) -> Optional["ListExpr"]:
         """Load a list expression from storage using the given atom list root hash."""
-        atoms = self.get_atom_list_from_storage(root_hash=key)
+        atoms = self.get_atom_list(key)
         if atoms is None:
             return None
         

astreum/node.py

@@ -1,95 +1,104 @@
-"""Core Astreum Node implementation."""
-
-from __future__ import annotations
-
-import threading
-import uuid
-from typing import Dict
-
-from astreum.communication.start import connect_to_network_and_verify
-from astreum.communication.models.peer import (
-    add_peer as peers_add_peer,
-    replace_peer as peers_replace_peer,
-    get_peer as peers_get_peer,
-    remove_peer as peers_remove_peer,
-)
-from astreum.consensus.start import process_blocks_and_transactions
-from astreum.machine import Expr, high_eval, low_eval, script_eval
-from astreum.machine.models.environment import Env, env_get, env_set
-from astreum.machine.models.expression import get_expr_list_from_storage
-from astreum.storage.models.atom import get_atom_list_from_storage
+"""Core Astreum Node implementation."""
+
+from __future__ import annotations
+
+import threading
+import uuid
+from typing import Dict
+
+from astreum.communication.node import connect_node
+from astreum.communication.util import get_bootstrap_peers
+from astreum.communication.disconnect import disconnect_node
+from astreum.communication.models.peer import (
+    add_peer as peers_add_peer,
+    replace_peer as peers_replace_peer,
+    get_peer as peers_get_peer,
+    remove_peer as peers_remove_peer,
+)
+from astreum.validation.node import validate_blockchain
+from astreum.verification.node import verify_blockchain
+from astreum.machine import Expr, high_eval, low_eval, script_eval
+from astreum.machine.models.environment import Env, env_get, env_set
+from astreum.machine.models.expression import get_expr_list_from_storage
 from astreum.storage.actions.get import (
     _hot_storage_get,
     _cold_storage_get,
     _network_get,
-    storage_get,
-    local_get,
-)
-from astreum.storage.actions.set import (
-    _hot_storage_set,
-    _cold_storage_set,
-    _network_set,
+    get_atom_from_local_storage,
+    get_atom,
+    get_atom_list_from_local_storage,
+    get_atom_list,
 )
-from astreum.storage.requests import add_atom_req, has_atom_req, pop_atom_req
-from astreum.storage.setup import storage_setup
-from astreum.utils.config import config_setup
-from astreum.utils.logging import logging_setup
-
-
+from astreum.storage.actions.set import (
+    _hot_storage_set,
+    _cold_storage_set,
+    _network_set,
+)
+from astreum.storage.requests import add_atom_req, has_atom_req, pop_atom_req
+from astreum.storage.setup import storage_setup
+from astreum.utils.config import config_setup
+from astreum.utils.logging import logging_setup
+
+
 class Node:
     def __init__(self, config: dict = {}):
         self.config = config_setup(config=config)
-        
-        self.logger = logging_setup(self.config)
-
-        self.logger.info("Starting Astreum Node")
-
-        # Chain Configuration
-        self.logger.info(f"Chain configured as: {self.config["chain"]} ({self.config["chain_id"]})")
-
-        # Storage Setup
-        storage_setup(self, config=self.config)
-
-        # Machine Setup
-        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
-
-    low_eval = low_eval
-    high_eval = high_eval
-    script_eval = script_eval
-
-    env_get = env_get
-    env_set = env_set
-
-    # Storage
-    ## Get
-    _hot_storage_get = _hot_storage_get
-    _cold_storage_get = _cold_storage_get
-    _network_get = _network_get
-
-    ## Set
-    _hot_storage_set = _hot_storage_set
-    _cold_storage_set = _cold_storage_set
-    _network_set = _network_set
-
-    storage_get = storage_get
-    local_get = local_get
-
-    get_expr_list_from_storage = get_expr_list_from_storage
-    get_atom_list_from_storage = get_atom_list_from_storage
-
-    add_atom_req = add_atom_req
-    has_atom_req = has_atom_req
-    pop_atom_req = pop_atom_req
-
-    add_peer = peers_add_peer
-    replace_peer = peers_replace_peer
-    get_peer = peers_get_peer
-    remove_peer = peers_remove_peer
+        self.bootstrap_peers = get_bootstrap_peers(self)
+        
+        self.logger = logging_setup(self.config)
+
+        self.logger.info("Starting Astreum Node")
+
+        # Chain Configuration
+        self.logger.info(f"Chain configured as: {self.config["chain"]} ({self.config["chain_id"]})")
+
+        # Storage Setup
+        storage_setup(self, config=self.config)
+
+        # Machine Setup
+        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
+        
+    connect = connect_node
+    disconnect = disconnect_node
+
+    verify = verify_blockchain
+
+    validate = validate_blockchain
+
+    low_eval = low_eval
+    high_eval = high_eval
+    script_eval = script_eval
+
+    env_get = env_get
+    env_set = env_set
+
+    # Storage
+    ## Get
+    _hot_storage_get = _hot_storage_get
+    _cold_storage_get = _cold_storage_get
+    _network_get = _network_get
+
+    ## Set
+    _hot_storage_set = _hot_storage_set
+    _cold_storage_set = _cold_storage_set
+    _network_set = _network_set
+
+    get_atom_from_local_storage = get_atom_from_local_storage
+    get_atom = get_atom
+    get_atom_list_from_local_storage = get_atom_list_from_local_storage
+    get_atom_list = get_atom_list
+
+    get_expr_list_from_storage = get_expr_list_from_storage
+
+    add_atom_req = add_atom_req
+    has_atom_req = has_atom_req
+    pop_atom_req = pop_atom_req
+
+    add_peer = peers_add_peer
+    replace_peer = peers_replace_peer
+    get_peer = peers_get_peer
+    remove_peer = peers_remove_peer