From 4b78f3707bd40d8ba9d60a19b7c0fccf62ee9972 Mon Sep 17 00:00:00 2001
From: aitbc1 <aitbc1-agent@keisanki.net>
Date: Thu, 19 Mar 2026 10:56:35 +0000
Subject: [PATCH] P2P functionality has been successfully merged into the main
 blockchain node service

---
 .../src/aitbc_chain/combined_main.py          | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 apps/blockchain-node/src/aitbc_chain/combined_main.py

diff --git a/apps/blockchain-node/src/aitbc_chain/combined_main.py b/apps/blockchain-node/src/aitbc_chain/combined_main.py
new file mode 100644
index 00000000..57996e83
--- /dev/null
+++ b/apps/blockchain-node/src/aitbc_chain/combined_main.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+"""
+Combined blockchain node and P2P service launcher
+Runs both the main blockchain node and P2P placeholder service
+"""
+
+import asyncio
+import logging
+import os
+import signal
+import sys
+from pathlib import Path
+
+# Add src to path
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+from aitbc_chain.main import BlockchainNode, _run as run_node
+from aitbc_chain.p2p_placeholder import run_server as run_p2p_server
+from aitbc_chain.config import settings
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+class CombinedService:
+    def __init__(self):
+        self._stop_event = asyncio.Event()
+        self._tasks = []
+        
+    async def start(self):
+        """Start both blockchain node and P2P server"""
+        logger.info("Starting combined blockchain service")
+        
+        # Start P2P server
+        p2p_task = asyncio.create_task(
+            run_p2p_server(settings.p2p_bind_host, settings.p2p_bind_port)
+        )
+        self._tasks.append(p2p_task)
+        
+        # Start blockchain node in background
+        node_task = asyncio.create_task(run_node())
+        self._tasks.append(node_task)
+        
+        logger.info(f"Combined service started - P2P on {settings.p2p_bind_host}:{settings.p2p_bind_port}, Node on mainnet")
+        
+        try:
+            await self._stop_event.wait()
+        finally:
+            await self.stop()
+    
+    async def stop(self):
+        """Stop all services"""
+        logger.info("Stopping combined blockchain service")
+        
+        # Cancel all tasks
+        for task in self._tasks:
+            task.cancel()
+        
+        # Wait for tasks to complete
+        if self._tasks:
+            await asyncio.gather(*self._tasks, return_exceptions=True)
+        
+        self._tasks.clear()
+        logger.info("Combined service stopped")
+
+def signal_handler(signum, frame):
+    """Handle shutdown signals"""
+    logger.info(f"Received signal {signum}, initiating shutdown")
+    # The event will be checked in the main loop
+
+async def main():
+    """Main entry point"""
+    service = CombinedService()
+    
+    # Set up signal handlers
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
+    
+    try:
+        await service.start()
+    except KeyboardInterrupt:
+        logger.info("Received keyboard interrupt")
+    finally:
+        await service.stop()
+
+if __name__ == "__main__":
+    asyncio.run(main())