astreum 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

astreum/node/__init__.py

@@ -1,17 +1,48 @@
 import os
-import hashlib
 import time
-from typing import Tuple, Optional
+import threading
+import random
+from typing import Tuple, Optional, List, Dict
 import json
 from cryptography.hazmat.primitives.asymmetric import ed25519
+from cryptography.hazmat.primitives import serialization
 
 from .relay import Relay, Topic
 from .relay.peer import Peer
 from .models import Storage, Block, Transaction
 from .machine import AstreumMachine
-from .utils import encode, decode
+from .utils import encode, decode, hash_data
 from astreum.lispeum.storage import store_expr, get_expr_from_storage
 
+# Import our validation components using the new functional approach
+from .validation import (
+    validate_block,
+    create_block,
+    create_genesis_block,
+    compute_vdf,
+    verify_vdf,
+    select_validator,
+    select_validator_for_slot,
+    Account,
+    get_validator_stake,
+    is_validator,
+    VALIDATION_ADDRESS,
+    BURN_ADDRESS,
+    MIN_STAKE_AMOUNT,
+    SLOT_DURATION,
+    VDF_DIFFICULTY
+)
+from .validation.state import (
+    add_block_to_state,
+    validate_and_apply_block,
+    create_account_state,
+    get_validator_for_slot,
+    select_best_chain,
+    compare_chains,
+    get_validator_set
+)
+from .validation.adapter import BlockAdapter, TransactionAdapter, AccountAdapter
+
 class Node:
     def __init__(self, config: dict):
         # Ensure config is a dictionary, but allow it to be None
@@ -46,6 +77,25 @@ class Node:
         self.storage = Storage(self.config)
         self.storage.node = self  # Set the storage node reference to self
         
+        # Initialize blockchain state
+        self.blockchain = create_account_state(self.config)
+        
+        # Store our validator info if we're a validator
+        if self.is_validator and self.validation_public_key:
+            self.validator_address = self.validation_public_key.public_bytes(
+                encoding=serialization.Encoding.Raw, 
+                format=serialization.PublicFormat.Raw
+            )
+            self.validator_private_bytes = self.validation_private_key.private_bytes(
+                encoding=serialization.Encoding.Raw,
+                format=serialization.PrivateFormat.Raw,
+                encryption_algorithm=serialization.NoEncryption()
+            )
+            print(f"Registered validator with address: {self.validator_address.hex()}")
+        else:
+            self.validator_address = None
+            self.validator_private_bytes = None
+        
         # Latest block of the chain this node is following
         self.latest_block = None
         self.followed_chain_id = self.config.get('followed_chain_id', None)
@@ -64,529 +114,367 @@ class Node:
         self.relay.message_handlers[Topic.LATEST_BLOCK_REQUEST] = self._handle_latest_block_request
         self.relay.message_handlers[Topic.LATEST_BLOCK] = self._handle_latest_block
         self.relay.message_handlers[Topic.TRANSACTION] = self._handle_transaction
+        self.relay.message_handlers[Topic.BLOCK_REQUEST] = self._handle_block_request
+        self.relay.message_handlers[Topic.BLOCK_RESPONSE] = self._handle_block_response
         
         # Initialize latest block from storage if available
         self._initialize_latest_block()
         
         # Candidate chains that might be adopted
         self.candidate_chains = {}  # chain_id -> {'latest_block': block, 'timestamp': time.time()}
+        self.pending_blocks = {}  # block_hash -> {'block': block, 'timestamp': time.time()}
         
-    def _handle_ping(self, body: bytes, addr: Tuple[str, int], envelope):
-        """
-        Handle ping messages by storing peer info and responding with a pong.
+        # Threads for validation and chain monitoring
+        self.running = False
+        self.main_chain_validation_thread = None
+        self.candidate_chain_validation_thread = None
         
-        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.relay.add_peer(addr, public_key, difficulty)
+        # Pending transactions for a block
+        self.pending_transactions = {}  # tx_hash -> {'transaction': tx, 'timestamp': time.time()}
+        
+        # Last block production attempt time
+        self.last_block_attempt_time = 0
+
+    def start(self):
+        """Start the node."""
+        self.running = True
+        
+        # Start relay
+        self.relay.start()
+        
+        # Start chain monitoring thread
+        self.main_chain_validation_thread = threading.Thread(
+            target=self._main_chain_validation_loop,
+            name="MainChainValidation"
+        )
+        self.main_chain_validation_thread.daemon = True
+        self.main_chain_validation_thread.start()
+        
+        self.candidate_chain_validation_thread = threading.Thread(
+            target=self._candidate_chain_validation_loop,
+            name="CandidateChainValidation"
+        )
+        self.candidate_chain_validation_thread.daemon = True
+        self.candidate_chain_validation_thread.start()
+        
+        # Set up recurring block query tasks
+        main_query_thread = threading.Thread(
+            target=self._block_query_loop,
+            args=('main',),
+            daemon=True
+        )
+        main_query_thread.start()
+        
+        validation_query_thread = threading.Thread(
+            target=self._block_query_loop,
+            args=('validation',),
+            daemon=True
+        )
+        validation_query_thread.start()
+        
+        print(f"Node started with ID {self.node_id.hex()}")
+
+    def stop(self):
+        """Stop the node and all its services."""
+        self.running = False
+        
+        # Stop all threads
+        if self.main_chain_validation_thread and self.main_chain_validation_thread.is_alive():
+            self.main_chain_validation_thread.join(timeout=1.0)
             
-            # 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))
+        if self.candidate_chain_validation_thread and self.candidate_chain_validation_thread.is_alive():
+            self.candidate_chain_validation_thread.join(timeout=1.0)
             
-            # 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
-            ])
+        # Stop relay last
+        if self.relay:
+            self.relay.stop()
             
-            self.relay.send_message(pong_data, Topic.PONG, addr)
-        except Exception as e:
-            print(f"Error handling ping message: {e}")
+        print("Node stopped")
     
-    def _handle_pong(self, body: bytes, addr: Tuple[str, int], envelope):
+    def _main_chain_validation_loop(self):
         """
-        Handle pong messages by updating peer information.
-        No response is sent to a pong message.
+        Main validation loop for the primary blockchain.
+        This thread prioritizes validating blocks on the main chain we're following.
         """
-        try:
-            # Parse peer information from the pong message
-            parts = decode(body)
-            if len(parts) != 3:
-                return
+        while self.running:
+            try:
+                # Update latest block if we don't have one yet
+                if not self.latest_block and hasattr(self.blockchain, 'get_latest_block'):
+                    self.latest_block = self.blockchain.get_latest_block()
                 
-            public_key, difficulty_bytes, routes_data = parts
-            difficulty = int.from_bytes(difficulty_bytes, byteorder='big')
-            
-            # Update peer information in routing table
-            peer = self.relay.add_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 an object request from a peer.
-        
-        Args:
-            body: Message body containing the object hash
-            addr: Address of the requesting peer
-            envelope: Full message envelope
-        """
-        try:
-            # Decode the request
-            request = json.loads(body.decode('utf-8'))
-            object_hash = bytes.fromhex(request.get('hash'))
-            
-            # Check if we have the requested object
-            if not self.storage.contains(object_hash):
-                # We don't have the object, ignore the request
-                return
+                # Process any blocks that extend our main chain immediately
+                self._process_main_chain_blocks()
                 
-            # Get the object data
-            object_data = self.storage._local_get(object_hash)
-            if not object_data:
-                return
+                # Attempt block production if we are a validator
+                if self.is_validator and self.validator_address:
+                    self._attempt_block_production()
                 
-            # Create a response message
-            response = {
-                'hash': object_hash.hex(),
-                'data': object_data.hex()
-            }
-            
-            # Send the response
-            self.relay.send_message_to_addr(
-                addr, 
-                Topic.OBJECT_RESPONSE, 
-                json.dumps(response).encode('utf-8')
-            )
-            
-        except Exception as e:
-            print(f"Error handling object request: {e}")
-    
-    def _handle_object_response(self, body: bytes, addr: Tuple[str, int], envelope):
-        """
-        Handle an object response from a peer.
-        
-        Args:
-            body: Message body containing the object hash and data
-            addr: Address of the responding peer
-            envelope: Full message envelope
-        """
-        try:
-            # Decode the response
-            response = json.loads(body.decode('utf-8'))
-            object_hash = bytes.fromhex(response.get('hash'))
-            object_data = bytes.fromhex(response.get('data'))
-            
-            # Store the object
-            self.storage.put(object_hash, object_data)
-            
-        except Exception as e:
-            print(f"Error handling object response: {e}")
-    
-    def _handle_object(self, body: bytes, addr: Tuple[str, int], envelope):
+                # Cleanup old items
+                self._prune_pending_items()
+                
+                # Sleep to prevent high CPU usage
+                time.sleep(0.1)  # Short sleep for main chain validation
+            except Exception as e:
+                print(f"Error in main chain validation loop: {e}")
+                time.sleep(1)  # Longer sleep on error
+                
+    def _candidate_chain_validation_loop(self):
         """
-        Handle receipt of an object.
-        If not in storage, verify the hash and put in storage.
+        Validation loop for candidate chains (potential forks).
+        This thread handles validation of blocks from alternate chains 
+        without slowing down the main chain processing.
         """
-        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 request_object(self, object_hash: bytes, max_attempts: int = 3) -> Optional[bytes]:
-        """
-        Request an object from the network by its hash.
-        
-        This method sends an object request to peers closest to the object hash
-        and waits for a response until timeout.
-        
-        Args:
-            object_hash: The hash of the object to request
-            max_attempts: Maximum number of request attempts
-            
-        Returns:
-            The object data if found, None otherwise
-        """
-        # First check if we already have the object
-        if self.storage.contains(object_hash):
-            return self.storage._local_get(object_hash)
-            
-        # Find the bucket containing the peers closest to the object's hash
-        closest_peers = self.relay.get_closest_peers(object_hash, count=3)
-        if not closest_peers:
-            return None
-            
-        # Create a message to request the object
-        topic = Topic.OBJECT_REQUEST
-        object_request_msg = {
-            'hash': object_hash.hex()
-        }
-        
-        # Track which peers we've already tried
-        attempted_peers = set()
-        
-        # We'll try up to max_attempts times
-        for _ in range(max_attempts):
-            # Find peers we haven't tried yet
-            untried_peers = [p for p in closest_peers if p.id not in attempted_peers]
-            if not untried_peers:
-                break
+        while self.running:
+            try:
+                # Process candidate chains
+                self._evaluate_candidate_chains()
                 
-            # Send the request to all untried peers
-            request_sent = False
-            for peer in untried_peers:
-                try:
-                    self.relay.send_message_to_peer(peer, topic, object_request_msg)
-                    attempted_peers.add(peer.id)
-                    request_sent = True
-                except Exception as e:
-                    print(f"Failed to send object request to peer {peer.id.hex()}: {e}")
-            
-            if not request_sent:
-                break
+                # Prune old candidate chains
+                self._prune_candidate_chains()
                 
-            # Short wait to allow for response
-            time.sleep(0.5)
-            
-            # Check if any of the requests succeeded
-            if self.storage.contains(object_hash):
-                return self.storage._local_get(object_hash)
+                # Sleep longer for candidate chain validation (lower priority)
+                time.sleep(1)  # Longer sleep for candidate chain validation
+            except Exception as e:
+                print(f"Error in candidate chain validation loop: {e}")
+                time.sleep(2)  # Even longer sleep on error
                 
-        # If we get here, we couldn't get the object
-        return None
-    
-    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.relay.num_buckets):
-                peers = self.relay.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
-                ]))
+    def _prune_pending_items(self):
+        """Remove old pending blocks and transactions."""
+        current_time = time.time()
+        
+        # Prune old pending blocks (older than 1 hour)
+        blocks_to_remove = [
+            block_hash for block_hash, data in self.pending_blocks.items()
+            if current_time - data['timestamp'] > 3600  # 1 hour
+        ]
+        for block_hash in blocks_to_remove:
+            del self.pending_blocks[block_hash]
+            
+        # Prune old pending transactions (older than 30 minutes)
+        txs_to_remove = [
+            tx_hash for tx_hash, data in self.pending_transactions.items()
+            if current_time - data['timestamp'] > 1800  # 30 minutes
+        ]
+        for tx_hash in txs_to_remove:
+            del self.pending_transactions[tx_hash]
+            
+    def _process_main_chain_blocks(self):
+        """
+        Process blocks that extend our current main chain.
+        Prioritizes blocks that build on our latest block.
+        """
+        # Skip if we don't have a latest block yet
+        if not self.latest_block:
+            return
             
-            # Encode the complete route data
-            route_data = encode(peer_data)
+        # Get the hash of our latest block
+        latest_hash = self.latest_block.get_hash()
+        
+        # Find any pending blocks that build on our latest block
+        main_chain_blocks = []
+        for block_hash, data in list(self.pending_blocks.items()):
+            block = data['block']
             
-            # 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)
+            # Check if this block extends our latest block
+            if block.previous == latest_hash:
+                main_chain_blocks.append(block)
+                
+        # Process found blocks
+        for block in main_chain_blocks:
+            self._validate_and_process_main_chain_block(block)
             
-            # 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.relay.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):
+    def _validate_and_process_main_chain_block(self, block: Block):
         """
-        Handle request for the latest block from the chain currently following.
-        Any node can request the latest block for syncing purposes.
+        Validate and process a block that extends our main chain.
+        
+        Args:
+            block: Block to validate and process
         """
         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)
+            # Validate block
+            is_valid = validate_block(block, self.blockchain.get_accounts_at_block(block.previous), self.blockchain.get_blocks())
+            
+            if is_valid:
+                # Apply block to our state
+                success = validate_and_apply_block(self.blockchain, block)
+                if success:
+                    print(f"Applied valid block {block.number} to blockchain state")
+                    self._update_latest_block(block)
+                    blocks_to_remove = [block.get_hash()]
+                    for block_hash in blocks_to_remove:
+                        if block_hash in self.pending_blocks:
+                            del self.pending_blocks[block_hash]
+                    print(f"Added block {block.number} to blockchain")
+                    return True
         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
+            print(f"Error validating main chain block {block.number}: {e}")
             
-            # 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
+        return False
             
-            # 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):
+    def _evaluate_candidate_chains(self):
         """
-        Handle incoming transaction messages.
-        
-        This method is called when we receive a transaction from the network.
-        Transactions should only be processed by validator nodes.
-        
-        Args:
-            body: Transaction data
-            addr: Source address
-            envelope: Full message envelope
+        Evaluate candidate chains to determine if any should become our main chain.
+        This will validate pending blocks and look for chains with higher cumulative difficulty.
         """
-        # Ignore if we're not a validator (don't have a validation key)
-        if not self.is_validator or not self.relay.is_in_validation_route():
-            print("Ignoring transaction as we're not a validator")
+        # Skip if no candidate chains
+        if not self.candidate_chains:
             return
             
-        try:
-            # Parse transaction data
-            tx_data = json.loads(body.decode('utf-8'))
+        # For each candidate chain, validate blocks and calculate metrics
+        for chain_id, data in list(self.candidate_chains.items()):
+            latest_candidate_block = data['latest_block']
             
-            # Store the transaction in our local storage
-            tx_hash = bytes.fromhex(tx_data.get('hash'))
-            tx_raw = bytes.fromhex(tx_data.get('data'))
+            # Build the chain backwards
+            chain_blocks = self._build_chain_from_latest(latest_candidate_block)
             
-            # Create transaction entry in storage
-            if not self.storage.contains(tx_hash):
-                self.storage.put(tx_hash, tx_raw)
-                print(f"Stored transaction {tx_hash.hex()}")
+            # Skip if we couldn't build a complete chain
+            if not chain_blocks:
+                continue
                 
-                # Process the transaction as a validator
-                self._process_transaction_as_validator(tx_hash, tx_raw)
+            # Validate the entire chain
+            valid_chain = self._validate_candidate_chain(chain_blocks)
             
-        except Exception as e:
-            print(f"Error handling transaction: {e}")
-            
-    def _process_transaction_as_validator(self, tx_hash: bytes, tx_raw: bytes):
+            # If valid and better than our current chain, switch to it
+            if valid_chain and self._is_better_chain(chain_blocks):
+                self._switch_to_new_chain(chain_blocks)
+                
+    def _build_chain_from_latest(self, latest_block: Block) -> List[Block]:
         """
-        Process a transaction as a validator node.
-        
-        This method is called when we receive a transaction and we're a validator.
-        It verifies the transaction and may include it in a future block.
+        Build a chain from the latest block back to a known point in our blockchain.
         
         Args:
-            tx_hash: Transaction hash
-            tx_raw: Raw transaction data
-        """
-        try:
-            print(f"Processing transaction {tx_hash.hex()} as validator")
-            # Here we would verify the transaction and potentially queue it
-            # for inclusion in the next block we create
+            latest_block: Latest block in the candidate chain
             
-            # For now, just log that we processed it
-            print(f"Verified transaction {tx_hash.hex()}")
-            
-            # TODO: Implement transaction validation and queueing for block creation
-            
-        except Exception as e:
-            print(f"Error processing transaction as validator: {e}")
-            
-    def _initialize_latest_block(self):
-        """Initialize latest block from storage if available."""
-        # Implementation would load the latest block from storage
-        pass
-    
-    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)
+            List of blocks in the chain, ordered from oldest to newest
+        """
+        chain_blocks = [latest_block]
+        current_block = latest_block
+        
+        # Track visited blocks to avoid cycles
+        visited = {current_block.get_hash()}
+        
+        # Build chain backwards until we either:
+        # 1. Find a block in our main chain
+        # 2. Run out of blocks
+        # 3. Detect a cycle
+        while current_block.number > 0:
+            previous_hash = current_block.previous
+            
+            # Check if we have this block in our blockchain
+            if hasattr(self.blockchain, 'has_block') and self.blockchain.has_block(previous_hash):
+                # Found connection to our main chain
+                previous_block = self.blockchain.get_block(previous_hash)
+                chain_blocks.insert(0, previous_block)
+                break
                 
-        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
-    
-    def post_global_storage(self, name: str, value):
+            # Check if block is in pending blocks
+            elif previous_hash in self.pending_blocks:
+                previous_block = self.pending_blocks[previous_hash]['block']
+                
+                # Check for cycles
+                if previous_hash in visited:
+                    print(f"Cycle detected in candidate chain at block {previous_block.number}")
+                    return []
+                    
+                visited.add(previous_hash)
+                chain_blocks.insert(0, previous_block)
+                current_block = previous_block
+            else:
+                # Missing block, cannot validate the chain
+                print(f"Missing block {previous_hash.hex()} in candidate chain")
+                return []
+                
+        return chain_blocks
+        
+    def _validate_candidate_chain(self, chain_blocks: List[Block]) -> bool:
         """
-        Store a global variable in node storage.
+        Validate a candidate chain of blocks.
         
         Args:
-            name: Name of the variable
-            value: Value to store
+            chain_blocks: List of blocks in the chain (oldest to newest)
+            
+        Returns:
+            True if the chain is valid, False otherwise
         """
-        # Store the expression directly in node storage using DAG representation
-        root_hash = store_expr(value, self.storage)
-        
-        # Create a key for this variable name (without special prefixes)
-        key = hashlib.sha256(name.encode()).digest()
-        
-        # Store the root hash reference
-        self.storage.put(key, root_hash)
+        # Validate each block in the chain
+        for i, block in enumerate(chain_blocks):
+            # Skip first block, it's either genesis or a block we already have
+            if i == 0:
+                continue
+                
+            # Validate block connections
+            if block.previous != chain_blocks[i-1].get_hash():
+                print(f"Invalid chain: block {block.number} does not reference previous block")
+                return False
+                
+            # Validate block
+            is_valid = validate_block(block, self.blockchain.get_accounts_at_block(block.previous), self.blockchain.get_blocks())
+            if not is_valid:
+                print(f"Invalid chain: block {block.number} is invalid")
+                return False
+                
+        return True
         
-    def query_global_storage(self, name: str):
+    def _is_better_chain(self, chain_blocks: List[Block]) -> bool:
         """
-        Retrieve a global variable from node storage.
+        Determine if a candidate chain is better than our current chain.
         
         Args:
-            name: Name of the variable to retrieve
+            chain_blocks: List of blocks in the candidate chain
             
         Returns:
-            The stored expression, or None if not found
+            True if the candidate chain is better, False otherwise
         """
-        # Create the key for this variable name
-        key = hashlib.sha256(name.encode()).digest()
+        # Get the latest block from the candidate chain
+        candidate_latest = chain_blocks[-1]
         
-        # Try to retrieve the root hash
-        root_hash = self.storage.get(key)
+        # If we don't have a latest block, any valid chain is better
+        if not self.latest_block:
+            return True
+            
+        # Compare block numbers (longest chain rule)
+        if candidate_latest.number > self.latest_block.number:
+            print(f"Candidate chain is longer: {candidate_latest.number} vs {self.latest_block.number}")
+            return True
+            
+        return False
         
-        if root_hash:
-            # Load the expression using its root hash
-            return get_expr_from_storage(root_hash, self.storage)
+    def _switch_to_new_chain(self, chain_blocks: List[Block]):
+        """
+        Switch to a new chain by adding all blocks to our blockchain.
         
-        return None
+        Args:
+            chain_blocks: List of blocks in the chain (oldest to newest)
+        """
+        # Find the point where the chains diverge
+        divergence_point = 0
+        for i, block in enumerate(chain_blocks):
+            # Check if we have this block in our blockchain
+            if hasattr(self.blockchain, 'has_block') and self.blockchain.has_block(block.get_hash()):
+                divergence_point = i + 1
+            else:
+                break
+                
+        # Add all blocks after the divergence point
+        for i in range(divergence_point, len(chain_blocks)):
+            block = chain_blocks[i]
+            
+            # Add block to blockchain
+            if hasattr(self.blockchain, 'add_block'):
+                try:
+                    self.blockchain.add_block(block)
+                    
+                    # Remove from pending blocks
+                    block_hash = block.get_hash()
+                    if block_hash in self.pending_blocks:
+                        del self.pending_blocks[block_hash]
+                        
+                    print(f"Added block {block.number} to blockchain")
+                except Exception as e:
+                    print(f"Error adding block {block.number} to blockchain: {e}")
+                    return
+                    
+        # Update latest block
+        self._update_latest_block(chain_blocks[-1])
+        print(f"Switched to new chain, latest block: {self.latest_block.number}")