@xyo-network/xl1-cli-lib 1.19.8 → 1.19.10

package/dist/node/commands/bridge/runBridge.d.ts

@@ -1,9 +1,4 @@
-import type { Logger } from '@xylabs/sdk-js';
-import type { Config } from '@xyo-network/xl1-sdk';
-interface RunBridgeContext {
-    config: Config;
-    logger?: Logger;
-}
-export declare function runBridge(context: RunBridgeContext): void;
-export {};
+import { type OrchestratorInstance } from '@xyo-network/chain-orchestration';
+import type { Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk';
+export declare const runBridge: (config: Config, orchestrator: OrchestratorInstance, locator: ProviderFactoryLocatorInstance) => Promise<void>;
 //# sourceMappingURL=runBridge.d.ts.map

package/dist/node/commands/bridge/runBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runBridge.d.ts","sourceRoot":"","sources":["../../../../src/commands/bridge/runBridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,QAElD"}
+{"version":3,"file":"runBridge.d.ts","sourceRoot":"","sources":["../../../../src/commands/bridge/runBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAC9F,OAAO,KAAK,EACV,MAAM,EACN,8BAA8B,EAC/B,MAAM,sBAAsB,CAAA;AAE7B,eAAO,MAAM,SAAS,GACpB,QAAQ,MAAM,EACd,cAAc,oBAAoB,EAClC,SAAS,8BAA8B,kBAexC,CAAA"}

package/dist/node/commands/index.d.ts

@@ -1,5 +1,4 @@
 export * from './bridge/index.ts';
-export * from './mempool/index.ts';
 export * from './rewardRedemption/index.ts';
 export * from './validator/index.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA"}

package/dist/node/commands/rewardRedemption/runRewardRedemptionApi.d.ts

@@ -1,9 +1,4 @@
-import type { Logger } from '@xylabs/sdk-js';
-import type { Config } from '@xyo-network/xl1-sdk';
-interface RunRewardRedemptionApiContext {
-    config: Config;
-    logger?: Logger;
-}
-export declare function runRewardRedemptionApi(context: RunRewardRedemptionApiContext): void;
-export {};
+import type { OrchestratorInstance } from '@xyo-network/chain-orchestration';
+import type { Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk';
+export declare function runRewardRedemptionApi(config: Config, orchestrator: OrchestratorInstance, locator: ProviderFactoryLocatorInstance): Promise<void>;
 //# sourceMappingURL=runRewardRedemptionApi.d.ts.map

package/dist/node/commands/rewardRedemption/runRewardRedemptionApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runRewardRedemptionApi.d.ts","sourceRoot":"","sources":["../../../../src/commands/rewardRedemption/runRewardRedemptionApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,UAAU,6BAA6B;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,6BAA6B,QAE5E"}
+{"version":3,"file":"runRewardRedemptionApi.d.ts","sourceRoot":"","sources":["../../../../src/commands/rewardRedemption/runRewardRedemptionApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAG5E,OAAO,KAAK,EAAE,MAAM,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAA;AAElF,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,EAClC,OAAO,EAAE,8BAA8B,iBAexC"}

package/dist/node/commands/validator/runValidator.d.ts

@@ -1,12 +1,4 @@
-import type { AccountInstance } from '@xyo-network/account-model';
-import type { OrchestratorInstance } from '@xyo-network/chain-orchestration';
-import type { CachingContext, Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk';
-interface RunValidatorContext extends CachingContext {
-    account: AccountInstance;
-    config: Config;
-    locator: ProviderFactoryLocatorInstance;
-    orchestrator: OrchestratorInstance;
-}
-export declare const runValidator: (context: RunValidatorContext) => Promise<void>;
-export {};
+import { type OrchestratorInstance } from '@xyo-network/chain-orchestration';
+import type { Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk';
+export declare const runValidator: (config: Config, orchestrator: OrchestratorInstance, locator: ProviderFactoryLocatorInstance) => Promise<void>;
 //# sourceMappingURL=runValidator.d.ts.map

package/dist/node/commands/validator/runValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runValidator.d.ts","sourceRoot":"","sources":["../../../../src/commands/validator/runValidator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,KAAK,EACV,cAAc,EAAE,MAAM,EAAE,8BAA8B,EACvD,MAAM,sBAAsB,CAAA;AAE7B,UAAU,mBAAoB,SAAQ,cAAc;IAClD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,8BAA8B,CAAA;IACvC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,eAAO,MAAM,YAAY,GAAU,SAAS,mBAAmB,kBAuB9D,CAAA"}
+{"version":3,"file":"runValidator.d.ts","sourceRoot":"","sources":["../../../../src/commands/validator/runValidator.ts"],"names":[],"mappings":"AACA,OAAO,EACgB,KAAK,oBAAoB,EAC/C,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EACV,MAAM,EACN,8BAA8B,EAC/B,MAAM,sBAAsB,CAAA;AAE7B,eAAO,MAAM,YAAY,GACvB,QAAQ,MAAM,EACd,cAAc,oBAAoB,EAClC,SAAS,8BAA8B,kBAexC,CAAA"}

package/dist/node/index.mjs

@@ -2,8 +2,9 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/runCLI.ts
-import { deepMerge, isDefined as isDefined3, toAddress } from "@xylabs/sdk-js";
+import { deepMerge, isDefined as isDefined4, toAddress } from "@xylabs/sdk-js";
 import { runApi } from "@xyo-network/chain-api";
+import { runMempool } from "@xyo-network/chain-mempool";
 import { Orchestrator } from "@xyo-network/chain-orchestration";
 import { runProducer } from "@xyo-network/chain-producer";
 import { ConfigZod as ConfigZod2, isZodError } from "@xyo-network/xl1-sdk";
@@ -11,23 +12,49 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/bridge/runBridge.ts
-import { getServer } from "@xyo-network/chain-bridge";
-function runBridge(context) {
-  void getServer(context);
-}
-__name(runBridge, "runBridge");
-
-// src/commands/mempool/runMempool.ts
-import { getServer as getServer2 } from "@xyo-network/chain-mempool";
-function runMempool(context) {
-  void getServer2(context);
-}
-__name(runMempool, "runMempool");
+import { exists } from "@xylabs/sdk-js";
+import { BridgeActor } from "@xyo-network/chain-bridge";
+import { initBridgeWallet } from "@xyo-network/chain-orchestration";
+var runBridge = /* @__PURE__ */ __name(async (config2, orchestrator, locator) => {
+  const account = await initBridgeWallet({
+    config: config2,
+    logger: locator.context.logger
+  });
+  const api = await BridgeActor.create({
+    account,
+    config: config2,
+    locator
+  });
+  const actors = [
+    api
+  ].filter(exists);
+  for (const actor of actors) {
+    await orchestrator.registerActor(actor);
+  }
+  await orchestrator.start();
+}, "runBridge");
 
 // src/commands/rewardRedemption/runRewardRedemptionApi.ts
-import { getServer as getServer3 } from "@xyo-network/chain-reward-redemption";
-function runRewardRedemptionApi(context) {
-  void getServer3(context);
+import { exists as exists2 } from "@xylabs/sdk-js";
+import { initRewardsRedemptionApiWallet } from "@xyo-network/chain-orchestration";
+import { RewardRedemptionActor } from "@xyo-network/chain-reward-redemption";
+async function runRewardRedemptionApi(config2, orchestrator, locator) {
+  const account = await initRewardsRedemptionApiWallet({
+    config: config2,
+    logger: locator.context.logger
+  });
+  const rewardRedemption = await RewardRedemptionActor.create({
+    account,
+    config: config2,
+    locator
+  });
+  const actors = [
+    rewardRedemption
+  ].filter(exists2);
+  for (const actor of actors) {
+    await orchestrator.registerActor(actor);
+  }
+  await orchestrator.start();
 }
 __name(runRewardRedemptionApi, "runRewardRedemptionApi");
 
@@ -70,12 +97,13 @@ var initLogger = /* @__PURE__ */ __name((config2) => {
 }, "initLogger");
 
 // src/locatorFromConfig.ts
-import { asAddress, assertEx, isString } from "@xylabs/sdk-js";
+import { asAddress, assertEx, isDefined as isDefined2, isString } from "@xylabs/sdk-js";
 import { initApiWallet, initBalanceSummaryMap, initEvmProvidersIfAvailable, initFinalizationArchivistIfNeeded, initProducerAccount, initServerNode, initStatusReporter, initTransferSummaryMap } from "@xyo-network/chain-orchestration";
 import { SimpleBlockRunner } from "@xyo-network/chain-services";
 import { initTelemetry } from "@xyo-network/chain-telemetry";
 import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
-import { ProviderFactoryLocator, SimpleAccountBalanceViewer, SimpleBlockRewardViewer, SimpleBlockValidationViewer, SimpleBlockViewer, SimpleFinalizationViewer, SimpleMempoolRunner, SimpleMempoolViewer, SimpleNetworkStakeViewer, SimpleStepRewardsByPositionViewer, SimpleStepRewardsByStakerViewer, SimpleStepRewardsByStepViewer, SimpleStepRewardsTotalViewer, SimpleStepRewardsViewer, SimpleStepViewer, SimpleTimeSyncViewer, SimpleWindowedBlockViewer, SimpleXyoViewer } from "@xyo-network/xl1-sdk";
+import { HDWallet } from "@xyo-network/wallet";
+import { AccountBalanceViewerRpcSchemas, ADDRESS_INDEX, BlockViewerRpcSchemas, FinalizationViewerRpcSchemas, generateXyoBaseWalletFromPhrase, HttpRpcTransport, JsonRpcAccountBalanceViewer, JsonRpcBlockViewer, JsonRpcFinalizationViewer, JsonRpcMempoolRunner, JsonRpcMempoolViewer, MempoolRunnerRpcSchemas, MempoolViewerRpcSchemas, ProviderFactoryLocator, SimpleAccountBalanceViewer, SimpleBlockRewardViewer, SimpleBlockValidationViewer, SimpleBlockViewer, SimpleFinalizationViewer, SimpleMempoolRunner, SimpleMempoolViewer, SimpleNetworkStakeViewer, SimpleStepRewardsByPositionViewer, SimpleStepRewardsByStakerViewer, SimpleStepRewardsByStepViewer, SimpleStepRewardsTotalViewer, SimpleStepRewardsViewer, SimpleStepViewer, SimpleTimeSyncViewer, SimpleWindowedBlockViewer, SimpleXyoConnectionRunner, SimpleXyoConnectionViewer, SimpleXyoGatewayRunner, SimpleXyoRunner, SimpleXyoSigner, SimpleXyoViewer } from "@xyo-network/xl1-sdk";
 async function telemetryContextFromConfig(config2, serviceName, serviceVersion) {
   const { otlpEndpoint } = config2.telemetry?.otel ?? {};
   const { path: endpoint = "/metrics", port = 9466 } = config2.telemetry?.metrics?.scrape ?? {};
@@ -172,7 +200,10 @@ async function localLocatorFromConfig(config2, context) {
       maxWindowSize: 1e4,
       syncInterval: 1e4
     }),
-    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {})
+    SimpleXyoConnectionViewer.factory(SimpleXyoConnectionViewer.dependencies, {}),
+    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    })
   ]);
   locator.freeze();
   return locator;
@@ -212,7 +243,9 @@ async function remoteLocatorFromConfig(config2, context) {
       maxWindowSize: 1e4,
       syncInterval: 1e4
     }),
-    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {})
+    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    })
   ]);
   locator.freeze();
   return locator;
@@ -229,6 +262,27 @@ async function producerLocatorFromConfig(config2, context) {
   if (rewardAddress === account.address) {
     logger?.warn(`Using producer account address as reward address: ${account.address}`);
   }
+  const remoteUrl = config2.remote.rpc?.url;
+  if (isString(remoteUrl)) {
+    const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(remoteUrl, schemas), "transportFactory");
+    locator.registerMany([
+      JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {
+        transport: await transportFactory(MempoolViewerRpcSchemas)
+      }),
+      JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {
+        transport: await transportFactory(MempoolRunnerRpcSchemas)
+      }),
+      JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {
+        transport: await transportFactory(AccountBalanceViewerRpcSchemas)
+      }),
+      JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {
+        transport: await transportFactory(FinalizationViewerRpcSchemas)
+      }),
+      JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {
+        transport: await transportFactory(BlockViewerRpcSchemas)
+      })
+    ]);
+  }
   locator.registerMany([
     SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies, {}),
     SimpleBlockRunner.factory(SimpleBlockRunner.dependencies, {
@@ -240,6 +294,68 @@ async function producerLocatorFromConfig(config2, context) {
   return locator;
 }
 __name(producerLocatorFromConfig, "producerLocatorFromConfig");
+function apiLocatorFromConfig(config2, context) {
+  const locator = new ProviderFactoryLocator(context);
+  locator.registerMany([]);
+  locator.freeze();
+  return locator;
+}
+__name(apiLocatorFromConfig, "apiLocatorFromConfig");
+function mempoolLocatorFromConfig(config2, context) {
+  const locator = new ProviderFactoryLocator(context);
+  locator.registerMany([]);
+  locator.freeze();
+  return locator;
+}
+__name(mempoolLocatorFromConfig, "mempoolLocatorFromConfig");
+async function bridgeLocatorFromConfig(config2, context) {
+  const locator = new ProviderFactoryLocator(context);
+  const { mnemonic } = config2.actors.bridge;
+  const walletPhrase = isDefined2(mnemonic) ? mnemonic : HDWallet.generateMnemonic();
+  const wallet = await generateXyoBaseWalletFromPhrase(walletPhrase);
+  const signerAccount = await wallet.derivePath(ADDRESS_INDEX.XYO);
+  const remoteUrl = config2.actors.bridge.remote.rpc?.url;
+  if (isString(remoteUrl)) {
+    const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(remoteUrl, schemas), "transportFactory");
+    locator.registerMany([
+      JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {
+        transport: await transportFactory(MempoolViewerRpcSchemas)
+      }),
+      JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {
+        transport: await transportFactory(MempoolRunnerRpcSchemas)
+      }),
+      JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {
+        transport: await transportFactory(AccountBalanceViewerRpcSchemas)
+      }),
+      JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {
+        transport: await transportFactory(FinalizationViewerRpcSchemas)
+      }),
+      JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {
+        transport: await transportFactory(BlockViewerRpcSchemas)
+      })
+    ]);
+  }
+  locator.registerMany([
+    SimpleXyoSigner.factory(SimpleXyoSigner.dependencies, {
+      account: signerAccount
+    }),
+    SimpleXyoRunner.factory(SimpleXyoRunner.dependencies, {}),
+    SimpleXyoConnectionRunner.factory(SimpleXyoConnectionRunner.dependencies, {}),
+    SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {})
+  ]);
+  locator.freeze();
+  return locator;
+}
+__name(bridgeLocatorFromConfig, "bridgeLocatorFromConfig");
+function rewardRedemptionLocatorFromConfig(config2, context) {
+  const locator = new ProviderFactoryLocator(context);
+  locator.registerMany([
+    SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {})
+  ]);
+  locator.freeze();
+  return locator;
+}
+__name(rewardRedemptionLocatorFromConfig, "rewardRedemptionLocatorFromConfig");
 async function locatorsFromConfig(actors, config2, context) {
   const result = {
     _root: await rootLocatorFromConfig(config2, context)
@@ -248,6 +364,22 @@ async function locatorsFromConfig(actors, config2, context) {
   if (producer) {
     result.producer = producer;
   }
+  const api = actors.includes("api") ? await apiLocatorFromConfig(config2, result._root.context) : void 0;
+  if (api) {
+    result.api = api;
+  }
+  const mempool = actors.includes("mempool") ? await mempoolLocatorFromConfig(config2, result._root.context) : void 0;
+  if (mempool) {
+    result.mempool = mempool;
+  }
+  const bridge = actors.includes("bridge") ? await bridgeLocatorFromConfig(config2, result._root.context) : void 0;
+  if (bridge) {
+    result.bridge = bridge;
+  }
+  const rewardRedemption = actors.includes("rewardRedemption") ? await rewardRedemptionLocatorFromConfig(config2, result._root.context) : void 0;
+  if (rewardRedemption) {
+    result.rewardRedemption = rewardRedemption;
+  }
   return result;
 }
 __name(locatorsFromConfig, "locatorsFromConfig");
@@ -270,7 +402,7 @@ var optionsFromGlobalZodRegistry = /* @__PURE__ */ __name(() => {
 }, "optionsFromGlobalZodRegistry");
 
 // src/tryParseConfig.ts
-import { isDefined as isDefined2, isNull } from "@xylabs/sdk-js";
+import { isDefined as isDefined3, isNull } from "@xylabs/sdk-js";
 import { ConfigZod } from "@xyo-network/xl1-sdk";
 import { cosmiconfigSync } from "cosmiconfig";
 var configName = "xyo";
@@ -280,7 +412,7 @@ var tryParseConfig = /* @__PURE__ */ __name(() => {
   const result = explorer.search();
   if (!isNull(result)) {
     const section = result?.config?.[configSection];
-    if (isDefined2(section) && typeof section === "object") {
+    if (isDefined3(section) && typeof section === "object") {
       return ConfigZod.parse(section);
     }
   }
@@ -310,7 +442,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined3("1.19.7") ? "1.19.7" : "unknown";
+var version = isDefined4("1.19.9") ? "1.19.9" : "unknown";
 function resolveConfig(config2) {
   const logger = console;
   const defaultChainId = toAddress("1");
@@ -322,29 +454,6 @@ function resolveConfig(config2) {
   return resolved;
 }
 __name(resolveConfig, "resolveConfig");
-var getContextFromConfig = /* @__PURE__ */ __name(async (configuration2) => {
-  const logger = initLogger(configuration2);
-  const orchestrator = await Orchestrator.create({
-    logger
-  });
-  process.on("SIGINT", () => {
-    void (async () => {
-      try {
-        logger.log("\nSIGINT received. Attempting graceful shutdown...");
-        await orchestrator?.stop();
-        logger.log("Orchestrator stopped, exiting now.");
-        process.exit(0);
-      } catch (err) {
-        logger.error("Error stopping orchestrator:", err);
-        process.exit(1);
-      }
-    })();
-  });
-  return {
-    logger,
-    orchestrator
-  };
-}, "getContextFromConfig");
 var getLocatorsFromConfig = /* @__PURE__ */ __name(async (actors, configuration2) => {
   const logger = initLogger(configuration2);
   const orchestrator = await Orchestrator.create({
@@ -422,30 +531,26 @@ $0 <command> [options]`).parserConfiguration({
   }).options(optionsFromGlobalZodRegistry()).wrap(y.terminalWidth()).command("api", "Run a XL1 API Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 API Node", () => {
     }, async () => {
-      const context = await getContextFromConfig(configuration);
-      await runApi({
-        ...context,
-        config: configuration,
-        singletons: {}
-      });
+      const { locators, orchestrator } = await getLocatorsFromConfig([
+        "api"
+      ], configuration);
+      await runApi(configuration, orchestrator, locators["api"]);
     });
   }).command("bridge", "Run a XL1 Bridge Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Bridge Node", () => {
     }, async () => {
-      const context = await getContextFromConfig(configuration);
-      runBridge({
-        ...context,
-        config: configuration
-      });
+      const { locators, orchestrator } = await getLocatorsFromConfig([
+        "bridge"
+      ], configuration);
+      await runBridge(configuration, orchestrator, locators["bridge"]);
     });
   }).command("mempool", "Run a XL1 Mempool Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Mempool Node", () => {
     }, async () => {
-      const context = await getContextFromConfig(configuration);
-      runMempool({
-        ...context,
-        config: configuration
-      });
+      const { locators, orchestrator } = await getLocatorsFromConfig([
+        "mempool"
+      ], configuration);
+      await runMempool(configuration, orchestrator, locators["mempool"]);
     });
   }).command("producer", "Run a XL1 Producer Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Producer Node", () => {
@@ -458,11 +563,10 @@ $0 <command> [options]`).parserConfiguration({
   }).command("reward-redemption-api", "Run a XL1 Rewards Redemption API Node", (yargs2) => {
     return yargs2.command("$0", "Run a XL1 Rewards Redemption API Node", () => {
     }, async () => {
-      const context = await getContextFromConfig(configuration);
-      runRewardRedemptionApi({
-        ...context,
-        config: configuration
-      });
+      const { locators, orchestrator } = await getLocatorsFromConfig([
+        "rewardRedemption"
+      ], configuration);
+      await runRewardRedemptionApi(configuration, orchestrator, locators["rewardRedemption"]);
     });
   }).command("$0", "Run a full XL1 Node", () => {
   }, async () => {
@@ -473,22 +577,15 @@ $0 <command> [options]`).parserConfiguration({
     if (configuration.actors.mempool.enabled) {
       actors.push("mempool");
     }
-    const context = await getContextFromConfig(configuration);
     const { locators, orchestrator } = await getLocatorsFromConfig([
+      "api",
       "producer"
     ], configuration);
     if (configuration.actors.mempool.enabled) {
-      runMempool({
-        ...context,
-        config: configuration
-      });
+      await runMempool(configuration, orchestrator, locators["mempool"]);
       await waitForHostPort(configuration.actors.mempool.host, configuration.actors.mempool.port);
     }
-    await runApi({
-      ...context,
-      config: configuration,
-      singletons: {}
-    });
+    await runApi(configuration, orchestrator, locators["api"]);
     await waitForHostPort(configuration.actors.api.host, configuration.actors.api.port);
     await runProducer(configuration, orchestrator, locators["producer"]);
   }).options({