@xyo-network/xl1-cli-lib 1.19.7 → 1.19.9

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,33 +2,59 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/runCLI.ts
-import { 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";
-import { merge as deepMerge } from "ts-deepmerge";
 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");
 
@@ -56,12 +82,12 @@ var XL1LogoColorizedAscii = `\x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\
 import { Base, ConsoleLogger, isDefined, LogLevel, SilentLogger } from "@xylabs/sdk-js";
 var initLogger = /* @__PURE__ */ __name((config2) => {
   let logger;
-  if (config2.silent) {
+  if (config2.log.silent) {
     logger = new SilentLogger();
   } else {
     let level;
-    if (isDefined(config2.logLevel)) {
-      const parsed = LogLevel[config2.logLevel.toLowerCase()];
+    if (isDefined(config2.log.logLevel)) {
+      const parsed = LogLevel[config2.log.logLevel.toLowerCase()];
       if (isDefined(parsed)) level = parsed;
     }
     logger = new ConsoleLogger(level);
@@ -70,6 +96,294 @@ var initLogger = /* @__PURE__ */ __name((config2) => {
   return logger;
 }, "initLogger");
 
+// src/locatorFromConfig.ts
+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 { 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 ?? {};
+  return await initTelemetry({
+    attributes: {
+      serviceName,
+      serviceVersion
+    },
+    otlpEndpoint,
+    metricsConfig: {
+      endpoint,
+      port
+    }
+  });
+}
+__name(telemetryContextFromConfig, "telemetryContextFromConfig");
+async function contextFromConfigWithoutLocator(config2, logger, serviceName, serviceVersion) {
+  const singletons = {};
+  const caches = {};
+  const telemetryConfig = await telemetryContextFromConfig(config2, serviceName, serviceVersion);
+  const statusReporter = initStatusReporter({
+    logger
+  });
+  return {
+    ...telemetryConfig,
+    config: config2,
+    singletons,
+    caches,
+    logger,
+    statusReporter
+  };
+}
+__name(contextFromConfigWithoutLocator, "contextFromConfigWithoutLocator");
+async function rootLocatorFromConfig(config2, context) {
+  let locator = new ProviderFactoryLocator(context);
+  locator.registerMany([
+    SimpleNetworkStakeViewer.factory(SimpleNetworkStakeViewer.dependencies, {}),
+    SimpleTimeSyncViewer.factory(SimpleTimeSyncViewer.dependencies, {}),
+    SimpleStepViewer.factory(SimpleStepViewer.dependencies, {}),
+    SimpleStepRewardsViewer.factory(SimpleStepRewardsViewer.dependencies, {}),
+    SimpleStepRewardsByPositionViewer.factory(SimpleStepRewardsByPositionViewer.dependencies, {}),
+    SimpleStepRewardsByStakerViewer.factory(SimpleStepRewardsByStakerViewer.dependencies, {}),
+    SimpleStepRewardsByStepViewer.factory(SimpleStepRewardsByStepViewer.dependencies, {}),
+    SimpleStepRewardsTotalViewer.factory(SimpleStepRewardsTotalViewer.dependencies, {}),
+    SimpleBlockValidationViewer.factory(SimpleBlockValidationViewer.dependencies, {
+      state: validateHydratedBlockState,
+      protocol: validateHydratedBlock
+    })
+  ]);
+  locator = await initEvmProvidersIfAvailable(locator);
+  locator = await (isString(config2.remote.rpc?.url) ? remoteLocatorFromConfig(config2, {
+    ...context,
+    locator
+  }) : localLocatorFromConfig(config2, {
+    ...context,
+    locator
+  }));
+  locator.freeze();
+  return locator;
+}
+__name(rootLocatorFromConfig, "rootLocatorFromConfig");
+async function localLocatorFromConfig(config2, context) {
+  const balancesSummaryMap = assertEx(await initBalanceSummaryMap(context), () => "Balance Summary Map not initialized");
+  const transfersSummaryMap = assertEx(await initTransferSummaryMap(context), () => "Transfer Summary Map not initialized");
+  const wallet = await initApiWallet(context);
+  const { writableChainArchivist, readonlyChainArchivist, pendingTransactionsArchivist, pendingBlocksArchivist } = await initServerNode({
+    ...context,
+    wallet,
+    transfersSummaryMap,
+    balancesSummaryMap
+  });
+  await initFinalizationArchivistIfNeeded(writableChainArchivist, config2, wallet);
+  const locator = new ProviderFactoryLocator(context);
+  locator.registerMany([
+    SimpleMempoolViewer.factory(SimpleMempoolViewer.dependencies, {
+      pendingTransactionsArchivist,
+      pendingBlocksArchivist
+    }),
+    SimpleMempoolRunner.factory(SimpleMempoolRunner.dependencies, {
+      pendingTransactionsArchivist,
+      pendingBlocksArchivist
+    }),
+    SimpleAccountBalanceViewer.factory(SimpleAccountBalanceViewer.dependencies, {
+      balancesSummaryMap,
+      transfersSummaryMap
+    }),
+    SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    }),
+    SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    }),
+    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
+      maxWindowSize: 1e4,
+      syncInterval: 1e4
+    }),
+    SimpleXyoConnectionViewer.factory(SimpleXyoConnectionViewer.dependencies, {}),
+    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    })
+  ]);
+  locator.freeze();
+  return locator;
+}
+__name(localLocatorFromConfig, "localLocatorFromConfig");
+async function remoteLocatorFromConfig(config2, context) {
+  const balancesSummaryMap = assertEx(await initBalanceSummaryMap(context), () => "Balance Summary Map not initialized");
+  const transfersSummaryMap = assertEx(await initTransferSummaryMap(context), () => "Transfer Summary Map not initialized");
+  const wallet = await initApiWallet(context);
+  const { readonlyChainArchivist, pendingTransactionsArchivist, pendingBlocksArchivist } = await initServerNode({
+    ...context,
+    wallet,
+    transfersSummaryMap,
+    balancesSummaryMap
+  });
+  const locator = new ProviderFactoryLocator(context);
+  locator.registerMany([
+    SimpleMempoolViewer.factory(SimpleMempoolViewer.dependencies, {
+      pendingTransactionsArchivist,
+      pendingBlocksArchivist
+    }),
+    SimpleMempoolRunner.factory(SimpleMempoolRunner.dependencies, {
+      pendingTransactionsArchivist,
+      pendingBlocksArchivist
+    }),
+    SimpleAccountBalanceViewer.factory(SimpleAccountBalanceViewer.dependencies, {
+      balancesSummaryMap,
+      transfersSummaryMap
+    }),
+    SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    }),
+    SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    }),
+    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
+      maxWindowSize: 1e4,
+      syncInterval: 1e4
+    }),
+    SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {
+      finalizedArchivist: readonlyChainArchivist
+    })
+  ]);
+  locator.freeze();
+  return locator;
+}
+__name(remoteLocatorFromConfig, "remoteLocatorFromConfig");
+async function producerLocatorFromConfig(config2, context) {
+  const { logger } = context;
+  const account = await initProducerAccount({
+    config: config2
+  });
+  const locator = new ProviderFactoryLocator(context);
+  const rewardAddress = asAddress(config2.actors.producer.rewardAddress ?? account.address, true);
+  logger?.info(`Using reward address ${rewardAddress}`);
+  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, {
+      account,
+      rewardAddress
+    })
+  ]);
+  locator.freeze();
+  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)
+  };
+  const producer = actors.includes("producer") ? await producerLocatorFromConfig(config2, result._root.context) : void 0;
+  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");
+
 // src/optionsFromGlobalZodRegistry.ts
 import { isUsageMeta } from "@xyo-network/xl1-sdk";
 import { globalRegistry } from "zod";
@@ -88,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";
@@ -98,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);
     }
   }
@@ -128,7 +442,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined3("1.19.6") ? "1.19.6" : "unknown";
+var version = isDefined4("1.19.8") ? "1.19.8" : "unknown";
 function resolveConfig(config2) {
   const logger = console;
   const defaultChainId = toAddress("1");
@@ -140,11 +454,13 @@ function resolveConfig(config2) {
   return resolved;
 }
 __name(resolveConfig, "resolveConfig");
-var getContextFromConfig = /* @__PURE__ */ __name(async (configuration2) => {
+var getLocatorsFromConfig = /* @__PURE__ */ __name(async (actors, configuration2) => {
   const logger = initLogger(configuration2);
   const orchestrator = await Orchestrator.create({
     logger
   });
+  const context = await contextFromConfigWithoutLocator(configuration2, logger, "xl1-cli", version);
+  const locators = await locatorsFromConfig(actors, configuration2, context);
   process.on("SIGINT", () => {
     void (async () => {
       try {
@@ -159,10 +475,10 @@ var getContextFromConfig = /* @__PURE__ */ __name(async (configuration2) => {
     })();
   });
   return {
-    logger,
+    locators,
     orchestrator
   };
-}, "getContextFromConfig");
+}, "getLocatorsFromConfig");
 async function runCLI() {
   const y = yargs(hideBin(process.argv));
   const argv = y.usage(`
@@ -194,6 +510,15 @@ $0 <command> [options]`).parserConfiguration({
         throw validatedConfigResult.error;
       }
       configuration = validatedConfigResult.data;
+      const { actors, ...rootConfig } = configuration;
+      const actorNames = Object.keys(actors);
+      for (const actorName of actorNames) {
+        configuration.actors[actorName] = deepMerge(rootConfig ?? {}, configuration.actors[actorName] ?? {});
+      }
+      if (argv2["dump-config"]) {
+        console.log(JSON.stringify(configuration, null, 2));
+        process.exit(0);
+      }
     } catch (err) {
       if (isZodError(err)) {
         console.error(`Zod error: ${err.message}`);
@@ -206,71 +531,69 @@ $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", () => {
     }, async () => {
-      const context = await getContextFromConfig(configuration);
-      await runProducer({
-        ...context,
-        config: configuration,
-        singletons: {}
-      });
+      const { locators, orchestrator } = await getLocatorsFromConfig([
+        "producer"
+      ], configuration);
+      await runProducer(configuration, orchestrator, locators["producer"]);
     });
   }).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 () => {
-    const context = await getContextFromConfig(configuration);
-    if (configuration.mempool.enabled) {
-      runMempool({
-        ...context,
-        config: configuration
-      });
-      await waitForHostPort(configuration.mempool.host, configuration.mempool.port);
+    const actors = [
+      "producer",
+      "api"
+    ];
+    if (configuration.actors.mempool.enabled) {
+      actors.push("mempool");
+    }
+    const { locators, orchestrator } = await getLocatorsFromConfig([
+      "api",
+      "producer"
+    ], configuration);
+    if (configuration.actors.mempool.enabled) {
+      await runMempool(configuration, orchestrator, locators["mempool"]);
+      await waitForHostPort(configuration.actors.mempool.host, configuration.actors.mempool.port);
+    }
+    await runApi(configuration, orchestrator, locators["api"]);
+    await waitForHostPort(configuration.actors.api.host, configuration.actors.api.port);
+    await runProducer(configuration, orchestrator, locators["producer"]);
+  }).options({
+    "dump-config": {
+      type: "boolean",
+      description: "Just process the configuration and print the resolved config to stdout, then exit.",
+      default: false
     }
-    await runApi({
-      ...context,
-      config: configuration,
-      singletons: {}
-    });
-    await waitForHostPort(configuration.api.host, configuration.api.port);
-    await runProducer({
-      ...context,
-      config: configuration,
-      singletons: {}
-    });
   }).help().alias("help", "h").version(version).argv;
   await argv;
 }