@xyo-network/chain-bridge 1.19.13 → 1.19.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-bridge",
-  "version": "1.19.13",
+  "version": "1.19.15",
   "description": "XYO Layer One Bridge",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -49,43 +49,31 @@
     "types": "tsc --noEmit -p tsconfig.test.json"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "~0.211.0",
+    "@opentelemetry/instrumentation": "~0.212.0",
     "@opentelemetry/instrumentation-express": "~0.59.0",
-    "@opentelemetry/instrumentation-http": "~0.211.0",
+    "@opentelemetry/instrumentation-http": "~0.212.0",
     "@xylabs/express": "~5.0.79",
     "@xylabs/mongo": "~5.0.79",
     "@xylabs/sdk-js": "~5.0.79",
-    "@xyo-network/archivist-memory": "~5.3.2",
-    "@xyo-network/archivist-mongodb": "~5.3.2",
-    "@xyo-network/archivist-view": "~5.3.2",
-    "@xyo-network/bios": "~7.2.1",
-    "@xyo-network/boundwitness-validator": "~5.3.2",
-    "@xyo-network/chain-orchestration": "~1.19.13",
-    "@xyo-network/chain-protocol": "~1.19.13",
-    "@xyo-network/chain-services": "~1.19.13",
-    "@xyo-network/chain-telemetry": "~1.19.13",
-    "@xyo-network/manifest-model": "~5.3.2",
-    "@xyo-network/manifest-wrapper": "~5.3.2",
-    "@xyo-network/module-abstract": "~5.3.2",
-    "@xyo-network/module-factory-locator": "~5.3.2",
-    "@xyo-network/module-model": "~5.3.2",
-    "@xyo-network/node-model": "~5.3.2",
-    "@xyo-network/payload-builder": "~5.3.2",
-    "@xyo-network/payload-model": "~5.3.2",
-    "@xyo-network/sentinel-abstract": "~5.3.2",
-    "@xyo-network/sentinel-memory": "~5.3.2",
-    "@xyo-network/sentinel-model": "~5.3.2",
+    "@xyo-network/boundwitness-validator": "~5.3.5",
+    "@xyo-network/chain-orchestration": "~1.19.15",
+    "@xyo-network/chain-protocol": "~1.19.15",
+    "@xyo-network/chain-services": "~1.19.15",
+    "@xyo-network/module-model": "~5.3.5",
+    "@xyo-network/payload-model": "~5.3.5",
+    "@xyo-network/sentinel-abstract": "~5.3.5",
+    "@xyo-network/sentinel-model": "~5.3.5",
     "@xyo-network/typechain": "~4.1.1",
-    "@xyo-network/wallet": "~5.3.2",
-    "@xyo-network/wallet-model": "~5.3.2",
-    "@xyo-network/xl1-sdk": "~1.23.21",
+    "@xyo-network/wallet": "~5.3.5",
+    "@xyo-network/wallet-model": "~5.3.5",
+    "@xyo-network/xl1-sdk": "~1.24.15",
     "async-mutex": "~0.5.0",
-    "bullmq": "~5.68.0",
+    "bullmq": "~5.69.3",
     "compression": "~1.8.1",
     "cors": "~2.8.6",
     "ethers": "^6.16.0",
     "express": "~5.2.1",
-    "ioredis": "~5.9.2",
+    "ioredis": "5.9.2",
     "uuid": "~13.0.0",
     "yargs-parser": "~22.0.0"
   },
@@ -102,31 +90,32 @@
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
     "@xylabs/tsconfig": "~7.3.2",
     "@xylabs/vitest-extended": "~5.0.79",
-    "@xyo-network/account": "~5.3.2",
-    "@xyo-network/account-model": "~5.3.2",
-    "@xyo-network/archivist-abstract": "~5.3.2",
-    "@xyo-network/archivist-memory": "~5.3.2",
-    "@xyo-network/archivist-model": "~5.3.2",
-    "@xyo-network/archivist-mongodb": "~5.3.2",
-    "@xyo-network/archivist-view": "~5.3.2",
+    "@xyo-network/account": "~5.3.5",
+    "@xyo-network/account-model": "~5.3.5",
+    "@xyo-network/archivist-abstract": "~5.3.5",
+    "@xyo-network/archivist-memory": "~5.3.5",
+    "@xyo-network/archivist-model": "~5.3.5",
+    "@xyo-network/archivist-mongodb": "~5.3.5",
+    "@xyo-network/archivist-view": "~5.3.5",
     "@xyo-network/bios": "~7.2.1",
     "@xyo-network/bios-model": "~7.2.1",
-    "@xyo-network/boundwitness-builder": "~5.3.2",
-    "@xyo-network/chain-protocol": "~1.19.13",
-    "@xyo-network/chain-services": "~1.19.13",
-    "@xyo-network/chain-telemetry": "~1.19.13",
-    "@xyo-network/manifest-wrapper": "~5.3.2",
-    "@xyo-network/module-abstract": "~5.3.2",
-    "@xyo-network/module-abstract-mongodb": "~5.3.2",
-    "@xyo-network/module-model-mongodb": "~5.3.2",
-    "@xyo-network/node-memory": "~5.3.2",
-    "@xyo-network/payload-builder": "~5.3.2",
-    "@xyo-network/sentinel-memory": "~5.3.2",
-    "@xyo-network/wallet": "~5.3.2",
-    "@xyo-network/xl1-sdk": "~1.23.21",
+    "@xyo-network/boundwitness-builder": "~5.3.5",
+    "@xyo-network/chain-protocol": "~1.19.15",
+    "@xyo-network/chain-services": "~1.19.15",
+    "@xyo-network/chain-telemetry": "~1.19.15",
+    "@xyo-network/manifest-wrapper": "~5.3.5",
+    "@xyo-network/module-abstract": "~5.3.5",
+    "@xyo-network/module-abstract-mongodb": "~5.3.5",
+    "@xyo-network/module-model-mongodb": "~5.3.5",
+    "@xyo-network/node-memory": "~5.3.5",
+    "@xyo-network/payload-builder": "~5.3.5",
+    "@xyo-network/sdk-js": "~5.3.5",
+    "@xyo-network/sentinel-memory": "~5.3.5",
+    "@xyo-network/wallet": "~5.3.5",
+    "@xyo-network/xl1-sdk": "~1.24.15",
     "async-mutex": "~0.5.0",
     "axios": "~1.13.5",
-    "dotenv": "~17.2.4",
+    "dotenv": "~17.3.1",
     "eslint": "^9.39.2",
     "ethers": "^6.16.0",
     "http-status-codes": "~2.3.0",
@@ -139,6 +128,7 @@
     "zod": "~4.3.6"
   },
   "peerDependencies": {
+    "@xyo-network/sdk-js": "~5.3.2",
     "zod": "^4"
   },
   "engines": {

package/src/BridgeActor.ts

@@ -1,10 +1,10 @@
 import { Server } from 'node:http'
 
 import { creatable } from '@xylabs/sdk-js'
+import { asBridgeConfigContext, BridgeConfig } from '@xyo-network/chain-orchestration'
 import {
   ActorParamsV3,
   ActorV3,
-  Config,
   XyoGatewayRunner,
   XyoGatewayRunnerMoniker,
 } from '@xyo-network/xl1-sdk'
@@ -12,7 +12,7 @@ import {
 import { getServer } from './server/index.ts'
 
 export type BridgeActorParams = ActorParamsV3<{
-  config: Config
+  config: BridgeConfig
 }>
 
 @creatable()
@@ -41,7 +41,7 @@ export class BridgeActor extends ActorV3<BridgeActorParams> {
   }
 
   private async startServer() {
-    this.server = await getServer(this.context, this._gatewayRunner)
+    this.server = await getServer(asBridgeConfigContext(this.context, true), this._gatewayRunner)
   }
 
   private stopServer() {

package/src/config/getBridgeEscrowAddress.ts

@@ -1,13 +1,13 @@
 import type { Address } from '@xylabs/sdk-js'
 import { asAddress, assertEx } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
-export const tryGetBridgeEscrowAddress = (config: Config): Address | undefined => {
-  const address = asAddress(config.actors.bridge.escrowAddress)
+export const tryGetBridgeEscrowAddress = (config: BridgeConfig): Address | undefined => {
+  const address = asAddress(config.escrowAddress)
   return address
 }
 
-export const getBridgeEscrowAddress = (config: Config): Address => {
-  const address = assertEx(tryGetBridgeEscrowAddress(config), () => `Invalid bridge escrow address: ${config.actors.bridge.escrowAddress}`)
+export const getBridgeEscrowAddress = (config: BridgeConfig): Address => {
+  const address = assertEx(tryGetBridgeEscrowAddress(config), () => `Invalid bridge escrow address: ${config.escrowAddress}`)
   return address
 }

package/src/config/getBridgeFeesAddress.ts

@@ -1,13 +1,13 @@
 import type { Address } from '@xylabs/sdk-js'
 import { asAddress, assertEx } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
-export const tryGetBridgeFeesAddress = (config: Config): Address | undefined => {
-  const address = asAddress(config.actors.bridge.feesAddress)
+export const tryGetBridgeFeesAddress = (config: BridgeConfig): Address | undefined => {
+  const address = asAddress(config.feesAddress)
   return address
 }
 
-export const getBridgeFeesAddress = (config: Config): Address => {
-  const address = assertEx(tryGetBridgeFeesAddress(config), () => `Invalid bridge fees address: ${config.actors.bridge.feesAddress}`)
+export const getBridgeFeesAddress = (config: BridgeConfig): Address => {
+  const address = assertEx(tryGetBridgeFeesAddress(config), () => `Invalid bridge fees address: ${config.feesAddress}`)
   return address
 }

package/src/config/getBridgeSettings.ts

@@ -1,4 +1,4 @@
-import type { BridgeSettings, Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig, BridgeSettings } from '@xyo-network/chain-orchestration'
 
 import { getFeeStructure } from './getFeeStructure.ts'
 import { getMaxBridgeAmount } from './getMaxBridgeAmount.ts'
@@ -9,7 +9,7 @@ import { getTransferAddresses } from './getTransferAddresses.ts'
 import { getXl1ChainId } from './getXl1ChainId.ts'
 import { getXl1TokenAddress } from './getXl1TokenAddress.ts'
 
-export const getBridgeSettings = async (config: Config): Promise<BridgeSettings> => {
+export const getBridgeSettings = async (config: BridgeConfig): Promise<BridgeSettings> => {
   const { feeFixed, feeRateBasisPoints } = getFeeStructure(config)
   const { feesAddress, escrowAddress } = await getTransferAddresses(config)
   const maxBridgeAmount = getMaxBridgeAmount(config)

package/src/config/getBridgeWalletAccount.ts

@@ -2,14 +2,14 @@ import type { Address, Promisable } from '@xylabs/sdk-js'
 import { isDefined, isUndefined } from '@xylabs/sdk-js'
 import { HDWallet } from '@xyo-network/wallet'
 import type { WalletInstance } from '@xyo-network/wallet-model'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { ActorConfig } from '@xyo-network/xl1-sdk'
 import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from '@xyo-network/xl1-sdk'
 
 let accountServiceSingleton: Promisable<WalletInstance> | undefined
 
-export const getBridgeWalletAccount = async (config: Config): Promise<WalletInstance> => {
+export const getBridgeWalletAccount = async (config: ActorConfig): Promise<WalletInstance> => {
   if (accountServiceSingleton) return accountServiceSingleton
-  let walletPhrase = config.actors.bridge.mnemonic
+  let walletPhrase = config.mnemonic
   if (isUndefined(walletPhrase)) {
     console.log('[Bridge] No wallet mnemonic specified!')
     const randomMnemonic = HDWallet.generateMnemonic()
@@ -26,7 +26,10 @@ ${randomMnemonic}
   return accountServiceSingleton
 }
 
-export const getAddressOrBridgeWalletAccountAddress = async (getConfigAccount: (config: Config) => Address | undefined, config: Config): Promise<Address> => {
+export const getAddressOrBridgeWalletAccountAddress = async (
+  getConfigAccount: (config: ActorConfig) => Address | undefined,
+  config: ActorConfig,
+): Promise<Address> => {
   const address = getConfigAccount(config)
   if (isDefined(address)) return address
   const walletAccount = await getBridgeWalletAccount(config)

package/src/config/getFeeStructure.ts

@@ -1,8 +1,8 @@
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
 import type { FeeStructure } from '../util/index.ts'
 
-export const getFeeStructure = (config: Config): FeeStructure => {
-  const { feeFixed, feeRateBasisPoints } = config.actors.bridge
+export const getFeeStructure = (config: BridgeConfig): FeeStructure => {
+  const { feeFixed, feeRateBasisPoints } = config
   return { feeFixed, feeRateBasisPoints }
 }

package/src/config/getGateway.ts

@@ -1,7 +1,8 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 import { HDWallet } from '@xyo-network/wallet'
 import type {
-  Config, RpcSchemaMap, TransportFactory, XyoGatewayRunner,
+  RpcSchemaMap, TransportFactory, XyoGatewayRunner,
 } from '@xyo-network/xl1-sdk'
 import {
   ADDRESS_INDEX, buildJsonRpcProviderLocator, generateXyoBaseWalletFromPhrase, HttpRpcTransport, XyoGatewayRunnerMoniker,
@@ -9,10 +10,10 @@ import {
 
 let gatewayInstance: XyoGatewayRunner | undefined
 
-export const getGateway = async (config: Config): Promise<XyoGatewayRunner> => {
+export const getGateway = async (config: BridgeConfig): Promise<XyoGatewayRunner> => {
   if (isDefined(gatewayInstance)) return gatewayInstance
-  const { mnemonic } = config.actors.bridge
-  const endpoint = assertEx(config.actors.bridge.remote?.rpc?.url ?? config.remote?.rpc?.url, () => 'RPC URL is required for gateway')
+  const { mnemonic } = config
+  const endpoint = assertEx(config.remote?.rpc?.url ?? config.remote?.rpc?.url, () => 'RPC URL is required for gateway')
   const walletPhrase = isDefined(mnemonic) ? mnemonic : HDWallet.generateMnemonic()
   const wallet = await generateXyoBaseWalletFromPhrase(walletPhrase)
   const signerAccount = await wallet.derivePath(ADDRESS_INDEX.XYO)

package/src/config/getMaxBridgeAmount.ts

@@ -1,7 +1,7 @@
 import type { Hex } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
-export const getMaxBridgeAmount = (config: Config): Hex => {
-  const { maxBridgeAmount } = config.actors.bridge
+export const getMaxBridgeAmount = (config: BridgeConfig): Hex => {
+  const { maxBridgeAmount } = config
   return maxBridgeAmount
 }

package/src/config/getMinBridgeAmount.ts

@@ -1,7 +1,7 @@
 import type { Hex } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
-export const getMinBridgeAmount = (config: Config): Hex => {
-  const { minBridgeAmount } = config.actors.bridge
+export const getMinBridgeAmount = (config: BridgeConfig): Hex => {
+  const { minBridgeAmount } = config
   return minBridgeAmount
 }

package/src/config/getRemoteChainId.ts

@@ -1,9 +1,10 @@
 import { assertEx } from '@xylabs/sdk-js'
-import type { ChainId, Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import type { ChainId } from '@xyo-network/xl1-sdk'
 
 import { asChainId } from './asChainId.ts'
 
-export const getRemoteChainId = (config: Config): ChainId => {
-  const remoteChainId = assertEx(asChainId(config.actors.bridge.remoteChainId), () => 'Invalid remote chain ID in config')
+export const getRemoteChainId = (config: BridgeConfig): ChainId => {
+  const remoteChainId = assertEx(asChainId(config.remoteChainId), () => 'Invalid remote chain ID in config')
   return remoteChainId
 }

package/src/config/getRemoteTokenAddress.ts

@@ -1,10 +1,10 @@
 import type { Address } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
 import { asToken } from './asToken.ts'
 
-export const getRemoteTokenAddress = (config: Config): Address => {
-  const token = asToken(config.actors.bridge.remoteTokenAddress)
+export const getRemoteTokenAddress = (config: BridgeConfig): Address => {
+  const token = asToken(config.remoteTokenAddress)
   return assertEx(token, () => 'Remote token address is not defined in bridge configuration')
 }

package/src/config/getTransferAddresses.ts

@@ -1,5 +1,5 @@
 import type { Address } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
 import { tryGetBridgeEscrowAddress } from './getBridgeEscrowAddress.ts'
 import { tryGetBridgeFeesAddress } from './getBridgeFeesAddress.ts'
@@ -10,7 +10,7 @@ export interface TransferAddresses {
   feesAddress: Address
 }
 
-export const getTransferAddresses = async (config: Config): Promise<TransferAddresses> => {
+export const getTransferAddresses = async (config: BridgeConfig): Promise<TransferAddresses> => {
   const escrowAddress = tryGetBridgeEscrowAddress(config) ?? (await getBridgeWalletAccount(config)).address
   const feesAddress = tryGetBridgeFeesAddress(config) ?? (await getBridgeWalletAccount(config)).address
   return { escrowAddress, feesAddress }

package/src/config/getXl1ChainId.ts

@@ -1,10 +1,11 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import type { ChainId, Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import type { ChainId } from '@xyo-network/xl1-sdk'
 
 import { asChainId } from './asChainId.ts'
 
-export const getXl1ChainId = (config: Config): ChainId => {
-  const xl1ChainId = config.actors.bridge.xl1ChainId
+export const getXl1ChainId = (config: BridgeConfig): ChainId => {
+  const xl1ChainId = config.xl1ChainId
   if (isDefined(xl1ChainId)) {
     return assertEx(asChainId(xl1ChainId), () => 'Invalid xl1ChainId in bridge config')
   }

package/src/config/getXl1TokenAddress.ts

@@ -1,12 +1,12 @@
 import type { Hex } from '@xylabs/sdk-js'
 import { isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
 import { asToken } from './asToken.ts'
 import { getXl1ChainId } from './getXl1ChainId.ts'
 
-export const getXl1TokenAddress = (config: Config): Hex => {
-  const token = asToken(config.actors.bridge.xl1TokenAddress)
+export const getXl1TokenAddress = (config: BridgeConfig): Hex => {
+  const token = asToken(config.xl1TokenAddress)
   if (isDefined(token)) return token
   return getXl1ChainId(config)
 }

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

@@ -2,7 +2,7 @@ import type { Address, Hex } from '@xylabs/sdk-js'
 import {
   asAddress, asHex, assertEx, hexFromBigInt, hexToBigInt, isNull, isUndefined, toAddress,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { ILiquidityPoolBridge } from '@xyo-network/typechain'
 import { ILiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import type {

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

@@ -3,7 +3,7 @@ import {
   asHex, assertEx, hexFromBigInt, hexToBigInt, isNull,
   toAddress,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { LiquidityPoolBridge } from '@xyo-network/typechain'
 import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import { AbstractCreatableProvider } from '@xyo-network/xl1-sdk'

package/src/interface/util/getBridgeIntentIdentifier.ts

@@ -1,5 +1,5 @@
 import type { Hash } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   type BridgeDestinationObservation, type BridgeIntent, BridgeIntentSchema, type BridgeSourceObservation,
 } from '@xyo-network/xl1-sdk'

package/src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts

@@ -6,8 +6,8 @@ import {
   asAddress, asHex, assertEx, delay, hexFromBigInt, hexToBigInt, isDefined, isUndefined,
 } from '@xylabs/sdk-js'
 import type { AnyConfigSchema } from '@xyo-network/module-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { asSchema, type Payload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import { AbstractSentinel } from '@xyo-network/sentinel-abstract'
 import type {
   SentinelConfig, SentinelInstance, SentinelModuleEventData, SentinelParams,

package/src/modules/XL1TransactionCompletionMonitorSentinel/XL1TransactionCompletionMonitorSentinel.ts

@@ -4,8 +4,8 @@ import {
   assertEx, delay, isDefined, isNull, isUndefined,
 } from '@xylabs/sdk-js'
 import type { AnyConfigSchema } from '@xyo-network/module-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { asSchema, type Payload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import { AbstractSentinel } from '@xyo-network/sentinel-abstract'
 import type {
   SentinelConfig, SentinelInstance, SentinelModuleEventData, SentinelParams,

package/src/queue/connection.ts

@@ -1,14 +1,14 @@
 import { isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 import { Redis } from 'ioredis'
 
 let connection: Redis | undefined
 
 const maxRetriesPerRequest = null
 
-export const getConnection = (config: Config) => {
+export const getConnection = (config: BridgeConfig) => {
   if (isDefined(connection)) return connection
-  const { redisHost: host, redisPort: port } = config.actors.bridge
+  const { redisHost: host, redisPort: port } = config
   connection = new Redis({
     host, port, maxRetriesPerRequest,
   })

package/src/queue/workers/EthTransactionMonitor.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'

package/src/queue/workers/EthTransactionPreparation.ts

@@ -1,8 +1,6 @@
 import { assertEx, hexToBigInt } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import {
-  isBridgeIntent, isSignedTransactionBoundWitness, type SignedHydratedTransaction,
-} from '@xyo-network/xl1-sdk'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
+import { isBridgeIntent, type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import { getAddress } from 'ethers'

package/src/queue/workers/EthTransactionSubmission.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import { type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'

package/src/queue/workers/Xl1TransactionMonitor.ts

@@ -1,7 +1,7 @@
 import {
   assertEx, isDefined, isNull,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { UnrecoverableError, Worker } from 'bullmq'

package/src/queue/workers/Xl1TransactionPreparation.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'

package/src/queue/workers/Xl1TransactionSubmission.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import { type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'

package/src/queue/workers/util/submitEthTransaction.ts

@@ -1,7 +1,7 @@
 import {
   assertEx, hexToBigInt, toEthAddress,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { BridgeableToken, LiquidityPoolBridge } from '@xyo-network/typechain'
 import { isBridgeIntent, type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Wallet } from 'ethers'

package/src/server/addFlowProducer.ts

@@ -1,9 +1,9 @@
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 import type { Express } from 'express'
 
 import { getConnection, getFlowProducer } from '../queue/index.ts'
 
-export const addFlowProducer = (app: Express, config: Config): Express => {
+export const addFlowProducer = (app: Express, config: BridgeConfig): Express => {
   const connection = getConnection(config)
   const flowProducer = getFlowProducer(connection)
   app.flowProducer = flowProducer

package/src/server/addWorkers.ts

@@ -1,9 +1,9 @@
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
 
 import { createWorkers, getConnection } from '../queue/index.ts'
 import type { IBridgeServiceCollection } from '../services/index.ts'
 
-export const addWorkers = (config: Config, services: IBridgeServiceCollection) => {
+export const addWorkers = (config: BridgeConfig, services: IBridgeServiceCollection) => {
   const connection = getConnection(config)
   createWorkers(connection, services)
 }

package/src/server/app.ts

@@ -2,8 +2,8 @@ import {
   customPoweredByHeader, disableCaseSensitiveRouting, disableExpressDefaultPoweredByHeader, getJsonBodyParser, getJsonBodyParserOptions, responseProfiler,
   standardErrors, standardResponses,
 } from '@xylabs/express'
-import type { NodeInstance } from '@xyo-network/node-model'
-import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import type { XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 import compression from 'compression'
 import cors from 'cors'
 import type { Express } from 'express'
@@ -13,7 +13,7 @@ import { addFlowProducer } from './addFlowProducer.ts'
 import { addInstrumentation } from './instrumentation.ts'
 import { addRoutes } from './routes/index.ts'
 
-export const getApp = (node: NodeInstance, config: Config, gateway: XyoGatewayRunner): Express => {
+export const getApp = (config: BridgeConfig, gateway: XyoGatewayRunner): Express => {
   addInstrumentation()
   const app = express()
   app.set('etag', false)
@@ -25,7 +25,6 @@ export const getApp = (node: NodeInstance, config: Config, gateway: XyoGatewayRu
   disableExpressDefaultPoweredByHeader(app)
   app.use(customPoweredByHeader)
   disableCaseSensitiveRouting(app)
-  app.node = node
   addFlowProducer(app, config)
   addRoutes(app, config, gateway)
   app.use(standardErrors)

package/src/server/index.ts

@@ -1,7 +1,7 @@
 export * from './app.ts'
 export * from './server.ts'
 
-import type { NodeInstance } from '@xyo-network/node-model'
+// import type { NodeInstance } from '@xyo-network/node-model'
 import type { FlowProducer } from 'bullmq'
 
 // import type { IBridgeServiceCollection } from '../services/index.ts'
@@ -11,7 +11,7 @@ declare global {
   namespace Express {
     interface Application {
       flowProducer: FlowProducer
-      node: NodeInstance
+      // node: NodeInstance
       // services: IBridgeServiceCollection
     }
   }

package/src/server/routes/addRoutes.ts

@@ -1,8 +1,9 @@
-import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import type { XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 import type { Express } from 'express'
 
 import { addBridgeRoutes } from './bridge/index.ts'
 
-export const addRoutes = (app: Express, config: Config, gateway: XyoGatewayRunner) => {
+export const addRoutes = (app: Express, config: BridgeConfig, gateway: XyoGatewayRunner) => {
   addBridgeRoutes(app, config, gateway)
 }

package/src/server/routes/bridge/addBridgeRoutes.ts

@@ -1,9 +1,10 @@
-import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import type { XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 import type { Express } from 'express'
 
 import { getRouteDefinitions } from './routeDefinitions/index.ts'
 
-export const addBridgeRoutes = (app: Express, config: Config, gateway: XyoGatewayRunner) => {
+export const addBridgeRoutes = (app: Express, config: BridgeConfig, gateway: XyoGatewayRunner) => {
   const routeDefinitions = getRouteDefinitions(config, gateway)
   for (const definition of routeDefinitions) {
     app[definition.method](definition.path, definition.handlers)