@aztec/aztec-node 0.0.1-commit.9ef841308 → 0.0.1-commit.a5db02d

package/src/bin/index.ts

@@ -1,11 +1,18 @@
 #!/usr/bin/env -S node --no-warnings
+import {
+  type NamespacedApiHandlers,
+  createNamespacedSafeJsonRpcServer,
+  startHttpRpcServer,
+} from '@aztec/foundation/json-rpc/server';
 import { createLogger } from '@aztec/foundation/log';
-import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
-import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
+import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 
-import http from 'http';
-
-import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '../index.js';
+import {
+  type AztecNodeConfig,
+  createAztecNodeService,
+  getConfigEnvVars,
+  registerAztecNodeRpcHandlers,
+} from '../index.js';
 
 const { AZTEC_NODE_PORT = 8081, API_PREFIX = '' } = process.env;
 
@@ -17,7 +24,7 @@ const logger = createLogger('node');
 async function createAndDeployAztecNode() {
   const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars() };
 
-  return await AztecNodeService.createAndSync(aztecNodeConfig);
+  return await createAztecNodeService(aztecNodeConfig);
 }
 
 /**
@@ -39,12 +46,12 @@ async function main() {
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   process.once('SIGTERM', shutdown);
 
-  const rpcServer = createTracedJsonRpcServer(aztecNode, AztecNodeApiSchema);
-  const app = rpcServer.getApp(API_PREFIX);
-
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  const httpServer = http.createServer(app.callback());
-  httpServer.listen(+AZTEC_NODE_PORT);
+  const services: NamespacedApiHandlers = {};
+  registerAztecNodeRpcHandlers(aztecNode, services);
+  const rpcServer = createNamespacedSafeJsonRpcServer(services, {
+    middlewares: [getOtelJsonRpcPropagationMiddleware()],
+  });
+  await startHttpRpcServer(rpcServer, { port: +AZTEC_NODE_PORT, apiPrefix: API_PREFIX });
   logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
 }