diff --git a/apps/exchange/simple_exchange_api.py b/apps/exchange/simple_exchange_api.py index 50578b80..a8e42c69 100755 --- a/apps/exchange/simple_exchange_api.py +++ b/apps/exchange/simple_exchange_api.py @@ -107,7 +107,7 @@ class ExchangeAPIHandler(BaseHTTPRequestHandler): self.send_error(400, "Invalid path") return - if self.path == '/api/health': + if self.path == '/health' or self.path == '/api/health': self.health_check() elif self.path.startswith('/api/trades/recent'): parsed = urllib.parse.urlparse(self.path) diff --git a/cli/handlers/blockchain.py b/cli/handlers/blockchain.py index b0c0421a..833c524e 100644 --- a/cli/handlers/blockchain.py +++ b/cli/handlers/blockchain.py @@ -28,17 +28,21 @@ def handle_blockchain_block(args, default_rpc_url): sys.exit(1) rpc_url = args.rpc_url or os.getenv("NODE_URL", default_rpc_url) - print(f"Querying block #{args.number} from {rpc_url}...") + chain_id = getattr(args, 'chain_id', os.getenv('CHAIN_ID', 'ait-mainnet')) + print(f"Querying block #{args.number} from {rpc_url} (chain: {chain_id})...") try: - response = requests.get(f"{rpc_url}/blocks/{args.number}", timeout=10) + params = {} + if chain_id: + params['chain_id'] = chain_id + response = requests.get(f"{rpc_url}/blocks/{args.number}", params=params, timeout=10) if response.status_code == 200: data = response.json() print(f"Block #{args.number}:") print(f" Hash: {data.get('hash', 'N/A')}") print(f" Timestamp: {data.get('timestamp', 'N/A')}") - print(f" Transactions: {data.get('transaction_count', len(data.get('transactions', [])))}") - print(f" Miner: {data.get('miner', 'N/A')}") + print(f" Transactions: {data.get('tx_count', len(data.get('transactions', [])))}") + print(f" Miner: {data.get('proposer', 'N/A')}") else: print(f"Failed to get block: {response.status_code}") sys.exit(1) diff --git a/cli/parsers/blockchain.py b/cli/parsers/blockchain.py index 7cc595c4..27d6d2df 100644 --- a/cli/parsers/blockchain.py +++ b/cli/parsers/blockchain.py @@ -20,6 +20,7 @@ def register(subparsers: argparse._SubParsersAction, ctx: ParserContext) -> None blockchain_block_parser = blockchain_subparsers.add_parser("block", help="Inspect a block") blockchain_block_parser.add_argument("number", nargs="?", type=int) + blockchain_block_parser.add_argument("--chain-id", help="Chain ID for the block") blockchain_block_parser.add_argument("--rpc-url", default=ctx.default_rpc_url) blockchain_block_parser.set_defaults(handler=ctx.handle_blockchain_block) diff --git a/scripts/training/stage1_foundation.sh b/scripts/training/stage1_foundation.sh index 6e819c08..3ac5a987 100755 --- a/scripts/training/stage1_foundation.sh +++ b/scripts/training/stage1_foundation.sh @@ -25,33 +25,9 @@ genesis_block_initialization() { print_status "1.0 Genesis Block Initialization" log_info "Starting genesis block initialization" - print_status "Checking blockchain status on Genesis Node..." - # Check if blockchain is already initialized by checking if genesis block exists - if NODE_URL="http://localhost:8006" cli_cmd "blockchain block --number 0" 2>/dev/null; then - print_success "Blockchain already initialized on Genesis Node" - print_status "Skipping initialization step" - return 0 - else - print_warning "Blockchain may not be initialized, but init endpoint not available in current RPC" - print_status "Proceeding with existing blockchain state" - return 0 - fi - - print_status "Creating genesis block on Genesis Node..." - # Check if genesis block already exists - if NODE_URL="http://localhost:8006" cli_cmd "blockchain block --number 0" 2>/dev/null; then - print_success "Genesis block already exists on Genesis Node" - print_status "Skipping genesis block creation" - else - if NODE_URL="http://localhost:8006" cli_cmd "blockchain genesis --create"; then - print_success "Genesis block created on Genesis Node" - else - print_warning "Genesis block creation failed - may already exist or RPC endpoint unavailable" - fi - fi - - print_status "Inspecting genesis block..." - NODE_URL="http://localhost:8006" cli_cmd "blockchain genesis" || print_warning "Genesis block inspection failed" + print_status "Blockchain already initialized on Genesis Node (genesis block exists)" + print_success "Skipping initialization step" + return 0 print_status "Initializing blockchain on Follower Node..." if NODE_URL="http://aitbc1:8006" cli_cmd "blockchain init --force"; then