@xyo-network/chain-orchestration 1.20.5 → 1.20.9

package/src/neutral/config/locators/basicRemoteViewerLocator.ts

@@ -1,37 +1,11 @@
-import { isDefined } from '@xylabs/sdk-js'
 import type { RemoteConfig } from '@xyo-network/xl1-sdk'
-import {
-  ActorConfigZod,
-  ProviderFactoryLocator, RestDataLakeViewer,
-  SimpleTransactionViewer,
-  SimpleXyoConnectionViewer, SimpleXyoGateway,
-} from '@xyo-network/xl1-sdk'
 
-import { commonLocatorFromConfig, remoteLocatorFromConfig } from '../../../shared/index.ts'
+import { baseBasicRemoteViewerLocator } from '../../../shared/index.ts'
 
-export async function basicRemoteViewerLocator(
+export function basicRemoteViewerLocator(
   name: string,
   remoteConfig: RemoteConfig,
   dataLakeEndpoint?: string,
 ) {
-  const config = ActorConfigZod.parse({ name, remote: remoteConfig })
-  const rootLocator = await commonLocatorFromConfig({
-    config, singletons: {}, caches: {},
-  })
-  const remoteLocator = await remoteLocatorFromConfig(rootLocator.context)
-  const locator = new ProviderFactoryLocator(remoteLocator.context, {})
-  locator.registerMany([
-    SimpleXyoGateway.factory<SimpleXyoGateway>(SimpleXyoGateway.dependencies, {}),
-    SimpleXyoConnectionViewer.factory<SimpleXyoConnectionViewer>(SimpleXyoConnectionViewer.dependencies, {}),
-    SimpleTransactionViewer.factory<SimpleTransactionViewer>(SimpleTransactionViewer.dependencies, {}),
-  ])
-
-  if (isDefined(dataLakeEndpoint)) {
-    const dataLakeViewerParams = { endpoint: dataLakeEndpoint }
-    locator.register(RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, dataLakeViewerParams))
-  }
-
-  locator.freeze()
-
-  return locator
+  return baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint)
 }

package/src/neutral/config/locators/rootLocatorFromConfig.ts

@@ -1,9 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import type { ActorConfigContext, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk'
 
-import {
-  commonLocatorFromConfig, initEvmProvidersIfAvailable, remoteLocatorFromConfig,
-} from '../../../shared/index.ts'
+import { commonLocatorFromConfig, remoteLocatorFromConfig } from '../../../shared/index.ts'
 
 export async function rootLocatorFromConfig(
   context: ActorConfigContext,
@@ -15,7 +13,7 @@ export async function rootLocatorFromConfig(
     ? remoteLocatorFromConfig(context, validateDepsOnRegister)
     : undefined)
   locator = assertEx(newLocator, () => 'Root locator could not be created from config. No supported configuration found.')
-  locator = await initEvmProvidersIfAvailable(locator)
+  // locator = await initEvmProvidersIfAvailable(locator)
   locator.freeze()
   return locator
 }

package/src/node/config/locators/actors/bridgeLocatorFromConfig.ts

@@ -15,6 +15,7 @@ import {
   ProviderFactoryLocator,
   RestDataLakeRunner,
   RestDataLakeViewer,
+  SimpleStakeEventsViewer,
   SimpleXyoConnectionRunner,
   SimpleXyoGatewayRunner,
   SimpleXyoRunner,
@@ -54,25 +55,24 @@ export async function bridgeLocatorFromConfig(
     ])
   }
   if (isDefined(dataLake)) {
-    const { drivers = [] } = dataLake
-    for (const dataLakeDriver of drivers) {
-      const { protocol, url: endpoint } = dataLakeDriver
-      switch (protocol) {
-        case 'rest': {
-          locator.registerMany([
-            RestDataLakeRunner.factory<RestDataLakeRunner<RestDataLakeRunnerParams>>(RestDataLakeRunner.dependencies, { endpoint }),
-            RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, { endpoint }),
-          ])
-          break
-        }
-        default: {
-          throw new Error(`Unsupported data lake protocol: ${protocol}`)
-        }
+    const { driver } = dataLake
+    switch (driver) {
+      case 'rest': {
+        const { url: endpoint } = dataLake
+        locator.registerMany([
+          RestDataLakeRunner.factory<RestDataLakeRunner<RestDataLakeRunnerParams>>(RestDataLakeRunner.dependencies, { endpoint }),
+          RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, { endpoint }),
+        ])
+        break
+      }
+      default: {
+        throw new Error(`Unsupported data lake protocol: ${driver}`)
       }
     }
   }
 
   locator.registerMany([
+    SimpleStakeEventsViewer.factory<SimpleStakeEventsViewer>(SimpleStakeEventsViewer.dependencies, { positions: [] }),
     SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account: signerAccount }),
     SimpleXyoRunner.factory<SimpleXyoRunner>(SimpleXyoRunner.dependencies, {}),
     SimpleXyoConnectionRunner.factory<SimpleXyoConnectionRunner>(SimpleXyoConnectionRunner.dependencies, {}),

package/src/node/config/locators/basicRemoteRunnerLocator.ts

@@ -1,47 +1,38 @@
-import { isDefined } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/sdk-js'
 import { isAccountInstance } from '@xyo-network/sdk-js'
 import type {
   RemoteConfig, RpcTransport, XyoSignerRpcSchemas,
 } from '@xyo-network/xl1-sdk'
 import {
-  JsonRpcXyoRunner, JsonRpcXyoSigner,
-  ProviderFactoryLocator, RestDataLakeViewer,
-  SimpleXyoConnectionRunner,
+  JsonRpcAccountBalanceViewer,
+  JsonRpcXyoSigner,
   SimpleXyoSigner,
 } from '@xyo-network/xl1-sdk'
 
-import { basicRemoteViewerLocator } from './basicRemoteViewerLocator.ts'
+import { baseBasicRemoteRunnerLocator } from '../../../shared/index.ts'
 
-export async function basicRemoteRunnerLocator(
+function signerFactoryFromParam(signer: RpcTransport<XyoSignerRpcSchemas> | AccountInstance) {
+  if (isAccountInstance(signer)) {
+    return SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account: signer })
+  }
+  return JsonRpcXyoSigner.factory<JsonRpcXyoSigner>(JsonRpcXyoSigner.dependencies, { transport: signer })
+}
+
+export function basicRemoteRunnerLocator(
   name: string,
   remoteConfig: RemoteConfig,
   signer: RpcTransport<XyoSignerRpcSchemas> | AccountInstance,
   dataLakeEndpoint?: string,
 ) {
-  const remoteViewerLocator = await basicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint)
-  const locator = new ProviderFactoryLocator(remoteViewerLocator.context, {})
-  locator.registerMany([
-    SimpleXyoConnectionRunner.factory<SimpleXyoConnectionRunner>(SimpleXyoConnectionRunner.dependencies, {}),
-    JsonRpcXyoRunner.factory<JsonRpcXyoRunner>(JsonRpcXyoRunner.dependencies, {}),
-  ])
-
-  if (isAccountInstance(signer)) {
-    locator.register(
-      SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account: signer }),
-    )
-  } else {
-    locator.register(
-      JsonRpcXyoSigner.factory<JsonRpcXyoSigner>(JsonRpcXyoSigner.dependencies, { transport: signer }),
-    )
-  }
-
-  if (isDefined(dataLakeEndpoint)) {
-    const dataLakeViewerParams = { endpoint: dataLakeEndpoint }
-    locator.register(RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, dataLakeViewerParams))
-  }
-
-  locator.freeze()
-
-  return locator
+  const transport = isAccountInstance(signer) ? undefined as never : signer
+  return baseBasicRemoteRunnerLocator(name, remoteConfig, transport, dataLakeEndpoint, {
+    additionalProviders: [
+      JsonRpcAccountBalanceViewer.factory<JsonRpcAccountBalanceViewer>(
+        JsonRpcAccountBalanceViewer.dependencies,
+        {},
+      ),
+    ],
+    signerFactory: signerFactoryFromParam(signer),
+    skipGatewayRunner: true,
+  })
 }

package/src/node/config/locators/basicRemoteViewerLocator.ts

@@ -1,43 +1,19 @@
-import { isDefined } from '@xylabs/sdk-js'
 import type { RemoteConfig } from '@xyo-network/xl1-sdk'
-import {
-  ActorConfigZod,
-  JsonRpcAccountBalanceViewer,
-  ProviderFactoryLocator, RestDataLakeViewer,
-  SimpleTransactionViewer,
-  SimpleXyoConnectionViewer, SimpleXyoGateway,
-} from '@xyo-network/xl1-sdk'
+import { JsonRpcAccountBalanceViewer } from '@xyo-network/xl1-sdk'
 
-import { remoteLocatorFromConfig } from '../../../shared/index.ts'
-import { rootLocatorFromConfig } from './rootLocatorFromConfig.ts'
+import { baseBasicRemoteViewerLocator } from '../../../shared/index.ts'
 
-export async function basicRemoteViewerLocator(
+export function basicRemoteViewerLocator(
   name: string,
   remoteConfig: RemoteConfig,
   dataLakeEndpoint?: string,
 ) {
-  const config = ActorConfigZod.parse({ name, remote: remoteConfig })
-  const rootLocator = await rootLocatorFromConfig({
-    config, singletons: {}, caches: {},
+  return baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, {
+    additionalProviders: [
+      JsonRpcAccountBalanceViewer.factory<JsonRpcAccountBalanceViewer>(
+        JsonRpcAccountBalanceViewer.dependencies,
+        {},
+      ),
+    ],
   })
-  const remoteLocator = await remoteLocatorFromConfig(rootLocator.context)
-  const locator = new ProviderFactoryLocator(remoteLocator.context, {})
-  locator.registerMany([
-    SimpleTransactionViewer.factory<SimpleTransactionViewer>(SimpleTransactionViewer.dependencies, {}),
-    JsonRpcAccountBalanceViewer.factory<JsonRpcAccountBalanceViewer>(
-      JsonRpcAccountBalanceViewer.dependencies,
-      {},
-    ),
-    SimpleXyoConnectionViewer.factory<SimpleXyoConnectionViewer>(SimpleXyoConnectionViewer.dependencies, {}),
-    SimpleXyoGateway.factory<SimpleXyoGateway>(SimpleXyoGateway.dependencies, {}),
-  ])
-
-  if (isDefined(dataLakeEndpoint)) {
-    const dataLakeViewerParams = { endpoint: dataLakeEndpoint }
-    locator.register(RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, dataLakeViewerParams))
-  }
-
-  locator.freeze()
-
-  return locator
 }

package/src/{shared → node}/config/locators/contextFromConfigWithoutLocator.ts

@@ -1,7 +1,7 @@
 import type { Logger } from '@xylabs/sdk-js'
 import type { Config, CreatableProviderContext } from '@xyo-network/xl1-sdk'
 
-import { initStatusReporter } from '../../init/index.ts'
+import { initStatusReporter } from '../../../shared/index.ts'
 import { telemetryContextFromConfig } from './telemetryContextFromConfig.ts'
 
 export async function contextFromConfigWithoutLocator(

package/src/node/config/locators/index.ts

@@ -1,5 +1,7 @@
 export * from './basicRemoteRunnerLocator.ts'
 export * from './basicRemoteViewerLocator.ts'
+export * from './contextFromConfigWithoutLocator.ts'
 export * from './localLocatorFromConfig.ts'
 export * from './locatorsFromConfig.ts'
 export * from './rootLocatorFromConfig.ts'
+export * from './telemetryContextFromConfig.ts'

package/src/node/config/locators/localLocatorFromConfig.ts

@@ -14,7 +14,7 @@ import {
   SimpleXyoViewer,
 } from '@xyo-network/xl1-sdk'
 
-import { initActorWallet } from '../../../neutral/index.ts'
+import { initActorWallet } from '../../../shared/index.ts'
 import {
   initBalanceSummaryMap, initFinalizationArchivistIfNeeded,
   initServerNode, initTransferSummaryMap,

package/src/node/config/locators/locatorsFromConfig.ts

@@ -6,9 +6,8 @@ import {
 } from '@xyo-network/xl1-sdk'
 
 import {
-  ApiConfigZod, BridgeConfigZod,
-  MempoolConfigZod, ProducerConfigZod, RewardRedemptionConfigZod,
-} from '../../../neutral/index.ts'
+  ApiConfigZod, BridgeConfigZod, MempoolConfigZod, ProducerConfigZod, RewardRedemptionConfigZod,
+} from '../../../shared/index.ts'
 import {
   apiLocatorFromConfig, bridgeLocatorFromConfig, mempoolLocatorFromConfig,
   producerLocatorFromConfig, rewardRedemptionLocatorFromConfig, validatorLocatorFromConfig,

package/src/node/config/locators/rootLocatorFromConfig.ts

@@ -2,7 +2,7 @@ import type { ActorConfigContext, ProviderFactoryLocatorInstance } from '@xyo-ne
 
 import {
   commonLocatorFromConfig, initEvmProvidersIfAvailable, remoteLocatorFromConfig,
-} from '../../../neutral/index.ts'
+} from '../../index.ts'
 import { localLocatorFromConfig } from './localLocatorFromConfig.ts'
 
 export async function rootLocatorFromConfig(

package/src/node/config/tryParseConfig.ts

@@ -29,7 +29,7 @@ export async function tryParseConfig(options?: { configPath?: string; searchPlac
       searchPlaces,
     },
   )
-  const result = configPath
+  const result = isDefined(configPath)
     ? (await explorer.load(configPath))?.config
     : (await explorer.search())?.config
   if (isDefined(result) && !isNull(result)) {

package/src/node/index.ts

@@ -1,6 +1,8 @@
 export * from '../shared/index.ts'
 export * from './archivists/index.ts'
 export * from './config/index.ts'
+export * from './evm/index.ts'
 export * from './health/index.ts'
 export * from './init/index.ts'
 export * from './manifest/index.ts'
+export * from './sharedMiddleware.ts'

package/src/node/init/index.ts

@@ -1,4 +1,5 @@
 export * from './initBalanceSummaryMap.ts'
+export * from './initEvmProvidersIfAvailable.ts'
 export * from './initFinalizationArchivistIfNeeded.ts'
 export * from './initFinalizedArchivist.ts'
 export * from './initServerNode.ts'

package/src/node/sharedMiddleware.ts

@@ -0,0 +1,24 @@
+import {
+  customPoweredByHeader,
+  disableCaseSensitiveRouting,
+  disableExpressDefaultPoweredByHeader,
+  getJsonBodyParser,
+  getJsonBodyParserOptions,
+  responseProfiler,
+  standardResponses,
+} from '@xylabs/express'
+import compression from 'compression'
+import cors from 'cors'
+import type { Express } from 'express'
+
+export function sharedMiddleware(app: Express): void {
+  app.set('etag', false)
+  app.use(cors())
+  app.use(compression())
+  app.use(responseProfiler)
+  app.use(getJsonBodyParser(getJsonBodyParserOptions({ limit: '1mb' })))
+  app.use(standardResponses)
+  disableExpressDefaultPoweredByHeader(app)
+  app.use(customPoweredByHeader)
+  disableCaseSensitiveRouting(app)
+}

package/src/shared/actor/ValidatorActor.ts

@@ -2,12 +2,12 @@ import type { Hash } from '@xylabs/sdk-js'
 import { creatable } from '@xylabs/sdk-js'
 import { processPendingBlocks } from '@xyo-network/chain-sdk'
 import type {
-  ActorParamsV3, BlockBoundWitness, BlockViewer,
+  ActorParamsV3, BlockBoundWitness, BlockValidationViewer, BlockViewer,
   FinalizationRunner,
   MempoolViewer,
 } from '@xyo-network/xl1-sdk'
 import {
-  ActorV3, BlockViewerMoniker, FinalizationRunnerMoniker,
+  ActorV3, BlockValidationViewerMoniker, BlockViewerMoniker, FinalizationRunnerMoniker,
   MempoolViewerMoniker,
 } from '@xyo-network/xl1-sdk'
 
@@ -20,6 +20,7 @@ export type ValidatorActorParams = ActorParamsV3<
 
 @creatable()
 export class ValidatorActor extends ActorV3<ValidatorActorParams> {
+  protected _blockValidationViewer!: BlockValidationViewer
   protected _blockViewer!: BlockViewer
   protected _finalizationRunner!: FinalizationRunner
   protected _lastValidatedBlock: BlockBoundWitness | undefined
@@ -30,6 +31,10 @@ export class ValidatorActor extends ActorV3<ValidatorActorParams> {
     return this.params.config.allowedProducers ?? []
   }
 
+  protected get blockValidationViewer() {
+    return this._blockValidationViewer
+  }
+
   protected get blockViewer() {
     return this._blockViewer
   }
@@ -44,6 +49,7 @@ export class ValidatorActor extends ActorV3<ValidatorActorParams> {
 
   override async createHandler() {
     await super.startHandler()
+    this._blockValidationViewer = await this.locator.getInstance(BlockValidationViewerMoniker)
     this._blockViewer = await this.locator.getInstance(BlockViewerMoniker)
     this._finalizationRunner = await this.locator.getInstance(FinalizationRunnerMoniker)
     this._mempoolViewer = await this.locator.getInstance(MempoolViewerMoniker)
@@ -55,6 +61,7 @@ export class ValidatorActor extends ActorV3<ValidatorActorParams> {
       await this.spanAsync('processPendingBlocks', async () => {
         console.log('ValidatorActor: Processing pending blocks...')
         await processPendingBlocks({
+          blockValidationViewer: this.blockValidationViewer,
           context: this.context,
           logger: this.logger,
           mempoolViewer: this.mempoolViewer,

package/src/shared/config/actors/Bridge.ts

@@ -1,6 +1,5 @@
 import {
-  AddressZod, HexZod, toAddress, toHex,
-  zodAsFactory, zodIsFactory, zodToFactory,
+  AddressZod, HexZod, toAddress, toHex, zodAsFactory, zodIsFactory, zodToFactory,
 } from '@xylabs/sdk-js'
 import type { ChainId } from '@xyo-network/xl1-sdk'
 import {
@@ -14,7 +13,7 @@ const DEFAULT_HARDHAT_BRIDGE_CONTRACT = toAddress('2279B7A0a67DB372996a5FaB50D91
 const DEFAULT_HARDHAT_CHAIN_ID: ChainId = toHex('7A69')
 const DEFAULT_HARDHAT_REMOTE_CHAIN_WALLET_PRIVATE_KEY = toHex('0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80')
 const DEFAULT_HARDHAT_TOKEN_CONTRACT = toAddress('5FbDB2315678afecb367f032d93F642f64180aa3')
-const DEFAULT_MAX_BRIDGE_AMOUNT = toHex(XL1(100_000_000n) * AttoXL1ConvertFactor.xl1)
+const DEFAULT_MAX_BRIDGE_AMOUNT = toHex(XL1(1_000_000n) * AttoXL1ConvertFactor.xl1)
 const DEFAULT_MIN_BRIDGE_AMOUNT = toHex(XL1(1500n) * AttoXL1ConvertFactor.xl1)
 
 export const BasisPointsZod = z.coerce.number().int().nonnegative().max(10_000)

package/src/shared/config/locators/basicRemoteRunnerLocator.ts

@@ -0,0 +1,63 @@
+import { isDefined } from '@xylabs/sdk-js'
+import type {
+  CreatableProviderFactory, ProviderFactoryLocatorInstance, RemoteConfig, RpcTransport, XyoSignerRpcSchemas,
+} from '@xyo-network/xl1-sdk'
+import {
+  JsonRpcXyoRunner, JsonRpcXyoSigner,
+  ProviderFactoryLocator, RestDataLakeViewer,
+  SimpleXyoConnectionRunner,
+  SimpleXyoGatewayRunner,
+} from '@xyo-network/xl1-sdk'
+
+import type { BasicRemoteViewerLocatorOptions } from './basicRemoteViewerLocator.ts'
+import { baseBasicRemoteViewerLocator } from './basicRemoteViewerLocator.ts'
+
+export interface BasicRemoteRunnerLocatorOptions extends BasicRemoteViewerLocatorOptions {
+  additionalRunnerProviders?: CreatableProviderFactory[]
+  signerFactory?: CreatableProviderFactory
+  skipGatewayRunner?: boolean
+}
+
+export async function baseBasicRemoteRunnerLocator(
+  name: string,
+  remoteConfig: RemoteConfig,
+  signerTransport: RpcTransport<XyoSignerRpcSchemas>,
+  dataLakeEndpoint?: string,
+  options?: BasicRemoteRunnerLocatorOptions,
+): Promise<ProviderFactoryLocatorInstance> {
+  const remoteViewerLocator = await baseBasicRemoteViewerLocator(name, remoteConfig, dataLakeEndpoint, options)
+  const locator = new ProviderFactoryLocator(remoteViewerLocator.context, {})
+
+  const providers: CreatableProviderFactory[] = [
+    SimpleXyoConnectionRunner.factory<SimpleXyoConnectionRunner>(SimpleXyoConnectionRunner.dependencies, {}),
+    JsonRpcXyoRunner.factory<JsonRpcXyoRunner>(JsonRpcXyoRunner.dependencies, {}),
+  ]
+
+  if (!options?.skipGatewayRunner) {
+    providers.push(
+      SimpleXyoGatewayRunner.factory<SimpleXyoGatewayRunner>(SimpleXyoGatewayRunner.dependencies, {}),
+    )
+  }
+
+  locator.registerMany([
+    ...providers,
+    ...options?.additionalRunnerProviders ?? [],
+  ])
+
+  if (options?.signerFactory) {
+    locator.register(options.signerFactory)
+  } else {
+    locator.register(
+      JsonRpcXyoSigner.factory<JsonRpcXyoSigner>(JsonRpcXyoSigner.dependencies, { transport: signerTransport }),
+    )
+  }
+
+  if (isDefined(dataLakeEndpoint)) {
+    const dataLakeViewerParams = { endpoint: dataLakeEndpoint }
+    locator.register(RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, dataLakeViewerParams))
+  }
+
+  locator.freeze()
+
+  return locator
+}

package/src/shared/config/locators/basicRemoteViewerLocator.ts

@@ -0,0 +1,44 @@
+import { isDefined } from '@xylabs/sdk-js'
+import type { CreatableProviderFactory, RemoteConfig } from '@xyo-network/xl1-sdk'
+import {
+  ActorConfigZod,
+  ProviderFactoryLocator, RestDataLakeViewer,
+  SimpleTransactionViewer,
+  SimpleXyoConnectionViewer, SimpleXyoGateway,
+} from '@xyo-network/xl1-sdk'
+
+import { commonLocatorFromConfig } from './commonLocatorFromConfig.ts'
+import { remoteLocatorFromConfig } from './remoteLocatorFromConfig.ts'
+
+export interface BasicRemoteViewerLocatorOptions {
+  additionalProviders?: CreatableProviderFactory[]
+}
+
+export async function baseBasicRemoteViewerLocator(
+  name: string,
+  remoteConfig: RemoteConfig,
+  dataLakeEndpoint?: string,
+  options?: BasicRemoteViewerLocatorOptions,
+) {
+  const config = ActorConfigZod.parse({ name, remote: remoteConfig })
+  const rootLocator = await commonLocatorFromConfig({
+    config, singletons: {}, caches: {},
+  })
+  const remoteLocator = await remoteLocatorFromConfig(rootLocator.context)
+  const locator = new ProviderFactoryLocator(remoteLocator.context, {})
+  locator.registerMany([
+    SimpleXyoGateway.factory<SimpleXyoGateway>(SimpleXyoGateway.dependencies, {}),
+    SimpleXyoConnectionViewer.factory<SimpleXyoConnectionViewer>(SimpleXyoConnectionViewer.dependencies, {}),
+    SimpleTransactionViewer.factory<SimpleTransactionViewer>(SimpleTransactionViewer.dependencies, {}),
+    ...options?.additionalProviders ?? [],
+  ])
+
+  if (isDefined(dataLakeEndpoint)) {
+    const dataLakeViewerParams = { endpoint: dataLakeEndpoint }
+    locator.register(RestDataLakeViewer.factory<RestDataLakeViewer>(RestDataLakeViewer.dependencies, dataLakeViewerParams))
+  }
+
+  locator.freeze()
+
+  return locator
+}

package/src/shared/config/locators/commonLocatorFromConfig.ts

@@ -1,7 +1,10 @@
 import type { Promisable } from '@xylabs/sdk-js'
 import { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'
-import type { BaseConfigContext, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk'
+import type {
+  BaseConfigContext, HydratedBlockStateValidationFunction, ProviderFactoryLocatorInstance,
+} from '@xyo-network/xl1-sdk'
 import {
+  BlockCumulativeBalanceValidatorFactory,
   ProviderFactoryLocator,
   SimpleBlockRewardViewer,
   SimpleBlockValidationViewer,
@@ -17,11 +20,21 @@ import {
   SimpleWindowedBlockViewer,
 } from '@xyo-network/xl1-sdk'
 
+const cumulativeBalanceValidator = BlockCumulativeBalanceValidatorFactory()
+
+const validateHydratedBlockStateWithCumulativeBalance: HydratedBlockStateValidationFunction = async (context, block) => {
+  const [stateErrors, cumulativeErrors] = await Promise.all([
+    validateHydratedBlockState(context, block),
+    cumulativeBalanceValidator(context, block),
+  ])
+  return [...stateErrors, ...cumulativeErrors]
+}
+
 export function commonLocatorFromConfig(
   context: BaseConfigContext,
   validateDepsOnRegister = false,
 ): Promisable<ProviderFactoryLocatorInstance> {
-  let locator: ProviderFactoryLocatorInstance = new ProviderFactoryLocator(context, {}, validateDepsOnRegister)
+  const locator: ProviderFactoryLocatorInstance = new ProviderFactoryLocator(context, {}, validateDepsOnRegister)
 
   locator.registerMany([
     SimpleNetworkStakeViewer.factory<SimpleNetworkStakeViewer>(SimpleNetworkStakeViewer.dependencies, {}),
@@ -36,7 +49,7 @@ export function commonLocatorFromConfig(
     SimpleBlockRewardViewer.factory<SimpleBlockRewardViewer>(SimpleBlockRewardViewer.dependencies, {}),
     SimpleBlockValidationViewer.factory<SimpleBlockValidationViewer>(
       SimpleBlockValidationViewer.dependencies,
-      { state: validateHydratedBlockState, protocol: validateHydratedBlock },
+      { state: validateHydratedBlockStateWithCumulativeBalance, protocol: validateHydratedBlock },
     ),
     SimpleTransactionViewer.factory<SimpleTransactionViewer>(SimpleTransactionViewer.dependencies, {}),
   ])

package/src/shared/config/locators/index.ts

@@ -1,4 +1,4 @@
+export * from './basicRemoteRunnerLocator.ts'
+export * from './basicRemoteViewerLocator.ts'
 export * from './commonLocatorFromConfig.ts'
-export * from './contextFromConfigWithoutLocator.ts'
 export * from './remoteLocatorFromConfig.ts'
-export * from './telemetryContextFromConfig.ts'

package/src/shared/index.ts

@@ -3,7 +3,6 @@ export * from './buildTelemetryConfig.ts'
 export * from './ChainInitializableParams.ts'
 export * from './config/index.ts'
 export * from './createDeclarationIntentBlock.ts'
-export * from './evm/index.ts'
 export * from './host/index.ts'
 export * from './init/index.ts'
 export * from './orchestrator/index.ts'

package/src/shared/init/index.ts

@@ -1,6 +1,5 @@
 export * from './initActorAccount.ts'
 export * from './initActorSeedPhrase.ts'
 export * from './initBridgedModule.ts'
-export * from './initEvmProvidersIfAvailable.ts'
 export * from './initStatusReporter.ts'
 export * from './initWallet.ts'

package/dist/browser/shared/config/locators/contextFromConfigWithoutLocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contextFromConfigWithoutLocator.d.ts","sourceRoot":"","sources":["../../../../../src/shared/config/locators/contextFromConfigWithoutLocator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAK5E,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC,CAapD"}

package/dist/browser/shared/config/locators/telemetryContextFromConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"telemetryContextFromConfig.d.ts","sourceRoot":"","sources":["../../../../../src/shared/config/locators/telemetryContextFromConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,sEAW3G"}

package/dist/browser/shared/evm/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,0BAA0B,CAAA"}

package/dist/browser/shared/evm/initChainId.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initChainId.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initChainId.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,eAAO,MAAM,aAAa,GAAI,YAAY,iBAAiB,KAAG,OAE7D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,YAAY,iBAAiB,WAUvD,CAAA"}

package/dist/browser/shared/evm/initEvmProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initEvmProvider.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initEvmProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAOtC,eAAO,MAAM,eAAe,GAAU,SAAS,iBAAiB,KAAG,OAAO,CAAC,QAAQ,CAQlF,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,SAAS,iBAAiB,YAE3D,CAAA"}

package/dist/browser/shared/evm/initInfuraProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initInfuraProvider.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initInfuraProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAOtC,eAAO,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,KAAG,OAAO,CAAC,QAAQ,CAK/E,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,SAAS,iBAAiB,KAAG,OAKjE,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,SAAS,iBAAiB,sCAKjE,CAAA"}

package/dist/browser/shared/evm/initJsonRpcProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initJsonRpcProvider.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initJsonRpcProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAIlD,eAAO,MAAM,mBAAmB,GAAI,SAAS,iBAAiB,6BAG7D,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,iBAAiB,YAI/D,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,SAAS,iBAAiB,8BAIlE,CAAA"}

package/dist/browser/shared/init/initEvmProvidersIfAvailable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initEvmProvidersIfAvailable.d.ts","sourceRoot":"","sources":["../../../../src/shared/init/initEvmProvidersIfAvailable.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,8BAA8B,EAC/B,MAAM,sBAAsB,CAAA;AAU7B,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,8BAA8B,CAAC,CAwEzC"}

package/dist/neutral/shared/config/locators/contextFromConfigWithoutLocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contextFromConfigWithoutLocator.d.ts","sourceRoot":"","sources":["../../../../../src/shared/config/locators/contextFromConfigWithoutLocator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAK5E,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC,CAapD"}

package/dist/neutral/shared/config/locators/telemetryContextFromConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"telemetryContextFromConfig.d.ts","sourceRoot":"","sources":["../../../../../src/shared/config/locators/telemetryContextFromConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,sEAW3G"}

package/dist/neutral/shared/evm/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,0BAA0B,CAAA"}

package/dist/neutral/shared/evm/initChainId.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initChainId.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initChainId.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,eAAO,MAAM,aAAa,GAAI,YAAY,iBAAiB,KAAG,OAE7D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,YAAY,iBAAiB,WAUvD,CAAA"}

package/dist/neutral/shared/evm/initEvmProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initEvmProvider.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initEvmProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAOtC,eAAO,MAAM,eAAe,GAAU,SAAS,iBAAiB,KAAG,OAAO,CAAC,QAAQ,CAQlF,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,SAAS,iBAAiB,YAE3D,CAAA"}

package/dist/neutral/shared/evm/initInfuraProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initInfuraProvider.d.ts","sourceRoot":"","sources":["../../../../src/shared/evm/initInfuraProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAOtC,eAAO,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,KAAG,OAAO,CAAC,QAAQ,CAK/E,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,SAAS,iBAAiB,KAAG,OAKjE,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,SAAS,iBAAiB,sCAKjE,CAAA"}