@xyo-network/chain-orchestration 1.20.16 → 1.20.17

package/dist/node/index.mjs

@@ -354,140 +354,6 @@ var isValidatorConfigContext = zodIsFactory6(ValidatorConfigContext);
 var asValidatorConfigContext = zodAsFactory6(ValidatorConfigContext, "asValidatorConfigContext");
 var toValidatorConfigContext = zodToFactory6(ValidatorConfigContext, "toValidatorConfigContext");
 
-// src/shared/config/locators/basicRemoteRunnerLocator.ts
-import { isDefined as isDefined2 } from "@xylabs/sdk-js";
-import { JsonRpcXyoRunner, JsonRpcXyoSigner, ProviderFactoryLocator as ProviderFactoryLocator4, RestDataLakeViewer as RestDataLakeViewer2, SimpleXyoConnectionRunner, SimpleXyoGatewayRunner } from "@xyo-network/xl1-sdk";
-
-// src/shared/config/locators/basicRemoteViewerLocator.ts
-import { isDefined } from "@xylabs/sdk-js";
-import { ActorConfigZod as ActorConfigZod2, ProviderFactoryLocator as ProviderFactoryLocator3, RestDataLakeViewer, SimpleTransactionViewer as SimpleTransactionViewer2, SimpleXyoConnectionViewer, SimpleXyoGateway } from "@xyo-network/xl1-sdk";
-
-// src/shared/config/locators/commonLocatorFromConfig.ts
-import { ProviderFactoryLocator, SimpleBlockRewardViewer, SimpleNetworkStakeViewer, SimpleStepRewardsByPositionViewer, SimpleStepRewardsByStakerViewer, SimpleStepRewardsByStepViewer, SimpleStepRewardsTotalViewer, SimpleStepRewardsViewer, SimpleStepViewer, SimpleTimeSyncViewer, SimpleTransactionValidationViewer, SimpleTransactionViewer, SimpleWindowedBlockViewer } from "@xyo-network/xl1-sdk";
-function commonLocatorFromConfig(context, validateDepsOnRegister = false) {
-  const locator = new ProviderFactoryLocator(context, {}, validateDepsOnRegister);
-  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, {}),
-    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
-      maxWindowSize: 1e3,
-      syncInterval: 1e4
-    }),
-    SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies, {}),
-    SimpleTransactionViewer.factory(SimpleTransactionViewer.dependencies, {}),
-    SimpleTransactionValidationViewer.factory(SimpleTransactionValidationViewer.dependencies, {})
-  ]);
-  return locator;
-}
-__name(commonLocatorFromConfig, "commonLocatorFromConfig");
-
-// src/shared/config/locators/remoteLocatorFromConfig.ts
-import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
-import { BlockCumulativeBalanceValidatorFactory, JsonRpcAccountBalanceViewer, JsonRpcBlockViewer, JsonRpcFinalizationViewer, JsonRpcMempoolRunner, JsonRpcMempoolViewer, JsonRpcNetworkStakeViewer, JsonRpcStakeViewer, JsonRpcTransactionViewer, JsonRpcXyoViewer, ProviderFactoryLocator as ProviderFactoryLocator2, SimpleBlockValidationViewer, SimpleStakeEventsViewer } from "@xyo-network/xl1-sdk";
-var cumulativeBalanceValidator = BlockCumulativeBalanceValidatorFactory();
-var validateHydratedBlockStateWithCumulativeBalance = /* @__PURE__ */ __name(async (context, block) => {
-  const [stateErrors, cumulativeErrors] = await Promise.all([
-    validateHydratedBlockState(context, block),
-    cumulativeBalanceValidator(context, block)
-  ]);
-  return [
-    ...stateErrors,
-    ...cumulativeErrors
-  ];
-}, "validateHydratedBlockStateWithCumulativeBalance");
-function remoteLocatorFromConfig(context, validateDepsOnRegister = false) {
-  const locator = new ProviderFactoryLocator2(context, {}, validateDepsOnRegister);
-  locator.registerMany([
-    JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {}),
-    JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {}),
-    JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {}),
-    JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {}),
-    JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {}),
-    JsonRpcTransactionViewer.factory(JsonRpcTransactionViewer.dependencies, {}),
-    JsonRpcNetworkStakeViewer.factory(JsonRpcNetworkStakeViewer.dependencies, {}),
-    JsonRpcStakeViewer.factory(JsonRpcStakeViewer.dependencies, {}),
-    SimpleStakeEventsViewer.factory(SimpleStakeEventsViewer.dependencies, {
-      positions: []
-    }),
-    JsonRpcXyoViewer.factory(JsonRpcXyoViewer.dependencies, {}),
-    SimpleBlockValidationViewer.factory(SimpleBlockValidationViewer.dependencies, {
-      state: validateHydratedBlockStateWithCumulativeBalance,
-      protocol: validateHydratedBlock
-    })
-  ]);
-  return locator;
-}
-__name(remoteLocatorFromConfig, "remoteLocatorFromConfig");
-
-// src/shared/config/locators/basicRemoteViewerLocator.ts
-async function baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, options) {
-  const config = ActorConfigZod2.parse({
-    name,
-    remote: remoteConfig
-  });
-  const rootLocator = await commonLocatorFromConfig({
-    config,
-    singletons: {},
-    caches: {}
-  });
-  const remoteLocator = await remoteLocatorFromConfig(rootLocator.context);
-  const locator = new ProviderFactoryLocator3(remoteLocator.context, {});
-  locator.registerMany([
-    SimpleXyoGateway.factory(SimpleXyoGateway.dependencies, {}),
-    SimpleXyoConnectionViewer.factory(SimpleXyoConnectionViewer.dependencies, {}),
-    SimpleTransactionViewer2.factory(SimpleTransactionViewer2.dependencies, {}),
-    ...options?.additionalProviders ?? []
-  ]);
-  if (isDefined(dataLakeEndpoint)) {
-    const dataLakeViewerParams = {
-      endpoint: dataLakeEndpoint
-    };
-    locator.register(RestDataLakeViewer.factory(RestDataLakeViewer.dependencies, dataLakeViewerParams));
-  }
-  locator.freeze();
-  return locator;
-}
-__name(baseBasicRemoteViewerLocator, "baseBasicRemoteViewerLocator");
-
-// src/shared/config/locators/basicRemoteRunnerLocator.ts
-async function baseBasicRemoteRunnerLocator(name, remoteConfig, signerTransport, dataLakeEndpoint, options) {
-  const remoteViewerLocator = await baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, options);
-  const locator = new ProviderFactoryLocator4(remoteViewerLocator.context, {});
-  const providers = [
-    SimpleXyoConnectionRunner.factory(SimpleXyoConnectionRunner.dependencies, {}),
-    JsonRpcXyoRunner.factory(JsonRpcXyoRunner.dependencies, {})
-  ];
-  if (!options?.skipGatewayRunner) {
-    providers.push(SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {}));
-  }
-  locator.registerMany([
-    ...providers,
-    ...options?.additionalRunnerProviders ?? []
-  ]);
-  if (options?.signerFactory) {
-    locator.register(options.signerFactory);
-  } else {
-    locator.register(JsonRpcXyoSigner.factory(JsonRpcXyoSigner.dependencies, {
-      transport: signerTransport
-    }));
-  }
-  if (isDefined2(dataLakeEndpoint)) {
-    const dataLakeViewerParams = {
-      endpoint: dataLakeEndpoint
-    };
-    locator.register(RestDataLakeViewer2.factory(RestDataLakeViewer2.dependencies, dataLakeViewerParams));
-  }
-  locator.freeze();
-  return locator;
-}
-__name(baseBasicRemoteRunnerLocator, "baseBasicRemoteRunnerLocator");
-
 // src/shared/config/mergeConfig.ts
 import { deepMerge } from "@xylabs/sdk-js";
 function mergeConfig({ actors, ...baseConfig }) {
@@ -553,13 +419,13 @@ var ServiceLifetime = {
 };
 
 // src/shared/init/initActorAccount.ts
-import { isDefined as isDefined3, isUndefined } from "@xylabs/sdk-js";
+import { isDefined, isUndefined } from "@xylabs/sdk-js";
 import { HDWallet } from "@xyo-network/sdk-js";
 import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from "@xyo-network/xl1-sdk";
 var actorAccountSingletons = {};
 async function initActorAccount({ config, logger }) {
   const actorName = config.name;
-  if (isDefined3(actorAccountSingletons[actorName])) return actorAccountSingletons[actorName];
+  if (isDefined(actorAccountSingletons[actorName])) return actorAccountSingletons[actorName];
   let walletPhrase = config.mnemonic;
   if (isUndefined(walletPhrase)) {
     logger?.warn(`[${actorName}}] No wallet mnemonic specified!`);
@@ -655,12 +521,12 @@ function initStatusReporter({ logger }) {
 __name(initStatusReporter, "initStatusReporter");
 
 // src/shared/init/initWallet.ts
-import { isDefined as isDefined4 } from "@xylabs/sdk-js";
+import { isDefined as isDefined2 } from "@xylabs/sdk-js";
 import { boot } from "@xyo-network/bios";
 import { HDWallet as HDWallet3 } from "@xyo-network/sdk-js";
 async function initActorWallet(context, mnemonic) {
   const bios = await boot();
-  const seedPhrase = isDefined4(mnemonic) ? mnemonic : await initActorSeedPhrase(context, bios);
+  const seedPhrase = isDefined2(mnemonic) ? mnemonic : await initActorSeedPhrase(context, bios);
   return await HDWallet3.fromPhrase(seedPhrase);
 }
 __name(initActorWallet, "initActorWallet");
@@ -903,37 +769,39 @@ __name(initStakeIntentStateArchivist, "initStakeIntentStateArchivist");
 
 // src/node/config/locators/basicRemoteRunnerLocator.ts
 import { isAccountInstance } from "@xyo-network/sdk-js";
-import { JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer2, JsonRpcXyoSigner as JsonRpcXyoSigner2, SimpleXyoSigner } from "@xyo-network/xl1-sdk";
+import { basicRemoteRunnerLocator as sdkBasicRemoteRunnerLocator, JsonRpcAccountBalanceViewer, JsonRpcXyoSigner, SimpleXyoSigner } from "@xyo-network/xl1-sdk";
 function signerFactoryFromParam(signer) {
   if (isAccountInstance(signer)) {
     return SimpleXyoSigner.factory(SimpleXyoSigner.dependencies, {
       account: signer
     });
   }
-  return JsonRpcXyoSigner2.factory(JsonRpcXyoSigner2.dependencies, {
+  return JsonRpcXyoSigner.factory(JsonRpcXyoSigner.dependencies, {
     transport: signer
   });
 }
 __name(signerFactoryFromParam, "signerFactoryFromParam");
-function basicRemoteRunnerLocator(name, remoteConfig, signer, dataLakeEndpoint) {
+function basicRemoteRunnerLocator(name, remoteConfig, signer, dataLakeEndpoint, validators) {
   const transport = isAccountInstance(signer) ? void 0 : signer;
-  return baseBasicRemoteRunnerLocator(name, remoteConfig, transport, dataLakeEndpoint, {
+  return sdkBasicRemoteRunnerLocator(name, remoteConfig, transport, dataLakeEndpoint, {
     additionalProviders: [
-      JsonRpcAccountBalanceViewer2.factory(JsonRpcAccountBalanceViewer2.dependencies, {})
+      JsonRpcAccountBalanceViewer.factory(JsonRpcAccountBalanceViewer.dependencies, {})
     ],
     signerFactory: signerFactoryFromParam(signer),
-    skipGatewayRunner: true
+    skipGatewayRunner: true,
+    validators
   });
 }
 __name(basicRemoteRunnerLocator, "basicRemoteRunnerLocator");
 
 // src/node/config/locators/basicRemoteViewerLocator.ts
-import { JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer3 } from "@xyo-network/xl1-sdk";
-function basicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint) {
-  return baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, {
+import { basicRemoteViewerLocator as sdkBasicRemoteViewerLocator, JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer2 } from "@xyo-network/xl1-sdk";
+function basicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, validators) {
+  return sdkBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, {
     additionalProviders: [
-      JsonRpcAccountBalanceViewer3.factory(JsonRpcAccountBalanceViewer3.dependencies, {})
-    ]
+      JsonRpcAccountBalanceViewer2.factory(JsonRpcAccountBalanceViewer2.dependencies, {})
+    ],
+    validators
   });
 }
 __name(basicRemoteViewerLocator, "basicRemoteViewerLocator");
@@ -978,8 +846,8 @@ __name(contextFromConfigWithoutLocator, "contextFromConfigWithoutLocator");
 
 // src/node/config/locators/localLocatorFromConfig.ts
 import { assertEx as assertEx14 } from "@xylabs/sdk-js";
-import { validateHydratedBlock as validateHydratedBlock2, validateHydratedBlockState as validateHydratedBlockState2 } from "@xyo-network/chain-validation";
-import { BlockCumulativeBalanceValidatorFactory as BlockCumulativeBalanceValidatorFactory2, ProviderFactoryLocator as ProviderFactoryLocator5, SimpleAccountBalanceViewer, SimpleBlockValidationViewer as SimpleBlockValidationViewer2, SimpleBlockViewer, SimpleFinalizationRunner, SimpleFinalizationViewer, SimpleMempoolRunner, SimpleMempoolViewer, SimpleTransactionViewer as SimpleTransactionViewer3, SimpleWindowedBlockViewer as SimpleWindowedBlockViewer2, SimpleXyoConnectionViewer as SimpleXyoConnectionViewer2, SimpleXyoViewer } from "@xyo-network/xl1-sdk";
+import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
+import { BlockCumulativeBalanceValidatorFactory, ProviderFactoryLocator, SimpleAccountBalanceViewer, SimpleBlockValidationViewer, SimpleBlockViewer, SimpleFinalizationRunner, SimpleFinalizationViewer, SimpleMempoolRunner, SimpleMempoolViewer, SimpleTransactionViewer, SimpleWindowedBlockViewer, SimpleXyoConnectionViewer, SimpleXyoViewer } from "@xyo-network/xl1-sdk";
 
 // src/node/init/initBalanceSummaryMap.ts
 import { BaseMongoSdk } from "@xylabs/mongo";
@@ -1020,12 +888,12 @@ __name(initBalanceSummaryMap, "initBalanceSummaryMap");
 // src/node/init/initEvmProvidersIfAvailable.ts
 import { asEthAddress, assertEx as assertEx10 } from "@xylabs/sdk-js";
 import { EvmChainContractViewer, EvmStakeEventsViewer, EvmStakeTotalsViewer, EvmStakeViewer } from "@xyo-network/chain-ethereum";
-import { SimpleChainContractViewer, SimpleStakeEventsViewer as SimpleStakeEventsViewer2, SimpleStakeTotalsViewer, SimpleStakeViewer, SimpleTimeSyncViewer as SimpleTimeSyncViewer2, XYO_ZERO_ADDRESS } from "@xyo-network/xl1-sdk";
+import { SimpleChainContractViewer, SimpleStakeEventsViewer, SimpleStakeTotalsViewer, SimpleStakeViewer, SimpleTimeSyncViewer, XYO_ZERO_ADDRESS } from "@xyo-network/xl1-sdk";
 
 // src/node/evm/initChainId.ts
-import { assertEx as assertEx6, hexFrom, isDefined as isDefined5, isHex } from "@xylabs/sdk-js";
+import { assertEx as assertEx6, hexFrom, isDefined as isDefined3, isHex } from "@xylabs/sdk-js";
 var canUseChainId = /* @__PURE__ */ __name(({ config }) => {
-  return isDefined5(config.evm.chainId);
+  return isDefined3(config.evm.chainId);
 }, "canUseChainId");
 var getChainId = /* @__PURE__ */ __name(({ config }) => {
   const chainId = assertEx6(config.evm.chainId, () => "Missing config.evm.chainId");
@@ -1045,7 +913,7 @@ var getChainId = /* @__PURE__ */ __name(({ config }) => {
 import { assertEx as assertEx9 } from "@xylabs/sdk-js";
 
 // src/node/evm/initInfuraProvider.ts
-import { assertEx as assertEx7, isDefined as isDefined6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx7, isDefined as isDefined4 } from "@xylabs/sdk-js";
 import { InfuraProvider } from "ethers/providers";
 var instance;
 var initInfuraProvider = /* @__PURE__ */ __name((context) => {
@@ -1056,7 +924,7 @@ var initInfuraProvider = /* @__PURE__ */ __name((context) => {
 }, "initInfuraProvider");
 var canUseInfuraProvider = /* @__PURE__ */ __name((context) => {
   const { config } = context;
-  return canUseChainId(context) && isDefined6(config.evm?.infura?.projectId) && isDefined6(config.evm?.infura?.projectSecret);
+  return canUseChainId(context) && isDefined4(config.evm?.infura?.projectId) && isDefined4(config.evm?.infura?.projectSecret);
 }, "canUseInfuraProvider");
 var getInfuraProviderConfig = /* @__PURE__ */ __name((context) => {
   const { config } = context;
@@ -1070,7 +938,7 @@ var getInfuraProviderConfig = /* @__PURE__ */ __name((context) => {
 }, "getInfuraProviderConfig");
 
 // src/node/evm/initJsonRpcProvider.ts
-import { assertEx as assertEx8, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx8, isDefined as isDefined5 } from "@xylabs/sdk-js";
 import { JsonRpcProvider } from "ethers/providers";
 var initJsonRpcProvider = /* @__PURE__ */ __name((context) => {
   const providerConfig = getJsonRpcProviderConfig(context);
@@ -1078,7 +946,7 @@ var initJsonRpcProvider = /* @__PURE__ */ __name((context) => {
 }, "initJsonRpcProvider");
 var canUseJsonRpcProvider = /* @__PURE__ */ __name((context) => {
   const { config } = context;
-  return canUseChainId(context) && isDefined7(config.evm.jsonRpc?.url);
+  return canUseChainId(context) && isDefined5(config.evm.jsonRpc?.url);
 }, "canUseJsonRpcProvider");
 var getJsonRpcProviderConfig = /* @__PURE__ */ __name((context) => {
   const { config } = context;
@@ -1128,13 +996,13 @@ async function initEvmProvidersIfAvailable(locator) {
       address,
       provider: provider2
     }));
-    locator.register(SimpleTimeSyncViewer2.factory(SimpleTimeSyncViewer2.dependencies, {
+    locator.register(SimpleTimeSyncViewer.factory(SimpleTimeSyncViewer.dependencies, {
       ethProvider: provider2
     }));
   } else {
     logger?.warn("EVM provider not available - running with memory based contract/stake viewers");
     const positions = [];
-    locator.register(SimpleStakeEventsViewer2.factory(SimpleStakeEventsViewer2.dependencies, {
+    locator.register(SimpleStakeEventsViewer.factory(SimpleStakeEventsViewer.dependencies, {
       positions
     }));
     locator.register(SimpleStakeViewer.factory(SimpleStakeViewer.dependencies, {
@@ -1146,7 +1014,7 @@ async function initEvmProvidersIfAvailable(locator) {
       stakingTokenAddress: XYO_ZERO_ADDRESS,
       rewardsContract: XYO_ZERO_ADDRESS
     }));
-    locator.register(SimpleTimeSyncViewer2.factory(SimpleTimeSyncViewer2.dependencies, {}));
+    locator.register(SimpleTimeSyncViewer.factory(SimpleTimeSyncViewer.dependencies, {}));
   }
   return locator;
 }
@@ -1202,7 +1070,7 @@ import { assertEx as assertEx12 } from "@xylabs/sdk-js";
 import { asArchivistInstance } from "@xyo-network/sdk-js";
 
 // src/node/manifest/getLocator.ts
-import { isDefined as isDefined8 } from "@xylabs/sdk-js";
+import { isDefined as isDefined6 } from "@xylabs/sdk-js";
 import { MongoDBArchivistV2 as MongoDBArchivistV22, MongoDBArchivistV2Deletable } from "@xyo-network/archivist-mongodb";
 import { ViewArchivist } from "@xyo-network/archivist-view";
 import { initTelemetry as initTelemetry2 } from "@xyo-network/chain-telemetry";
@@ -1222,7 +1090,7 @@ var getLocator = /* @__PURE__ */ __name(async ({ logger, config }) => {
       port
     }
   });
-  if (isDefined8(logger)) AbstractModule.defaultLogger = logger;
+  if (isDefined6(logger)) AbstractModule.defaultLogger = logger;
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : void 0;
   const locator = new ModuleFactoryLocator();
   const mongoConfig = config.storage?.mongo;
@@ -1498,11 +1366,11 @@ async function initTransferSummaryMap({ logger, config }) {
 __name(initTransferSummaryMap, "initTransferSummaryMap");
 
 // src/node/config/locators/localLocatorFromConfig.ts
-var cumulativeBalanceValidator2 = BlockCumulativeBalanceValidatorFactory2();
-var validateHydratedBlockStateWithCumulativeBalance2 = /* @__PURE__ */ __name(async (context, block) => {
+var cumulativeBalanceValidator = BlockCumulativeBalanceValidatorFactory();
+var validateHydratedBlockStateWithCumulativeBalance = /* @__PURE__ */ __name(async (context, block) => {
   const [stateErrors, cumulativeErrors] = await Promise.all([
-    validateHydratedBlockState2(context, block),
-    cumulativeBalanceValidator2(context, block)
+    validateHydratedBlockState(context, block),
+    cumulativeBalanceValidator(context, block)
   ]);
   return [
     ...stateErrors,
@@ -1515,7 +1383,7 @@ async function localLocatorFromConfig(context, validateDepsOnRegister = false) {
   const wallet = await initActorWallet(context);
   const { writableChainArchivist, readonlyChainArchivist, pendingTransactionsArchivist, pendingBlocksArchivist } = await initServerNode(context, wallet);
   await initFinalizationArchivistIfNeeded(writableChainArchivist, context.config, wallet);
-  const locator = new ProviderFactoryLocator5(context, {}, validateDepsOnRegister);
+  const locator = new ProviderFactoryLocator(context, {}, validateDepsOnRegister);
   locator.registerMany([
     SimpleMempoolViewer.factory(SimpleMempoolViewer.dependencies, {
       pendingTransactionsArchivist,
@@ -1535,12 +1403,12 @@ async function localLocatorFromConfig(context, validateDepsOnRegister = false) {
     SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, {
       finalizedArchivist: readonlyChainArchivist
     }),
-    SimpleWindowedBlockViewer2.factory(SimpleWindowedBlockViewer2.dependencies, {
+    SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, {
       maxWindowSize: 1e3,
       syncInterval: 1e4
     }),
-    SimpleXyoConnectionViewer2.factory(SimpleXyoConnectionViewer2.dependencies, {}),
-    SimpleTransactionViewer3.factory(SimpleTransactionViewer3.dependencies, {}),
+    SimpleXyoConnectionViewer.factory(SimpleXyoConnectionViewer.dependencies, {}),
+    SimpleTransactionViewer.factory(SimpleTransactionViewer.dependencies, {}),
     SimpleXyoViewer.factory(SimpleXyoViewer.dependencies, {}),
     SimpleFinalizationViewer.factory(SimpleFinalizationViewer.dependencies, {
       finalizedArchivist: readonlyChainArchivist
@@ -1548,9 +1416,9 @@ async function localLocatorFromConfig(context, validateDepsOnRegister = false) {
     SimpleFinalizationRunner.factory(SimpleFinalizationRunner.dependencies, {
       finalizedArchivist: writableChainArchivist
     }),
-    SimpleBlockValidationViewer2.factory(SimpleBlockValidationViewer2.dependencies, {
-      state: validateHydratedBlockStateWithCumulativeBalance2,
-      protocol: validateHydratedBlock2
+    SimpleBlockValidationViewer.factory(SimpleBlockValidationViewer.dependencies, {
+      state: validateHydratedBlockStateWithCumulativeBalance,
+      protocol: validateHydratedBlock
     })
   ]);
   return locator;
@@ -1559,19 +1427,19 @@ __name(localLocatorFromConfig, "localLocatorFromConfig");
 
 // src/node/config/locators/locatorsFromConfig.ts
 import { deepMerge as deepMerge2 } from "@xylabs/sdk-js";
-import { ActorConfigZod as ActorConfigZod3 } from "@xyo-network/xl1-sdk";
+import { ActorConfigZod as ActorConfigZod2 } from "@xyo-network/xl1-sdk";
 
 // src/node/config/locators/actors/apiLocatorFromConfig.ts
-import { ProviderFactoryLocator as ProviderFactoryLocator6, SimpleXyoConnectionRunner as SimpleXyoConnectionRunner2, SimpleXyoGateway as SimpleXyoGateway2, SimpleXyoRunner } from "@xyo-network/xl1-sdk";
+import { ProviderFactoryLocator as ProviderFactoryLocator2, SimpleXyoConnectionRunner, SimpleXyoGateway, SimpleXyoRunner } from "@xyo-network/xl1-sdk";
 function apiLocatorFromConfig(context, parent) {
-  const locator = new ProviderFactoryLocator6({
+  const locator = new ProviderFactoryLocator2({
     ...context,
     locator: parent
   });
   locator.registerMany([
     SimpleXyoRunner.factory(SimpleXyoRunner.dependencies, {}),
-    SimpleXyoConnectionRunner2.factory(SimpleXyoConnectionRunner2.dependencies, {}),
-    SimpleXyoGateway2.factory(SimpleXyoGateway2.dependencies, {})
+    SimpleXyoConnectionRunner.factory(SimpleXyoConnectionRunner.dependencies, {}),
+    SimpleXyoGateway.factory(SimpleXyoGateway.dependencies, {})
   ]);
   locator.freeze();
   return locator;
@@ -1579,31 +1447,31 @@ function apiLocatorFromConfig(context, parent) {
 __name(apiLocatorFromConfig, "apiLocatorFromConfig");
 
 // src/node/config/locators/actors/bridgeLocatorFromConfig.ts
-import { isDefined as isDefined9 } from "@xylabs/sdk-js";
+import { isDefined as isDefined7 } from "@xylabs/sdk-js";
 import { HDWallet as HDWallet4 } from "@xyo-network/sdk-js";
-import { ADDRESS_INDEX as ADDRESS_INDEX2, generateXyoBaseWalletFromPhrase as generateXyoBaseWalletFromPhrase2, JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer4, JsonRpcBlockViewer as JsonRpcBlockViewer2, JsonRpcFinalizationViewer as JsonRpcFinalizationViewer2, JsonRpcMempoolRunner as JsonRpcMempoolRunner2, JsonRpcMempoolViewer as JsonRpcMempoolViewer2, JsonRpcXyoRunner as JsonRpcXyoRunner2, JsonRpcXyoViewer as JsonRpcXyoViewer2, ProviderFactoryLocator as ProviderFactoryLocator7, RestDataLakeRunner, RestDataLakeViewer as RestDataLakeViewer3, SimpleStakeEventsViewer as SimpleStakeEventsViewer3, SimpleXyoConnectionRunner as SimpleXyoConnectionRunner3, SimpleXyoGatewayRunner as SimpleXyoGatewayRunner2, SimpleXyoRunner as SimpleXyoRunner2, SimpleXyoSigner as SimpleXyoSigner2 } from "@xyo-network/xl1-sdk";
+import { ADDRESS_INDEX as ADDRESS_INDEX2, generateXyoBaseWalletFromPhrase as generateXyoBaseWalletFromPhrase2, JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer3, JsonRpcBlockViewer, JsonRpcFinalizationViewer, JsonRpcMempoolRunner, JsonRpcMempoolViewer, JsonRpcXyoRunner, JsonRpcXyoViewer, ProviderFactoryLocator as ProviderFactoryLocator3, RestDataLakeRunner, RestDataLakeViewer, SimpleStakeEventsViewer as SimpleStakeEventsViewer2, SimpleXyoConnectionRunner as SimpleXyoConnectionRunner2, SimpleXyoGatewayRunner, SimpleXyoRunner as SimpleXyoRunner2, SimpleXyoSigner as SimpleXyoSigner2 } from "@xyo-network/xl1-sdk";
 async function bridgeLocatorFromConfig(context, parent) {
-  const locator = new ProviderFactoryLocator7({
+  const locator = new ProviderFactoryLocator3({
     ...context,
     locator: parent
   });
   const { config } = context;
   const { dataLake, mnemonic } = config;
-  const walletPhrase = isDefined9(mnemonic) ? mnemonic : HDWallet4.generateMnemonic();
+  const walletPhrase = isDefined7(mnemonic) ? mnemonic : HDWallet4.generateMnemonic();
   const wallet = await generateXyoBaseWalletFromPhrase2(walletPhrase);
   const signerAccount = await wallet.derivePath(ADDRESS_INDEX2.XYO);
   if (config.remote.rpc) {
     locator.registerMany([
-      JsonRpcMempoolViewer2.factory(JsonRpcMempoolViewer2.dependencies, {}),
-      JsonRpcMempoolRunner2.factory(JsonRpcMempoolRunner2.dependencies, {}),
-      JsonRpcAccountBalanceViewer4.factory(JsonRpcAccountBalanceViewer4.dependencies, {}),
-      JsonRpcFinalizationViewer2.factory(JsonRpcFinalizationViewer2.dependencies, {}),
-      JsonRpcBlockViewer2.factory(JsonRpcBlockViewer2.dependencies, {}),
-      JsonRpcXyoRunner2.factory(JsonRpcXyoRunner2.dependencies, {}),
-      JsonRpcXyoViewer2.factory(JsonRpcXyoViewer2.dependencies, {})
+      JsonRpcMempoolViewer.factory(JsonRpcMempoolViewer.dependencies, {}),
+      JsonRpcMempoolRunner.factory(JsonRpcMempoolRunner.dependencies, {}),
+      JsonRpcAccountBalanceViewer3.factory(JsonRpcAccountBalanceViewer3.dependencies, {}),
+      JsonRpcFinalizationViewer.factory(JsonRpcFinalizationViewer.dependencies, {}),
+      JsonRpcBlockViewer.factory(JsonRpcBlockViewer.dependencies, {}),
+      JsonRpcXyoRunner.factory(JsonRpcXyoRunner.dependencies, {}),
+      JsonRpcXyoViewer.factory(JsonRpcXyoViewer.dependencies, {})
     ]);
   }
-  if (isDefined9(dataLake)) {
+  if (isDefined7(dataLake)) {
     const { driver } = dataLake;
     switch (driver) {
       case "rest": {
@@ -1612,7 +1480,7 @@ async function bridgeLocatorFromConfig(context, parent) {
           RestDataLakeRunner.factory(RestDataLakeRunner.dependencies, {
             endpoint
           }),
-          RestDataLakeViewer3.factory(RestDataLakeViewer3.dependencies, {
+          RestDataLakeViewer.factory(RestDataLakeViewer.dependencies, {
             endpoint
           })
         ]);
@@ -1624,15 +1492,15 @@ async function bridgeLocatorFromConfig(context, parent) {
     }
   }
   locator.registerMany([
-    SimpleStakeEventsViewer3.factory(SimpleStakeEventsViewer3.dependencies, {
+    SimpleStakeEventsViewer2.factory(SimpleStakeEventsViewer2.dependencies, {
       positions: []
     }),
     SimpleXyoSigner2.factory(SimpleXyoSigner2.dependencies, {
       account: signerAccount
     }),
     SimpleXyoRunner2.factory(SimpleXyoRunner2.dependencies, {}),
-    SimpleXyoConnectionRunner3.factory(SimpleXyoConnectionRunner3.dependencies, {}),
-    SimpleXyoGatewayRunner2.factory(SimpleXyoGatewayRunner2.dependencies, {})
+    SimpleXyoConnectionRunner2.factory(SimpleXyoConnectionRunner2.dependencies, {}),
+    SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies, {})
   ]);
   locator.freeze();
   return locator;
@@ -1640,9 +1508,9 @@ async function bridgeLocatorFromConfig(context, parent) {
 __name(bridgeLocatorFromConfig, "bridgeLocatorFromConfig");
 
 // src/node/config/locators/actors/mempoolLocatorFromConfig.ts
-import { ProviderFactoryLocator as ProviderFactoryLocator8 } from "@xyo-network/xl1-sdk";
+import { ProviderFactoryLocator as ProviderFactoryLocator4 } from "@xyo-network/xl1-sdk";
 function mempoolLocatorFromConfig(context, parent) {
-  const locator = new ProviderFactoryLocator8({
+  const locator = new ProviderFactoryLocator4({
     ...context,
     locator: parent
   });
@@ -1655,11 +1523,11 @@ __name(mempoolLocatorFromConfig, "mempoolLocatorFromConfig");
 // src/node/config/locators/actors/producerLocatorFromConfig.ts
 import { asAddress as asAddress2 } from "@xylabs/sdk-js";
 import { SimpleBlockRunner } from "@xyo-network/chain-services";
-import { ProviderFactoryLocator as ProviderFactoryLocator9 } from "@xyo-network/xl1-sdk";
+import { ProviderFactoryLocator as ProviderFactoryLocator5 } from "@xyo-network/xl1-sdk";
 async function producerLocatorFromConfig(context, parent) {
   const { logger, config } = context;
   const account = await initActorAccount(context);
-  const locator = new ProviderFactoryLocator9({
+  const locator = new ProviderFactoryLocator5({
     ...context,
     locator: parent
   });
@@ -1680,9 +1548,9 @@ async function producerLocatorFromConfig(context, parent) {
 __name(producerLocatorFromConfig, "producerLocatorFromConfig");
 
 // src/node/config/locators/actors/rewardRedemptionLocatorFromConfig.ts
-import { JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer5, JsonRpcBlockViewer as JsonRpcBlockViewer3, JsonRpcFinalizationViewer as JsonRpcFinalizationViewer3, JsonRpcMempoolRunner as JsonRpcMempoolRunner3, JsonRpcMempoolViewer as JsonRpcMempoolViewer3, JsonRpcXyoRunner as JsonRpcXyoRunner3, JsonRpcXyoViewer as JsonRpcXyoViewer3, ProviderFactoryLocator as ProviderFactoryLocator10, SimpleXyoConnectionRunner as SimpleXyoConnectionRunner4, SimpleXyoGatewayRunner as SimpleXyoGatewayRunner3, SimpleXyoRunner as SimpleXyoRunner3, SimpleXyoSigner as SimpleXyoSigner3 } from "@xyo-network/xl1-sdk";
+import { JsonRpcAccountBalanceViewer as JsonRpcAccountBalanceViewer4, JsonRpcBlockViewer as JsonRpcBlockViewer2, JsonRpcFinalizationViewer as JsonRpcFinalizationViewer2, JsonRpcMempoolRunner as JsonRpcMempoolRunner2, JsonRpcMempoolViewer as JsonRpcMempoolViewer2, JsonRpcXyoRunner as JsonRpcXyoRunner2, JsonRpcXyoViewer as JsonRpcXyoViewer2, ProviderFactoryLocator as ProviderFactoryLocator6, SimpleXyoConnectionRunner as SimpleXyoConnectionRunner3, SimpleXyoGatewayRunner as SimpleXyoGatewayRunner2, SimpleXyoRunner as SimpleXyoRunner3, SimpleXyoSigner as SimpleXyoSigner3 } from "@xyo-network/xl1-sdk";
 async function rewardRedemptionLocatorFromConfig(context, parent) {
-  const locator = new ProviderFactoryLocator10({
+  const locator = new ProviderFactoryLocator6({
     ...context,
     locator: parent
   });
@@ -1690,13 +1558,13 @@ async function rewardRedemptionLocatorFromConfig(context, parent) {
   const account = await initActorAccount(context);
   if (config.remote.rpc) {
     locator.registerMany([
-      JsonRpcMempoolViewer3.factory(JsonRpcMempoolViewer3.dependencies, {}),
-      JsonRpcMempoolRunner3.factory(JsonRpcMempoolRunner3.dependencies, {}),
-      JsonRpcAccountBalanceViewer5.factory(JsonRpcAccountBalanceViewer5.dependencies, {}),
-      JsonRpcFinalizationViewer3.factory(JsonRpcFinalizationViewer3.dependencies, {}),
-      JsonRpcBlockViewer3.factory(JsonRpcBlockViewer3.dependencies, {}),
-      JsonRpcXyoRunner3.factory(JsonRpcXyoRunner3.dependencies, {}),
-      JsonRpcXyoViewer3.factory(JsonRpcXyoViewer3.dependencies, {})
+      JsonRpcMempoolViewer2.factory(JsonRpcMempoolViewer2.dependencies, {}),
+      JsonRpcMempoolRunner2.factory(JsonRpcMempoolRunner2.dependencies, {}),
+      JsonRpcAccountBalanceViewer4.factory(JsonRpcAccountBalanceViewer4.dependencies, {}),
+      JsonRpcFinalizationViewer2.factory(JsonRpcFinalizationViewer2.dependencies, {}),
+      JsonRpcBlockViewer2.factory(JsonRpcBlockViewer2.dependencies, {}),
+      JsonRpcXyoRunner2.factory(JsonRpcXyoRunner2.dependencies, {}),
+      JsonRpcXyoViewer2.factory(JsonRpcXyoViewer2.dependencies, {})
     ]);
   }
   locator.registerMany([
@@ -1704,8 +1572,8 @@ async function rewardRedemptionLocatorFromConfig(context, parent) {
       account
     }),
     SimpleXyoRunner3.factory(SimpleXyoRunner3.dependencies, {}),
-    SimpleXyoConnectionRunner4.factory(SimpleXyoConnectionRunner4.dependencies, {}),
-    SimpleXyoGatewayRunner3.factory(SimpleXyoGatewayRunner3.dependencies, {})
+    SimpleXyoConnectionRunner3.factory(SimpleXyoConnectionRunner3.dependencies, {}),
+    SimpleXyoGatewayRunner2.factory(SimpleXyoGatewayRunner2.dependencies, {})
   ]);
   locator.freeze();
   return locator;
@@ -1713,9 +1581,9 @@ async function rewardRedemptionLocatorFromConfig(context, parent) {
 __name(rewardRedemptionLocatorFromConfig, "rewardRedemptionLocatorFromConfig");
 
 // src/node/config/locators/actors/validatorLocatorFromConfig.ts
-import { ProviderFactoryLocator as ProviderFactoryLocator11 } from "@xyo-network/xl1-sdk";
+import { ProviderFactoryLocator as ProviderFactoryLocator7 } from "@xyo-network/xl1-sdk";
 function validatorLocatorFromConfig(context, parent) {
-  const locator = new ProviderFactoryLocator11({
+  const locator = new ProviderFactoryLocator7({
     ...context,
     locator: parent
   });
@@ -1726,6 +1594,7 @@ function validatorLocatorFromConfig(context, parent) {
 __name(validatorLocatorFromConfig, "validatorLocatorFromConfig");
 
 // src/node/config/locators/rootLocatorFromConfig.ts
+import { commonLocatorFromConfig, remoteLocatorFromConfig } from "@xyo-network/xl1-sdk";
 async function rootLocatorFromConfig(context, validateDepsOnRegister = false) {
   const { config } = context;
   let locator = await commonLocatorFromConfig(context, validateDepsOnRegister);
@@ -1780,7 +1649,7 @@ async function locatorsFromConfig(context, { actors, ...config }) {
       case "validator": {
         result[actorConfig.name] = await validatorLocatorFromConfig({
           ...context,
-          config: ActorConfigZod3.parse(deepMerge2(config, actorConfig))
+          config: ActorConfigZod2.parse(deepMerge2(config, actorConfig))
         }, result._root);
         break;
       }
@@ -1805,7 +1674,7 @@ async function locatorsFromConfig(context, { actors, ...config }) {
 __name(locatorsFromConfig, "locatorsFromConfig");
 
 // src/node/config/tryParseConfig.ts
-import { isDefined as isDefined10, isNull } from "@xylabs/sdk-js";
+import { isDefined as isDefined8, isNull } from "@xylabs/sdk-js";
 import { ConfigZod } from "@xyo-network/xl1-sdk";
 import { cosmiconfig } from "cosmiconfig";
 var configName = "xyo";
@@ -1817,10 +1686,10 @@ async function tryParseConfig(options) {
     // loaders: { '.ts': TypeScriptLoader() },
     searchPlaces
   });
-  const result = isDefined10(configPath) ? (await explorer.load(configPath))?.config : (await explorer.search())?.config;
-  if (isDefined10(result) && !isNull(result)) {
+  const result = isDefined8(configPath) ? (await explorer.load(configPath))?.config : (await explorer.search())?.config;
+  if (isDefined8(result) && !isNull(result)) {
     const section = result[configSection];
-    if (isDefined10(section) && typeof section === "object") {
+    if (isDefined8(section) && typeof section === "object") {
       return ConfigZod.loose().parse(section);
     }
   }
@@ -1830,7 +1699,7 @@ __name(tryParseConfig, "tryParseConfig");
 
 // src/node/health/initHealthEndpoints.ts
 import http from "http";
-import { isDefined as isDefined11 } from "@xylabs/sdk-js";
+import { isDefined as isDefined9 } from "@xylabs/sdk-js";
 var sendStatus = /* @__PURE__ */ __name((res, status, errorCode) => {
   const statusCode = status === "started" ? 200 : errorCode;
   res.writeHead(statusCode, {
@@ -1882,7 +1751,7 @@ var createHealthServer = /* @__PURE__ */ __name((context, port, statusMonitor) =
 function initHealthEndpoints(context, statusMonitor) {
   const { config } = context;
   const { healthCheckPort } = config;
-  return isDefined11(healthCheckPort) ? createHealthServer(context, healthCheckPort, statusMonitor) : void 0;
+  return isDefined9(healthCheckPort) ? createHealthServer(context, healthCheckPort, statusMonitor) : void 0;
 }
 __name(initHealthEndpoints, "initHealthEndpoints");
 
@@ -1939,8 +1808,6 @@ export {
   asRewardRedemptionConfigContext,
   asValidatorConfig,
   asValidatorConfigContext,
-  baseBasicRemoteRunnerLocator,
-  baseBasicRemoteViewerLocator,
   basicRemoteRunnerLocator,
   basicRemoteViewerLocator,
   buildTelemetryConfig,
@@ -1948,7 +1815,6 @@ export {
   canUseEvmProvider,
   canUseInfuraProvider,
   canUseJsonRpcProvider,
-  commonLocatorFromConfig,
   contextFromConfigWithoutLocator,
   createProducerChainStakeIntentBlock,
   getChainId,
@@ -1991,7 +1857,6 @@ export {
   localLocatorFromConfig,
   locatorsFromConfig,
   mergeConfig,
-  remoteLocatorFromConfig,
   rootLocatorFromConfig,
   sharedMiddleware,
   telemetryContextFromConfig,