@xyo-network/chain-bridge 1.18.1 → 1.18.4

package/dist/node/interface/service/Observer/LiquidityPoolBridgeObserver/LiquidityPoolBridgeObserver.d.ts

@@ -1,5 +1,5 @@
 import type { Address, Hex } from '@xylabs/sdk-js';
-import type { LiquidityPoolBridge } from '@xyo-network/typechain';
+import type { ILiquidityPoolBridge } from '@xyo-network/typechain';
 import type { WebSocketProvider } from 'ethers';
 import type { BridgeServiceParams } from '../../../interface/index.ts';
 import { AbstractBridgeObserverService } from '../Observer.ts';
@@ -7,7 +7,7 @@ export type LiquidityPoolBridgeObserverParams = BridgeServiceParams & {
     /**
      * The address to watch for incoming or outgoing ERC-20 token transfers.
      */
-    bridgeAddress: string;
+    bridgeAddress: Address;
     /**
      * An ethers.js WebSocketProvider connected to the Ethereum network to monitor for ERC-20 transfers.
      */
@@ -19,11 +19,11 @@ export type LiquidityPoolBridgeObserverParams = BridgeServiceParams & {
 };
 export declare class LiquidityPoolBridgeObserver extends AbstractBridgeObserverService<LiquidityPoolBridgeObserverParams> {
     moniker: string;
-    protected _bridge: LiquidityPoolBridge | undefined;
+    protected _bridge: ILiquidityPoolBridge | undefined;
     protected _bridgeChainId: Hex | undefined;
     protected _bridgeRemoteChainId: Hex | undefined;
     protected _bridgeTokenAddress: Address | undefined;
-    protected get bridge(): LiquidityPoolBridge;
+    protected get bridge(): ILiquidityPoolBridge;
     protected get bridgeChainId(): Hex;
     protected get bridgeRemoteChainId(): Hex;
     protected get bridgeTokenAddress(): Address;

package/dist/node/interface/service/Observer/LiquidityPoolBridgeObserver/LiquidityPoolBridgeObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiquidityPoolBridgeObserver.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/service/Observer/LiquidityPoolBridgeObserver/LiquidityPoolBridgeObserver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAKlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAQjE,OAAO,KAAK,EAAwB,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAGrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AAE9D,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GAAG;IACpE;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAA;IAC3B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,2BAA4B,SAAQ,6BAA6B,CAAC,iCAAiC,CAAC;IAC/G,OAAO,SAAgC;IACvC,SAAS,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAClD,SAAS,CAAC,cAAc,EAAE,GAAG,GAAG,SAAS,CAAA;IACzC,SAAS,CAAC,oBAAoB,EAAE,GAAG,GAAG,SAAS,CAAA;IAC/C,SAAS,CAAC,mBAAmB,EAAE,OAAO,GAAG,SAAS,CAAA;IAElD,SAAS,KAAK,MAAM,IAAI,mBAAmB,CAE1C;IAED,SAAS,KAAK,aAAa,IAAI,GAAG,CAEjC;IAED,SAAS,KAAK,mBAAmB,IAAI,GAAG,CAEvC;IAED,SAAS,KAAK,kBAAkB,IAAI,OAAO,CAE1C;IAED,SAAS,KAAK,QAAQ,IAAI,iBAAiB,CAE1C;IAED,SAAS,KAAK,UAAU,IAAI,MAAM,CAEjC;IAEc,aAAa;YAsCd,sBAAsB;YAmDtB,oBAAoB;YAsCpB,gBAAgB;CAiB/B"}
+{"version":3,"file":"LiquidityPoolBridgeObserver.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/service/Observer/LiquidityPoolBridgeObserver/LiquidityPoolBridgeObserver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAKlD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAQlE,OAAO,KAAK,EAAwB,iBAAiB,EAAE,MAAM,QAAQ,CAAA;AAGrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAA;AAE9D,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GAAG;IACpE;;OAEG;IACH,aAAa,EAAE,OAAO,CAAA;IACtB;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAA;IAC3B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,2BAA4B,SAAQ,6BAA6B,CAAC,iCAAiC,CAAC;IAC/G,OAAO,SAAgC;IACvC,SAAS,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAA;IACnD,SAAS,CAAC,cAAc,EAAE,GAAG,GAAG,SAAS,CAAA;IACzC,SAAS,CAAC,oBAAoB,EAAE,GAAG,GAAG,SAAS,CAAA;IAC/C,SAAS,CAAC,mBAAmB,EAAE,OAAO,GAAG,SAAS,CAAA;IAElD,SAAS,KAAK,MAAM,IAAI,oBAAoB,CAE3C;IAED,SAAS,KAAK,aAAa,IAAI,GAAG,CAEjC;IAED,SAAS,KAAK,mBAAmB,IAAI,GAAG,CAEvC;IAED,SAAS,KAAK,kBAAkB,IAAI,OAAO,CAE1C;IAED,SAAS,KAAK,QAAQ,IAAI,iBAAiB,CAE1C;IAED,SAAS,KAAK,UAAU,IAAI,MAAM,CAEjC;IAEc,aAAa;YAsCd,sBAAsB;YAmDtB,oBAAoB;YAsCpB,gBAAgB;CAiB/B"}

package/dist/node/manifest/{getLocator.d.ts → getModuleLocator.d.ts}

@@ -1,8 +1,9 @@
 import type { Logger } from '@xylabs/sdk-js';
 import { ModuleFactoryLocator } from '@xyo-network/module-factory-locator';
-import type { Config } from '@xyo-network/xl1-sdk';
+import type { Config, ProviderFactoryLocator } from '@xyo-network/xl1-sdk';
 export interface GetLocatorContext {
     config: Config;
+    locator: ProviderFactoryLocator;
     logger?: Logger;
 }
 /**
@@ -10,5 +11,5 @@ export interface GetLocatorContext {
  * operation of the node (entirely in memory)
  * @returns A locator with the necessary modules registered
  */
-export declare const getLocator: (context: GetLocatorContext) => Promise<ModuleFactoryLocator>;
-//# sourceMappingURL=getLocator.d.ts.map
+export declare const getModuleLocator: (context: GetLocatorContext) => Promise<ModuleFactoryLocator>;
+//# sourceMappingURL=getModuleLocator.d.ts.map

package/dist/node/manifest/getModuleLocator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getModuleLocator.d.ts","sourceRoot":"","sources":["../../../src/manifest/getModuleLocator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAA;AASlD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAG1E,OAAO,KAAK,EACoB,MAAM,EAAe,sBAAsB,EAE1E,MAAM,sBAAsB,CAAA;AAa7B,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,sBAAsB,CAAA;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAU,SAAS,iBAAiB,kCAuFhE,CAAA"}

package/dist/node/manifest/getNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNode.d.ts","sourceRoot":"","sources":["../../../src/manifest/getNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAOlD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;CACvB;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,uKAUpD,CAAA"}
+{"version":3,"file":"getNode.d.ts","sourceRoot":"","sources":["../../../src/manifest/getNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EACV,MAAM,EACP,MAAM,sBAAsB,CAAA;AAQ7B,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;CACvB;AAED;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,uKAapD,CAAA"}

package/dist/node/manifest/getServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../src/manifest/getServices.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAMlD,OAAO,KAAK,EACV,MAAM,EAGP,MAAM,sBAAsB,CAAA;AAU7B,OAAO,KAAK,EACE,wBAAwB,EACrC,MAAM,sBAAsB,CAAA;AAE7B,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAU,SAAS,kBAAkB,KAAG,OAAO,CAAC,wBAAwB,CA0B/F,CAAA"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../src/manifest/getServices.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAMlD,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,sBAAsB,CAAA;AAS/D,OAAO,KAAK,EACE,wBAAwB,EACrC,MAAM,sBAAsB,CAAA;AAE7B,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAU,SAAS,kBAAkB,KAAG,OAAO,CAAC,wBAAwB,CA0B/F,CAAA"}

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

@@ -1,4 +1,4 @@
-export * from './getLocator.ts';
+export * from './getModuleLocator.ts';
 export * from './getNode.ts';
 export * from './getServices.ts';
 export * from './nodeManifest.ts';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/manifest/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/manifest/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-bridge",
-  "version": "1.18.1",
+  "version": "1.18.4",
   "description": "XYO Layer One Bridge",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -49,44 +49,43 @@
     "types": "tsc --noEmit -p tsconfig.test.json"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "~0.210.0",
-    "@opentelemetry/instrumentation-express": "~0.58.0",
-    "@opentelemetry/instrumentation-http": "~0.210.0",
-    "@xylabs/express": "~5.0.61",
-    "@xylabs/mongo": "~5.0.61",
-    "@xylabs/sdk-js": "~5.0.61",
-    "@xyo-network/archivist-memory": "~5.2.22",
-    "@xyo-network/archivist-mongodb": "~5.2.22",
-    "@xyo-network/archivist-view": "~5.2.22",
+    "@opentelemetry/instrumentation": "~0.211.0",
+    "@opentelemetry/instrumentation-express": "~0.59.0",
+    "@opentelemetry/instrumentation-http": "~0.211.0",
+    "@xylabs/express": "~5.0.64",
+    "@xylabs/mongo": "~5.0.64",
+    "@xylabs/sdk-js": "~5.0.64",
+    "@xyo-network/archivist-memory": "~5.2.25",
+    "@xyo-network/archivist-mongodb": "~5.2.25",
+    "@xyo-network/archivist-view": "~5.2.25",
     "@xyo-network/bios": "~7.2.0",
-    "@xyo-network/boundwitness-validator": "~5.2.22",
-    "@xyo-network/chain-protocol": "~1.18.1",
-    "@xyo-network/chain-services": "~1.18.1",
-    "@xyo-network/chain-telemetry": "~1.18.1",
-    "@xyo-network/manifest-model": "~5.2.22",
-    "@xyo-network/manifest-wrapper": "~5.2.22",
-    "@xyo-network/module-abstract": "~5.2.22",
-    "@xyo-network/module-factory-locator": "~5.2.22",
-    "@xyo-network/module-model": "~5.2.22",
-    "@xyo-network/node-model": "~5.2.22",
-    "@xyo-network/payload-builder": "~5.2.22",
-    "@xyo-network/payload-model": "~5.2.22",
-    "@xyo-network/sentinel-abstract": "~5.2.22",
-    "@xyo-network/sentinel-memory": "~5.2.22",
-    "@xyo-network/sentinel-model": "~5.2.22",
-    "@xyo-network/typechain": "~4.0.11",
-    "@xyo-network/wallet": "~5.2.22",
-    "@xyo-network/wallet-model": "~5.2.22",
-    "@xyo-network/xl1-sdk": "~1.18.2",
+    "@xyo-network/boundwitness-validator": "~5.2.25",
+    "@xyo-network/chain-protocol": "~1.18.4",
+    "@xyo-network/chain-services": "~1.18.4",
+    "@xyo-network/chain-telemetry": "~1.18.4",
+    "@xyo-network/manifest-model": "~5.2.25",
+    "@xyo-network/manifest-wrapper": "~5.2.25",
+    "@xyo-network/module-abstract": "~5.2.25",
+    "@xyo-network/module-factory-locator": "~5.2.25",
+    "@xyo-network/module-model": "~5.2.25",
+    "@xyo-network/node-model": "~5.2.25",
+    "@xyo-network/payload-builder": "~5.2.25",
+    "@xyo-network/payload-model": "~5.2.25",
+    "@xyo-network/sentinel-abstract": "~5.2.25",
+    "@xyo-network/sentinel-memory": "~5.2.25",
+    "@xyo-network/sentinel-model": "~5.2.25",
+    "@xyo-network/typechain": "~4.1.1",
+    "@xyo-network/wallet": "~5.2.25",
+    "@xyo-network/wallet-model": "~5.2.25",
+    "@xyo-network/xl1-sdk": "~1.19.4",
     "async-mutex": "~0.5.0",
-    "bullmq": "~5.66.5",
+    "bullmq": "~5.67.1",
     "compression": "~1.8.1",
-    "cors": "~2.8.5",
+    "cors": "~2.8.6",
     "ethers": "^6.16.0",
     "express": "~5.2.1",
-    "ioredis": "5.9.1",
-    "uuid": "~13.0.0",
-    "zod": "~4.2.1"
+    "ioredis": "~5.9.2",
+    "uuid": "~13.0.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -94,45 +93,49 @@
     "@types/cors": "~2.8.19",
     "@types/express": "5.0.6",
     "@types/express-serve-static-core": "~5.1.1",
-    "@types/node": "~25.0.8",
-    "@xylabs/mongo": "~5.0.61",
-    "@xylabs/sdk-js": "~5.0.61",
-    "@xylabs/ts-scripts-yarn3": "~7.2.32",
-    "@xylabs/tsconfig": "~7.2.32",
-    "@xylabs/vitest-extended": "~5.0.61",
-    "@xyo-network/account": "~5.2.22",
-    "@xyo-network/account-model": "~5.2.22",
-    "@xyo-network/archivist-abstract": "~5.2.22",
-    "@xyo-network/archivist-memory": "~5.2.22",
-    "@xyo-network/archivist-model": "~5.2.22",
-    "@xyo-network/archivist-mongodb": "~5.2.22",
-    "@xyo-network/archivist-view": "~5.2.22",
+    "@types/node": "~25.0.10",
+    "@xylabs/mongo": "~5.0.64",
+    "@xylabs/sdk-js": "~5.0.64",
+    "@xylabs/ts-scripts-yarn3": "~7.3.2",
+    "@xylabs/tsconfig": "~7.3.2",
+    "@xylabs/vitest-extended": "~5.0.64",
+    "@xyo-network/account": "~5.2.25",
+    "@xyo-network/account-model": "~5.2.25",
+    "@xyo-network/archivist-abstract": "~5.2.25",
+    "@xyo-network/archivist-memory": "~5.2.25",
+    "@xyo-network/archivist-model": "~5.2.25",
+    "@xyo-network/archivist-mongodb": "~5.2.25",
+    "@xyo-network/archivist-view": "~5.2.25",
     "@xyo-network/bios": "~7.2.0",
     "@xyo-network/bios-model": "~7.2.0",
-    "@xyo-network/boundwitness-builder": "~5.2.22",
-    "@xyo-network/chain-protocol": "~1.18.1",
-    "@xyo-network/chain-services": "~1.18.1",
-    "@xyo-network/chain-telemetry": "~1.18.1",
-    "@xyo-network/manifest-wrapper": "~5.2.22",
-    "@xyo-network/module-abstract": "~5.2.22",
-    "@xyo-network/module-abstract-mongodb": "~5.2.22",
-    "@xyo-network/module-model-mongodb": "~5.2.22",
-    "@xyo-network/node-memory": "~5.2.22",
-    "@xyo-network/payload-builder": "~5.2.22",
-    "@xyo-network/sentinel-memory": "~5.2.22",
-    "@xyo-network/wallet": "~5.2.22",
-    "@xyo-network/xl1-sdk": "~1.18.2",
+    "@xyo-network/boundwitness-builder": "~5.2.25",
+    "@xyo-network/chain-protocol": "~1.18.4",
+    "@xyo-network/chain-services": "~1.18.4",
+    "@xyo-network/chain-telemetry": "~1.18.4",
+    "@xyo-network/manifest-wrapper": "~5.2.25",
+    "@xyo-network/module-abstract": "~5.2.25",
+    "@xyo-network/module-abstract-mongodb": "~5.2.25",
+    "@xyo-network/module-model-mongodb": "~5.2.25",
+    "@xyo-network/node-memory": "~5.2.25",
+    "@xyo-network/payload-builder": "~5.2.25",
+    "@xyo-network/sentinel-memory": "~5.2.25",
+    "@xyo-network/wallet": "~5.2.25",
+    "@xyo-network/xl1-sdk": "~1.19.4",
     "async-mutex": "~0.5.0",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.2",
     "ethers": "^6.16.0",
     "http-status-codes": "~2.3.0",
-    "mongodb": "~6.21.0",
+    "mongodb": "~7.0.0",
     "nodemon": "~3.1.11",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.17",
-    "vitest-mock-extended": "~3.1.0"
+    "vitest": "~4.0.18",
+    "vitest-mock-extended": "~3.1.0",
+    "zod": "~4.3.6"
+  },
+  "peerDependencies": {
+    "zod": "^4"
   },
   "engines": {
     "node": ">=22.3 <23"

package/src/config/getGateway.ts

@@ -2,12 +2,13 @@ import { isDefined } from '@xylabs/sdk-js'
 import { HDWallet } from '@xyo-network/wallet'
 import type {
   Config, RpcSchemaMap, TransportFactory,
-  XyoConnection, XyoGatewayRunner,
+  XyoGatewayRunner,
 } from '@xyo-network/xl1-sdk'
 import {
   buildJsonRpcProviderLocator,
   HttpRpcTransport,
-  SimpleXyoGatewayRunner, SimpleXyoSigner, XyoConnectionMoniker,
+  SimpleXyoGatewayRunner, SimpleXyoSigner,
+  XyoGatewayRunnerMoniker,
 } from '@xyo-network/xl1-sdk'
 
 let gatewayInstance: XyoGatewayRunner | undefined
@@ -17,10 +18,9 @@ export const getGateway = async (config: Config): Promise<XyoGatewayRunner> => {
   const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
   const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
   const account = await walletPromise
-  const signer = await SimpleXyoSigner.create({ account })
   const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
   const locator = await buildJsonRpcProviderLocator({ transportFactory })
-  const connection = await locator.getInstance<XyoConnection>(XyoConnectionMoniker)
-  gatewayInstance = new SimpleXyoGatewayRunner(connection, signer)
-  return gatewayInstance
+  locator.register(SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account }))
+  locator.register(SimpleXyoGatewayRunner.factory<SimpleXyoGatewayRunner>(SimpleXyoGatewayRunner.dependencies))
+  return await locator.getInstance<XyoGatewayRunner>(XyoGatewayRunnerMoniker)
 }

package/src/interface/service/Observer/LiquidityPoolBridgeObserver/LiquidityPoolBridgeObserver.ts

@@ -3,8 +3,8 @@ import {
   asAddress, asHex, assertEx, hexFromBigInt, hexToBigInt, isNull, isUndefined, toAddress,
 } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { LiquidityPoolBridge } from '@xyo-network/typechain'
-import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
+import type { ILiquidityPoolBridge } from '@xyo-network/typechain'
+import { ILiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import type {
   BridgeDestinationObservation, BridgeIntent, BridgeSourceObservation,
 } from '@xyo-network/xl1-sdk'
@@ -21,7 +21,7 @@ export type LiquidityPoolBridgeObserverParams = BridgeServiceParams & {
   /**
    * The address to watch for incoming or outgoing ERC-20 token transfers.
    */
-  bridgeAddress: string
+  bridgeAddress: Address
   /**
    * An ethers.js WebSocketProvider connected to the Ethereum network to monitor for ERC-20 transfers.
    */
@@ -34,12 +34,12 @@ export type LiquidityPoolBridgeObserverParams = BridgeServiceParams & {
 
 export class LiquidityPoolBridgeObserver extends AbstractBridgeObserverService<LiquidityPoolBridgeObserverParams> {
   moniker = 'LiquidityPoolBridgeObserver'
-  protected _bridge: LiquidityPoolBridge | undefined
+  protected _bridge: ILiquidityPoolBridge | undefined
   protected _bridgeChainId: Hex | undefined
   protected _bridgeRemoteChainId: Hex | undefined
   protected _bridgeTokenAddress: Address | undefined
 
-  protected get bridge(): LiquidityPoolBridge {
+  protected get bridge(): ILiquidityPoolBridge {
     return assertEx(this._bridge, () => new Error('Bridge contract not initialized'))
   }
 
@@ -67,7 +67,7 @@ export class LiquidityPoolBridgeObserver extends AbstractBridgeObserverService<L
     const { provider, bridgeAddress } = this.params
 
     // Connect to the bridge contract
-    this._bridge = LiquidityPoolBridge__factory.connect(getAddress(bridgeAddress), provider)
+    this._bridge = ILiquidityPoolBridge__factory.connect(getAddress(bridgeAddress), provider)
 
     // Parse bridge network chain ID
     const network = await provider.getNetwork()

package/src/interface/service/Relay/LiquidityPoolBridgeRelay/LiquidityPoolBridgeRelay.ts

@@ -108,7 +108,7 @@ export class LiquidityPoolBridgeRelay<TParams extends LiquidityPoolBridgeRelayPa
             getAddress(bridgeIntent.srcAddress),
             getAddress(bridgeIntent.destAddress),
             amount,
-            { nonce },
+            nonce,
           )
           return true
         }
@@ -204,7 +204,7 @@ export class LiquidityPoolBridgeRelay<TParams extends LiquidityPoolBridgeRelayPa
             getAddress(bridgeIntent.srcAddress),
             getAddress(bridgeIntent.destAddress),
             amount,
-            { nonce },
+            nonce,
           )
           const confirmation = await tx.wait()
           const transactionResponse = await confirmation?.getTransaction()

package/src/manifest/{getLocator.ts → getModuleLocator.ts}

@@ -11,14 +11,13 @@ import { AbstractModule, LoggerModuleStatusReporter } from '@xyo-network/module-
 import { ModuleFactoryLocator } from '@xyo-network/module-factory-locator'
 import type { MongoDBModuleParamsV2 } from '@xyo-network/module-model-mongodb'
 import { MemorySentinel } from '@xyo-network/sentinel-memory'
-import { HDWallet } from '@xyo-network/wallet'
 import type {
-  BridgeDestinationObservation, Config, IterableMap, SignedHydratedTransaction,
+  BridgeDestinationObservation, Config, IterableMap, ProviderFactoryLocator, SignedHydratedTransaction,
   XyoGatewayRunner,
 } from '@xyo-network/xl1-sdk'
 import {
-  hasMongoConfig, mapToMapType, SimpleXyoConnection,
-  SimpleXyoGatewayRunner, SimpleXyoSigner,
+  hasMongoConfig, mapToMapType,
+  XyoGatewayRunnerMoniker,
 } from '@xyo-network/xl1-sdk'
 import type { Document } from 'mongodb'
 
@@ -30,6 +29,7 @@ import {
 
 export interface GetLocatorContext {
   config: Config
+  locator: ProviderFactoryLocator
   logger?: Logger
 }
 
@@ -38,8 +38,10 @@ export interface GetLocatorContext {
  * operation of the node (entirely in memory)
  * @returns A locator with the necessary modules registered
  */
-export const getLocator = async (context: GetLocatorContext) => {
-  const { config, logger } = context
+export const getModuleLocator = async (context: GetLocatorContext) => {
+  const {
+    config, locator, logger,
+  } = context
   const { otlpEndpoint } = config.telemetry?.otel ?? {}
   const { path: endpoint = '/metrics', port: port = 9468 } = config.telemetry?.metrics?.scrape ?? {}
   const { traceProvider, meterProvider } = await initTelemetry({
@@ -54,7 +56,7 @@ export const getLocator = async (context: GetLocatorContext) => {
   if (isDefined(logger)) AbstractModule.defaultLogger = logger
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : undefined
 
-  const locator = new ModuleFactoryLocator()
+  const moduleLocator = new ModuleFactoryLocator()
   // If there's a MongoDB configuration
   const mongoConfig = config.storage?.mongo
   if (hasMongoConfig(mongoConfig)) {
@@ -69,21 +71,21 @@ export const getLocator = async (context: GetLocatorContext) => {
       meterProvider, payloadSdkConfig, statusReporter, traceProvider,
     }
     // Register the MongoDB Archivist as the default
-    locator.register(MongoDBArchivistV2.factory(params), undefined, true)
+    moduleLocator.register(MongoDBArchivistV2.factory(params), undefined, true)
   }
 
-  locator.register(MemoryArchivist.factory({
+  moduleLocator.register(MemoryArchivist.factory({
     traceProvider, meterProvider, statusReporter,
   }))
-  locator.register(MemorySentinel.factory({
+  moduleLocator.register(MemorySentinel.factory({
     traceProvider, meterProvider, statusReporter,
   }))
-  locator.register(ViewArchivist.factory({
+  moduleLocator.register(ViewArchivist.factory({
     traceProvider, meterProvider, statusReporter,
   }))
 
-  const gateway = await getGateway(config)
-  const viewer = assertEx(gateway.connectionInstance.viewer, () => 'Gateway viewer is not defined')
+  const gateway = await locator.getInstance<XyoGatewayRunner>(XyoGatewayRunnerMoniker)
+  const viewer = assertEx(gateway.connection.viewer, () => 'Gateway viewer is not defined')
   const pendingXl1ToEthXl1BridgeIntentTransactions = await getIterableMap<Hash, SignedHydratedTransaction>(
     config,
     'liquidity_bridge_xl1_to_eth_xl1_pending',
@@ -102,7 +104,7 @@ export const getLocator = async (context: GetLocatorContext) => {
     traceProvider,
     viewer,
   }
-  locator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams))
+  moduleLocator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams))
 
   const completedEthXl1BridgeTransactions = await getIterableMap<Hash, BridgeDestinationObservation>(
     config,
@@ -120,21 +122,9 @@ export const getLocator = async (context: GetLocatorContext) => {
     statusReporter,
     traceProvider,
   }
-  locator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams))
+  moduleLocator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams))
 
-  return locator
-}
-
-const getGateway = async (
-  config: Config,
-): Promise<XyoGatewayRunner> => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
-  const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
-  const account = await walletPromise
-  const signer = await SimpleXyoSigner.create({ account })
-  const connection = await SimpleXyoConnection.create()
-  const gateway = new SimpleXyoGatewayRunner(connection, signer)
-  return gateway
+  return moduleLocator
 }
 
 /**

package/src/manifest/getNode.ts

@@ -1,9 +1,12 @@
 import type { Logger } from '@xylabs/sdk-js'
 import { ManifestWrapper } from '@xyo-network/manifest-wrapper'
 import type { WalletInstance } from '@xyo-network/wallet-model'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type {
+  Config, RpcSchemaMap, TransportFactory,
+} from '@xyo-network/xl1-sdk'
+import { buildJsonRpcProviderLocator, HttpRpcTransport } from '@xyo-network/xl1-sdk'
 
-import { getLocator } from './getLocator.ts'
+import { getModuleLocator } from './getModuleLocator.ts'
 import { NodeManifest } from './nodeManifest.ts'
 import { PrivateChildManifests } from './private/index.ts'
 import { PublicChildManifests } from './public/index.ts'
@@ -21,8 +24,11 @@ export interface GetNodeContext {
  */
 export const getNode = async (context: GetNodeContext) => {
   const { wallet } = context
-  const locator = await getLocator(context)
-  const wrapper = new ManifestWrapper(NodeManifest, wallet, locator, PublicChildManifests, PrivateChildManifests)
+  const { chainRpcApiUrl: endpoint } = context.config.bridge
+  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
+  const locator = await buildJsonRpcProviderLocator({ transportFactory })
+  const moduleLocator = await getModuleLocator({ ...context, locator })
+  const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, PublicChildManifests, PrivateChildManifests)
   const [node, ...childNodes] = await wrapper.loadNodes()
   if (childNodes?.length > 0) {
     await Promise.all(childNodes.map(childNode => node.register(childNode)))

package/src/manifest/getServices.ts

@@ -5,20 +5,15 @@ import { MongoMap } from '@xyo-network/chain-protocol'
 import { initEvmProvider } from '@xyo-network/chain-services'
 import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import { HDWallet } from '@xyo-network/wallet'
-import type {
-  Config, IterableMap, RpcSchemaMap, SimpleXyoConnection,
-  TransportFactory,
-  XyoGatewayRunner,
-} from '@xyo-network/xl1-sdk'
+import type { Config, IterableMap } from '@xyo-network/xl1-sdk'
 import {
-  buildJsonRpcProviderLocator,
-  hasMongoConfig, HttpRpcTransport,
-  mapToMapType, SimpleXyoGatewayRunner, SimpleXyoSigner,
-  XyoConnectionMoniker,
+  hasMongoConfig,
+  mapToMapType,
 } from '@xyo-network/xl1-sdk'
 import { getAddress, Wallet } from 'ethers'
 import type { Document } from 'mongodb'
 
+import { getGateway } from '../config/index.ts'
 import type {
   EthTxState, IBridgeServiceCollection, Xl1TxState,
 } from '../services/index.ts'
@@ -60,20 +55,6 @@ export const getServices = async (context: GetServicesContext): Promise<IBridgeS
   }
 }
 
-const getGateway = async (
-  config: Config,
-): Promise<XyoGatewayRunner> => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
-  const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
-  const account = await walletPromise
-  const signer = await SimpleXyoSigner.create({ account })
-  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
-  const locator = await buildJsonRpcProviderLocator({ transportFactory })
-  const connection = await locator.getInstance<SimpleXyoConnection>(XyoConnectionMoniker)
-  const gateway = new SimpleXyoGatewayRunner(connection, signer)
-  return gateway
-}
-
 /**
  * Gets an iterable map based on the storage instructions in the config
  * @param config The config containing storage instructions

package/src/manifest/index.ts

@@ -1,4 +1,4 @@
-export * from './getLocator.ts'
+export * from './getModuleLocator.ts'
 export * from './getNode.ts'
 export * from './getServices.ts'
 export * from './nodeManifest.ts'

package/src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts

@@ -223,7 +223,7 @@ export class EVMLiquidityBridgeTransactionCompletionMonitorSentinel<
     const nonce = await this.wallet.getNonce()
     const srcAddress = getAddress(bridgeIntent.srcAddress)
     const destAddress = getAddress(bridgeIntent.destAddress)
-    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, { nonce })
+    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, nonce)
     const confirmation = await tx.wait()
     const transactionResponse = await confirmation?.getTransaction()
     const destConfirmation = asHex(transactionResponse?.hash ?? '', true)

package/src/queue/workers/ethTransactionPreparation.ts

@@ -30,7 +30,7 @@ export const createWorker = (connection: Redis) => {
       const amount = hexToBigInt(bridgeIntent.destAmount)
       const srcAddress = getAddress(bridgeIntent.srcAddress)
       const destAddress = getAddress(bridgeIntent.destAddress)
-      const preparedTx = await bridge.getFunction('bridgeFromRemote').populateTransaction(srcAddress, destAddress, amount)
+      const preparedTx = await bridge.getFunction('bridgeFromRemote').populateTransaction(srcAddress, destAddress, amount, 0n)
       await job.log(`[${hash}] built ETH transaction`)
       await job.log(`[${hash}] storing ETH preparedTx`)
       await stateMap.set(hash, { preparedTx })

package/src/queue/workers/xl1TransactionMonitor.ts

@@ -27,7 +27,7 @@ const createWorker = (connection: Redis) => {
       // Get the hash of the transaction
       const hash = await PayloadBuilder.hash(tx[0])
       // Get the state of the transaction
-      const viewer = assertEx(gateway.connectionInstance.viewer, () => `[${hash}] viewer not defined on gateway`)
+      const viewer = assertEx(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`)
       const state = assertEx(await stateMap.get(hash), () => `[${hash}] state not found`)
 
       // Check for transaction inclusion on chain

package/src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteEstimate.ts

@@ -41,7 +41,7 @@ export const makeBridgeToRemoteEstimateRoute = (config: Config): RouteDefinition
 
       // Use viewer to get current block
       const gateway = await getGateway(config)
-      const viewer = assertEx(gateway.connectionInstance.viewer, () => new Error('Viewer not available on gateway connection'))
+      const viewer = assertEx(gateway.connection.viewer, () => new Error('Viewer not available on gateway connection'))
       const currentBlockNumber = await viewer.currentBlockNumber()
       // Calculate nbf/exp
       const nbf = toXL1BlockNumber(currentBlockNumber, true)

package/dist/node/manifest/getLocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getLocator.d.ts","sourceRoot":"","sources":["../../../src/manifest/getLocator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAA;AASlD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAI1E,OAAO,KAAK,EACoB,MAAM,EAErC,MAAM,sBAAsB,CAAA;AAa7B,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,SAAS,iBAAiB,kCAqF1D,CAAA"}