astreum 0.1.5__tar.gz → 0.1.6__tar.gz

{astreum-0.1.5 → astreum-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: astreum
-Version: 0.1.5
+Version: 0.1.6
 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.1.5 → astreum-0.1.6}/pyproject.toml

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

{astreum-0.1.5 → astreum-0.1.6}/src/astreum/__init__.py

@@ -1 +1,2 @@
 from .machine import AstreumMachine
+from .node import Node

{astreum-0.1.5 → astreum-0.1.6}/src/astreum/machine/__init__.py

@@ -17,12 +17,11 @@ from astreum.lispeum.tokenizer import tokenize
 from astreum.lispeum.parser import parse
 
 class AstreumMachine:
-    def __init__(self):
-        self.global_env = Environment()
-        
+    def __init__(self, node: 'Node' = None):
+        self.global_env = Environment(node=node)
         self.sessions: Dict[str, Environment] = {}
-        
         self.lock = threading.Lock()
+         
     
     def create_session(self) -> str:
         session_id = str(uuid.uuid4())

{astreum-0.1.5 → astreum-0.1.6}/src/astreum/machine/environment.py

@@ -3,14 +3,21 @@ from astreum.lispeum.expression import Expr
 
 
 class Environment:
-    def __init__(self, parent: 'Environment' = None):
+    def __init__(self, parent: 'Environment' = None, node: 'Node' = None):
         self.data: Dict[str, Expr] = {}
         self.parent = parent
+        self.node = node
 
     def set(self, name: str, value: Expr):
-        self.data[name] = value
+        if self.node:
+            self.node.post_global_storage(name, value)
+        else:
+            self.data[name] = value
 
     def get(self, name: str) -> Optional[Expr]:
+        if self.node:
+            return self.node.query_global_storage(name)
+
         if name in self.data:
             return self.data[name]
         elif self.parent:

astreum-0.1.6/src/astreum/node/__init__.py

@@ -0,0 +1,416 @@
+import os
+import hashlib
+import time
+from typing import Tuple
+
+from .relay import Relay, Topic
+from .relay.peer import Peer
+from .storage import Storage
+from .route_table import RouteTable
+from .machine import AstreumMachine
+from .utils import encode, decode
+from .models import Block, Transaction
+
+class Node:
+    def __init__(self, config: dict):
+        self.config = config
+        self.node_id = config.get('node_id', os.urandom(32))  # Default to random ID if not provided
+        self.relay = Relay(config)
+        self.storage = Storage(config)
+        self.machine = AstreumMachine(config)
+        self.route_table = RouteTable(config, self.node_id)
+        
+        # Latest block of the chain this node is following
+        self.latest_block = None
+        self.followed_chain_id = config.get('followed_chain_id', None)
+        
+        # Candidate chains that might be adopted
+        self.candidate_chains = {}  # chain_id -> {'latest_block': block, 'timestamp': time.time()}
+        
+        # Register message handlers
+        self._register_message_handlers()
+        
+        # Initialize latest block from storage if available
+        self._initialize_latest_block()
+
+    def _register_message_handlers(self):
+        """Register handlers for different message topics."""
+        self.relay.register_message_handler(Topic.PING, self._handle_ping)
+        self.relay.register_message_handler(Topic.PONG, self._handle_pong)
+        self.relay.register_message_handler(Topic.OBJECT_REQUEST, self._handle_object_request)
+        self.relay.register_message_handler(Topic.OBJECT, self._handle_object)
+        self.relay.register_message_handler(Topic.ROUTE_REQUEST, self._handle_route_request)
+        self.relay.register_message_handler(Topic.ROUTE, self._handle_route)
+        self.relay.register_message_handler(Topic.LATEST_BLOCK_REQUEST, self._handle_latest_block_request)
+        self.relay.register_message_handler(Topic.LATEST_BLOCK, self._handle_latest_block)
+        self.relay.register_message_handler(Topic.TRANSACTION, self._handle_transaction)
+        
+    def _handle_ping(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle ping messages by storing peer info and responding with a pong.
+        
+        The ping message contains:
+        - public_key: The sender's public key
+        - difficulty: The sender's preferred proof-of-work difficulty 
+        - routes: The sender's available routes
+        """
+        try:
+            # Parse peer information from the ping message
+            parts = decode(body)
+            if len(parts) != 3:
+                return
+                
+            public_key, difficulty_bytes, routes_data = parts
+            difficulty = int.from_bytes(difficulty_bytes, byteorder='big')
+            
+            # Store peer information in routing table
+            peer = self.route_table.update_peer(addr, public_key, difficulty)
+            
+            # Process the routes the sender is participating in
+            if routes_data:
+                # routes_data is a simple list like [0, 1] meaning peer route and validation route
+                # Add peer to each route they participate in
+                self.relay.add_peer_to_route(peer, list(routes_data))
+            
+            # Create response with our public key, difficulty and routes we participate in
+            pong_data = encode([
+                self.node_id,  # Our public key
+                self.config.get('difficulty', 1).to_bytes(4, byteorder='big'),  # Our difficulty
+                self.relay.get_routes()  # Our routes as bytes([0, 1]) for peer and validation
+            ])
+            
+            self.relay.send_message(pong_data, Topic.PONG, addr)
+        except Exception as e:
+            print(f"Error handling ping message: {e}")
+    
+    def _handle_pong(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle pong messages by updating peer information.
+        No response is sent to a pong message.
+        """
+        try:
+            # Parse peer information from the pong message
+            parts = decode(body)
+            if len(parts) != 3:
+                return
+                
+            public_key, difficulty_bytes, routes_data = parts
+            difficulty = int.from_bytes(difficulty_bytes, byteorder='big')
+            
+            # Update peer information in routing table
+            peer = self.route_table.update_peer(addr, public_key, difficulty)
+            
+            # Process the routes the sender is participating in
+            if routes_data:
+                # routes_data is a simple list like [0, 1] meaning peer route and validation route
+                # Add peer to each route they participate in
+                self.relay.add_peer_to_route(peer, list(routes_data))
+        except Exception as e:
+            print(f"Error handling pong message: {e}")
+    
+    def _handle_object_request(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle request for an object by its hash.
+        Check storage and return if available, otherwise ignore.
+        """
+        try:
+            # The body is the hash of the requested object
+            object_hash = body
+            object_data = self.storage.get(object_hash)
+            
+            if object_data:
+                # Object found, send it back
+                self.relay.send_message(object_data, Topic.OBJECT, addr)
+            # If object not found, simply ignore the request
+        except Exception as e:
+            print(f"Error handling object request: {e}")
+    
+    def _handle_object(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle receipt of an object.
+        If not in storage, verify the hash and put in storage.
+        """
+        try:
+            # Verify hash matches the object
+            object_hash = hashlib.sha256(body).digest()
+            
+            # Check if we already have this object
+            if not self.storage.exists(object_hash):
+                # Store the object
+                self.storage.put(object_hash, body)
+        except Exception as e:
+            print(f"Error handling object: {e}")
+    
+    def _handle_route_request(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle request for routing information.
+        Seed route to peer with one peer per bucket in the route table.
+        """
+        try:
+            # Create a list to store one peer from each bucket
+            route_peers = []
+            
+            # Get one peer from each bucket
+            for bucket_index in range(self.route_table.num_buckets):
+                peers = self.route_table.get_bucket_peers(bucket_index)
+                if peers and len(peers) > 0:
+                    # Add one peer from this bucket
+                    route_peers.append(peers[0])
+            
+            # Serialize the peer list
+            # Format: List of [peer_addr, peer_port, peer_key]
+            peer_data = []
+            for peer in route_peers:
+                peer_addr, peer_port = peer.address
+                peer_data.append(encode([
+                    peer_addr.encode('utf-8'),
+                    peer_port.to_bytes(2, byteorder='big'),
+                    peer.node_id
+                ]))
+            
+            # Encode the complete route data
+            route_data = encode(peer_data)
+            
+            # Send routing information back
+            self.relay.send_message(route_data, Topic.ROUTE, addr)
+        except Exception as e:
+            print(f"Error handling route request: {e}")
+    
+    def _handle_route(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle receipt of a route message containing a list of IP addresses to ping.
+        """
+        try:
+            # Decode the list of peers
+            peer_entries = decode(body)
+            
+            # Process each peer
+            for peer_data in peer_entries:
+                try:
+                    peer_parts = decode(peer_data)
+                    if len(peer_parts) != 3:
+                        continue
+                        
+                    peer_addr_bytes, peer_port_bytes, peer_id = peer_parts
+                    peer_addr = peer_addr_bytes.decode('utf-8')
+                    peer_port = int.from_bytes(peer_port_bytes, byteorder='big')
+                    
+                    # Create peer address tuple
+                    peer_address = (peer_addr, peer_port)
+                    
+                    # Ping this peer if it's not already in our routing table
+                    # and it's not our own address
+                    if (not self.route_table.has_peer(peer_address) and 
+                            peer_address != self.relay.get_address()):
+                        # Create ping message with our info and routes
+                        # Encode our peer and validation routes
+                        peer_routes_list = self.relay.get_routes()
+                        
+                        # Combine into a single list of routes with type flags
+                        # For each route: [is_validation_route, route_id]
+                        routes = []
+                        
+                        # Add peer routes (type flag = 0)
+                        for route in peer_routes_list:
+                            routes.append(encode([bytes([0]), route]))
+                            
+                        # Encode the complete routes list
+                        all_routes = encode(routes)
+                        
+                        ping_data = encode([
+                            self.node_id,  # Our public key
+                            self.config.get('difficulty', 1).to_bytes(4, byteorder='big'),  # Our difficulty
+                            all_routes  # All routes we participate in
+                        ])
+                        
+                        # Send ping to the peer
+                        self.relay.send_message(ping_data, Topic.PING, peer_address)
+                except Exception as e:
+                    print(f"Error processing peer in route: {e}")
+                    continue
+        except Exception as e:
+            print(f"Error handling route message: {e}")
+    
+    def _handle_latest_block_request(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle request for the latest block from the chain currently following.
+        Any node can request the latest block for syncing purposes.
+        """
+        try:
+            # Return our latest block from the followed chain
+            if self.latest_block:
+                # Send latest block to the requester
+                self.relay.send_message(self.latest_block.to_bytes(), Topic.LATEST_BLOCK, addr)
+        except Exception as e:
+            print(f"Error handling latest block request: {e}")
+    
+    def _handle_latest_block(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle receipt of a latest block message.
+        Identify chain, validate if following chain, only accept if latest block 
+        in chain is in the previous field.
+        """
+        try:
+            # Check if we're in the validation route
+            # This is now already checked by the relay's _handle_message method
+            if not self.relay.is_in_validation_route():
+                return
+            
+            # Deserialize the block
+            block = Block.from_bytes(body)
+            if not block:
+                return
+                
+            # Check if we're following this chain
+            if not self.machine.is_following_chain(block.chain_id):
+                # Store as a potential candidate chain if it has a higher height
+                if not self.followed_chain_id or block.chain_id != self.followed_chain_id:
+                    self._add_candidate_chain(block)
+                return
+            
+            # Get our current latest block
+            our_latest = self.latest_block
+            
+            # Verify block hash links to our latest block
+            if our_latest and block.previous_hash == our_latest.hash:
+                # Process the valid block
+                self.machine.process_block(block)
+                
+                # Update our latest block
+                self.latest_block = block
+            # Check if this block is ahead of our current chain
+            elif our_latest and block.height > our_latest.height:
+                # Block is ahead but doesn't link directly to our latest
+                # Add to candidate chains for potential future adoption
+                self._add_candidate_chain(block)
+            
+            # No automatic broadcasting - nodes will request latest blocks when needed
+        except Exception as e:
+            print(f"Error handling latest block: {e}")
+    
+    def _handle_transaction(self, body: bytes, addr: Tuple[str, int], envelope):
+        """
+        Handle receipt of a transaction.
+        Accept if validation route is present and counter is valid relative to the latest block in our chain.
+        """
+        try:
+            # Check if we're in the validation route
+            # This is now already checked by the relay's _handle_message method
+            if not self.relay.is_in_validation_route():
+                return
+            
+            # Deserialize the transaction
+            transaction = Transaction.from_bytes(body)
+            if not transaction:
+                return
+                
+            # Check if we're following this chain
+            if not self.machine.is_following_chain(transaction.chain_id):
+                return
+                
+            # Verify transaction has a valid validation route
+            if not transaction.has_valid_route():
+                return
+                
+            # Get latest block from this chain
+            latest_block = self.machine.get_latest_block(transaction.chain_id)
+            if not latest_block:
+                return
+                
+            # Verify transaction counter is valid relative to the latest block
+            if not transaction.is_counter_valid(latest_block):
+                return
+                
+            # Process the valid transaction
+            self.machine.process_transaction(transaction)
+            
+            # Relay to other peers in the validation route
+            validation_peers = self.relay.get_route_peers(1)  # 1 = validation route
+            for peer in validation_peers:
+                if peer.address != addr:  # Don't send back to originator
+                    self.relay.send_message(body, Topic.TRANSACTION, peer.address)
+        except Exception as e:
+            print(f"Error handling transaction: {e}")
+            
+    def _initialize_latest_block(self):
+        """Initialize the latest block from storage if available."""
+        try:
+            if self.followed_chain_id:
+                # Get the latest block for the chain we're following
+                self.latest_block = self.machine.get_latest_block(self.followed_chain_id)
+            else:
+                # If no specific chain is set to follow, get the latest block from the default chain
+                self.latest_block = self.machine.get_latest_block()
+                
+                # If we have a latest block, set the followed chain ID
+                if self.latest_block:
+                    self.followed_chain_id = self.latest_block.chain_id
+        except Exception as e:
+            print(f"Error initializing latest block: {e}")
+            
+    def set_followed_chain(self, chain_id):
+        """
+        Set the chain that this node follows.
+        
+        Args:
+            chain_id: The ID of the chain to follow
+        """
+        self.followed_chain_id = chain_id
+        self.latest_block = self.machine.get_latest_block(chain_id)
+        
+    def get_latest_block(self):
+        """
+        Get the latest block of the chain this node is following.
+        
+        Returns:
+            The latest block, or None if not available
+        """
+        return self.latest_block
+    
+    def _add_candidate_chain(self, block):
+        """
+        Add a block to candidate chains for potential future adoption.
+        
+        Args:
+            block: The block to add as a candidate
+        """
+        chain_id = block.chain_id
+        
+        # If we already have this chain as a candidate, only update if this block is newer
+        if chain_id in self.candidate_chains:
+            current_candidate = self.candidate_chains[chain_id]['latest_block']
+            if block.height > current_candidate.height:
+                self.candidate_chains[chain_id] = {
+                    'latest_block': block,
+                    'timestamp': time.time()
+                }
+        else:
+            # Add as a new candidate chain
+            self.candidate_chains[chain_id] = {
+                'latest_block': block,
+                'timestamp': time.time()
+            }
+        
+        # Prune old candidates (older than 1 hour)
+        self._prune_candidate_chains()
+        
+    def _prune_candidate_chains(self):
+        """Remove candidate chains that are older than 1 hour."""
+        current_time = time.time()
+        chains_to_remove = []
+        
+        for chain_id, data in self.candidate_chains.items():
+            if current_time - data['timestamp'] > 3600:  # 1 hour in seconds
+                chains_to_remove.append(chain_id)
+                
+        for chain_id in chains_to_remove:
+            del self.candidate_chains[chain_id]
+            
+    def evaluate_candidate_chains(self):
+        """
+        Evaluate all candidate chains to see if we should switch to one.
+        This is a placeholder for now - in a real implementation, you would
+        verify the chain and potentially switch to it if it's valid and better.
+        """
+        # TODO: Implement chain evaluation logic
+        pass

astreum-0.1.6/src/astreum/node/models.py

@@ -0,0 +1,96 @@
+import socket
+from pathlib import Path
+from typing import Optional, Tuple
+from astreum.machine import AstreumMachine
+from .relay import Relay
+from .relay.message import Topic
+from .relay.route import RouteTable
+from .relay.peer import Peer
+import os
+
+class Storage:
+    def __init__(self, config: dict):
+        self.max_space = config.get('max_storage_space', 1024 * 1024 * 1024)  # Default 1GB
+        self.current_space = 0
+        self.storage_path = Path(config.get('storage_path', 'storage'))
+        self.storage_path.mkdir(parents=True, exist_ok=True)
+        
+        # Calculate current space usage
+        self.current_space = sum(f.stat().st_size for f in self.storage_path.glob('*') if f.is_file())
+
+    def put(self, data_hash: bytes, data: bytes) -> bool:
+        """Store data with its hash. Returns True if successful, False if space limit exceeded."""
+        data_size = len(data)
+        if self.current_space + data_size > self.max_space:
+            return False
+
+        file_path = self.storage_path / data_hash.hex()
+        
+        # Don't store if already exists
+        if file_path.exists():
+            return True
+
+        # Store the data
+        file_path.write_bytes(data)
+        self.current_space += data_size
+        return True
+
+    def get(self, data_hash: bytes) -> Optional[bytes]:
+        """Retrieve data by its hash. Returns None if not found."""
+        file_path = self.storage_path / data_hash.hex()
+        if not file_path.exists():
+            return None
+        return file_path.read_bytes()
+
+    def contains(self, data_hash: bytes) -> bool:
+        """Check if data exists in storage."""
+        return (self.storage_path / data_hash.hex()).exists()
+
+class Account:
+    def __init__(self, public_key: bytes, balance: int, counter: int):
+        self.public_key = public_key
+        self.balance = balance
+        self.counter = counter
+
+class Block:
+    def __init__(
+        self,
+        accounts: bytes,
+        chain: Chain,
+        difficulty: int,
+        delay: int,
+        number: int,
+        previous: Block,
+        receipts: bytes,
+        aster: int,
+        time: int,
+        transactions: bytes,
+        validator: Account,
+        signature: bytes
+    ):
+        self.accounts = accounts
+        self.chain = chain
+        self.difficulty = difficulty
+        self.delay = delay
+        self.number = number
+        self.previous = previous
+        self.receipts = receipts
+        self.aster = aster
+        self.time = time
+        self.transactions = transactions
+        self.validator = validator
+        self.signature = signature
+
+class Chain:
+    def __init__(self, latest_block: Block):
+        self.latest_block = latest_block
+        
+class Transaction:
+    def __init__(self, chain: Chain, receipient: Account, sender: Account, counter: int, amount: int, signature: bytes, data: bytes):
+        self.chain = chain
+        self.receipient = receipient
+        self.sender = sender
+        self.counter = counter
+        self.amount = amount
+        self.signature = signature
+        self.data = data