@xyo-network/chain-bridge 1.19.6 → 1.19.7

package/dist/node/services/IBridgeServiceCollection.d.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/sdk-js';
 import type { AccountInstance } from '@xyo-network/account-model';
-import type { LiquidityPoolBridge } from '@xyo-network/typechain';
+import type { BridgeableToken, LiquidityPoolBridge } from '@xyo-network/typechain';
 import type { IterableMap, XyoGatewayRunner } from '@xyo-network/xl1-sdk';
 import type { Provider, Wallet } from 'ethers';
 import type { EthTxState } from './EthTxState.ts';
@@ -8,6 +8,7 @@ import type { Xl1TxState } from './Xl1TxState.ts';
 export interface IBridgeServiceCollection {
     account: AccountInstance;
     bridge: LiquidityPoolBridge;
+    bridgeableToken: BridgeableToken;
     ethTxStateMap: IterableMap<Hash, EthTxState>;
     gateway: XyoGatewayRunner;
     provider: Provider;

package/dist/node/services/IBridgeServiceCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IBridgeServiceCollection.d.ts","sourceRoot":"","sources":["../../../src/services/IBridgeServiceCollection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,aAAa,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC5C,OAAO,EAAE,gBAAgB,CAAA;IACzB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;CAC7C"}
+{"version":3,"file":"IBridgeServiceCollection.d.ts","sourceRoot":"","sources":["../../../src/services/IBridgeServiceCollection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC5C,OAAO,EAAE,gBAAgB,CAAA;IACzB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;CAC7C"}

package/dist/node/util/getConfigFromEnv.d.ts

@@ -0,0 +1,6 @@
+import { type Config } from '@xyo-network/xl1-sdk';
+import type { Configuration } from 'yargs-parser';
+export declare const ConfigParserEnvPrefix = "XL1_";
+export declare const ConfigParserConfiguration: Partial<Configuration>;
+export declare const getConfigFromEnv: () => Config;
+//# sourceMappingURL=getConfigFromEnv.d.ts.map

package/dist/node/util/getConfigFromEnv.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getConfigFromEnv.d.ts","sourceRoot":"","sources":["../../../src/util/getConfigFromEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,eAAO,MAAM,qBAAqB,SAAS,CAAA;AAC3C,eAAO,MAAM,yBAAyB,EAAE,OAAO,CAAC,aAAa,CAI5D,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAO,MAGnC,CAAA"}

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

@@ -1,5 +1,6 @@
 export * from './calculateBridgeFees.ts';
 export * from './generateBridgeEstimate.ts';
+export * from './getConfigFromEnv.ts';
 export * from './validateBridgeEstimate.ts';
 export * from './validateBridgeEstimateExact.ts';
 export * from './validateBridgeTransaction.ts';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-bridge",
-  "version": "1.19.6",
+  "version": "1.19.7",
   "description": "XYO Layer One Bridge",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -60,9 +60,10 @@
     "@xyo-network/archivist-view": "~5.3.2",
     "@xyo-network/bios": "~7.2.1",
     "@xyo-network/boundwitness-validator": "~5.3.2",
-    "@xyo-network/chain-protocol": "~1.19.6",
-    "@xyo-network/chain-services": "~1.19.6",
-    "@xyo-network/chain-telemetry": "~1.19.6",
+    "@xyo-network/chain-orchestration": "~1.19.7",
+    "@xyo-network/chain-protocol": "~1.19.7",
+    "@xyo-network/chain-services": "~1.19.7",
+    "@xyo-network/chain-telemetry": "~1.19.7",
     "@xyo-network/manifest-model": "~5.3.2",
     "@xyo-network/manifest-wrapper": "~5.3.2",
     "@xyo-network/module-abstract": "~5.3.2",
@@ -77,15 +78,16 @@
     "@xyo-network/typechain": "~4.1.1",
     "@xyo-network/wallet": "~5.3.2",
     "@xyo-network/wallet-model": "~5.3.2",
-    "@xyo-network/xl1-sdk": "~1.21.10",
+    "@xyo-network/xl1-sdk": "~1.22.30",
     "async-mutex": "~0.5.0",
-    "bullmq": "~5.67.2",
+    "bullmq": "~5.67.3",
     "compression": "~1.8.1",
     "cors": "~2.8.6",
     "ethers": "^6.16.0",
     "express": "~5.2.1",
     "ioredis": "~5.9.2",
-    "uuid": "~13.0.0"
+    "uuid": "~13.0.0",
+    "yargs-parser": "~22.0.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -93,7 +95,8 @@
     "@types/cors": "~2.8.19",
     "@types/express": "5.0.6",
     "@types/express-serve-static-core": "~5.1.1",
-    "@types/node": "~25.1.0",
+    "@types/node": "~25.2.1",
+    "@xylabs/axios": "~5.0.65",
     "@xylabs/mongo": "~5.0.65",
     "@xylabs/sdk-js": "~5.0.65",
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
@@ -109,9 +112,9 @@
     "@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.6",
-    "@xyo-network/chain-services": "~1.19.6",
-    "@xyo-network/chain-telemetry": "~1.19.6",
+    "@xyo-network/chain-protocol": "~1.19.7",
+    "@xyo-network/chain-services": "~1.19.7",
+    "@xyo-network/chain-telemetry": "~1.19.7",
     "@xyo-network/manifest-wrapper": "~5.3.2",
     "@xyo-network/module-abstract": "~5.3.2",
     "@xyo-network/module-abstract-mongodb": "~5.3.2",
@@ -120,9 +123,10 @@
     "@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.21.10",
+    "@xyo-network/xl1-sdk": "~1.22.30",
     "async-mutex": "~0.5.0",
-    "dotenv": "~17.2.3",
+    "axios": "~1.13.4",
+    "dotenv": "~17.2.4",
     "eslint": "^9.39.2",
     "ethers": "^6.16.0",
     "http-status-codes": "~2.3.0",

package/src/config/getGateway.ts

@@ -1,14 +1,10 @@
 import { isDefined } from '@xylabs/sdk-js'
 import { HDWallet } from '@xyo-network/wallet'
 import type {
-  Config, RpcSchemaMap, TransportFactory,
-  XyoGatewayRunner,
+  Config, RpcSchemaMap, TransportFactory, XyoGatewayRunner,
 } from '@xyo-network/xl1-sdk'
 import {
-  buildJsonRpcProviderLocator,
-  HttpRpcTransport,
-  SimpleXyoGatewayRunner, SimpleXyoSigner,
-  XyoGatewayRunnerMoniker,
+  ADDRESS_INDEX, buildJsonRpcProviderLocator, generateXyoBaseWalletFromPhrase, HttpRpcTransport, XyoGatewayRunnerMoniker,
 } from '@xyo-network/xl1-sdk'
 
 let gatewayInstance: XyoGatewayRunner | undefined
@@ -16,11 +12,10 @@ let gatewayInstance: XyoGatewayRunner | undefined
 export const getGateway = async (config: Config): Promise<XyoGatewayRunner> => {
   if (isDefined(gatewayInstance)) return gatewayInstance
   const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
-  const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
-  const account = await walletPromise
+  const walletPhrase = isDefined(mnemonic) ? mnemonic : HDWallet.generateMnemonic()
+  const wallet = await generateXyoBaseWalletFromPhrase(walletPhrase)
+  const signerAccount = await wallet.derivePath(ADDRESS_INDEX.XYO)
   const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
-  const locator = await buildJsonRpcProviderLocator({ transportFactory })
-  locator.register(SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account }))
-  locator.register(SimpleXyoGatewayRunner.factory<SimpleXyoGatewayRunner>(SimpleXyoGatewayRunner.dependencies))
+  const locator = await buildJsonRpcProviderLocator({ transportFactory, signerAccount })
   return await locator.getInstance<XyoGatewayRunner>(XyoGatewayRunnerMoniker)
 }

package/src/manifest/getIterableMap.ts

@@ -0,0 +1,34 @@
+import { BaseMongoSdk, type BaseMongoSdkPrivateConfig } from '@xylabs/mongo'
+import { MongoMap } from '@xyo-network/chain-protocol'
+import type { Config, IterableMap } from '@xyo-network/xl1-sdk'
+import { hasMongoConfig, mapToMapType } from '@xyo-network/xl1-sdk'
+import type { Document } from 'mongodb'
+
+/**
+ * Gets an iterable map based on the storage instructions in the config
+ * @param config The config containing storage instructions
+ * @param collection The collection to use if using MongoDB for persistence
+ * @returns The iterable map
+ */
+export const getIterableMap = async <K extends {} = string, V extends Document = Document>(
+  config: Config,
+  collection: string,
+): Promise<IterableMap<K, V>> => {
+  const mongoConfig = config.storage?.mongo
+  if (hasMongoConfig(mongoConfig)) {
+    const {
+      connectionString: dbConnectionString, database: dbName, domain: dbDomain, password: dbPassword, username: dbUserName,
+    } = mongoConfig
+    const payloadSdkConfig: BaseMongoSdkPrivateConfig = {
+      dbConnectionString, dbDomain, dbName, dbPassword, dbUserName,
+    }
+    const sdkBalanceSummaryMap = new BaseMongoSdk<V>({ ...payloadSdkConfig, collection })
+    const result = await MongoMap.create<MongoMap<K, V>>({
+      sdk: sdkBalanceSummaryMap,
+      getCache: { enabled: true, maxEntries: 5000 },
+    })
+    return result
+  } else {
+    return mapToMapType(new Map<K, V>())
+  }
+}

package/src/manifest/getModuleLocator.ts

@@ -4,20 +4,18 @@ import { assertEx, isDefined } from '@xylabs/sdk-js'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { MongoDBArchivistV2 } from '@xyo-network/archivist-mongodb'
 import { ViewArchivist } from '@xyo-network/archivist-view'
+import { initEvmProvider } from '@xyo-network/chain-orchestration'
 import { MongoMap } from '@xyo-network/chain-protocol'
-import { initEvmProvider } from '@xyo-network/chain-services'
 import { initTelemetry } from '@xyo-network/chain-telemetry'
 import { AbstractModule, LoggerModuleStatusReporter } from '@xyo-network/module-abstract'
 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 type {
-  BridgeDestinationObservation, Config, IterableMap, ProviderFactoryLocator, SignedHydratedTransaction,
-  XyoGatewayRunner,
+  BridgeDestinationObservation, Config, IterableMap, ProviderFactoryLocator, SignedHydratedTransaction, XyoGatewayRunner,
 } from '@xyo-network/xl1-sdk'
 import {
-  hasMongoConfig, mapToMapType,
-  XyoGatewayRunnerMoniker,
+  hasMongoConfig, mapToMapType, XyoGatewayRunnerMoniker,
 } from '@xyo-network/xl1-sdk'
 import type { Document } from 'mongodb'
 

package/src/manifest/getNode.ts

@@ -6,10 +6,9 @@ import type {
 } from '@xyo-network/xl1-sdk'
 import { buildJsonRpcProviderLocator, HttpRpcTransport } from '@xyo-network/xl1-sdk'
 
+import { getBridgeWalletAccount } from '../config/index.ts'
 import { getModuleLocator } from './getModuleLocator.ts'
 import { NodeManifest } from './nodeManifest.ts'
-import { PrivateChildManifests } from './private/index.ts'
-import { PublicChildManifests } from './public/index.ts'
 
 export interface GetNodeContext {
   config: Config
@@ -23,12 +22,15 @@ export interface GetNodeContext {
  * @returns A node with the xyo-chain modules registered
  */
 export const getNode = async (context: GetNodeContext) => {
-  const { wallet } = context
-  const { chainRpcApiUrl: endpoint } = context.config.bridge
+  const { config, wallet } = context
+  const { chainRpcApiUrl: endpoint } = config.bridge
   const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
-  const locator = await buildJsonRpcProviderLocator({ transportFactory })
+  const signerAccount = await getBridgeWalletAccount(config)
+  const locator = await buildJsonRpcProviderLocator({ signerAccount, transportFactory })
+
   const moduleLocator = await getModuleLocator({ ...context, locator })
-  const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, PublicChildManifests, PrivateChildManifests)
+  // const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, PublicChildManifests, PrivateChildManifests)
+  const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, [], [])
   const [node, ...childNodes] = await wrapper.loadNodes()
   if (childNodes?.length > 0) {
     await Promise.all(childNodes.map(childNode => node.register(childNode)))

package/src/manifest/getServices.ts

@@ -1,22 +1,16 @@
-import { BaseMongoSdk, type BaseMongoSdkPrivateConfig } from '@xylabs/mongo'
 import type { Hash, Logger } from '@xylabs/sdk-js'
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import { MongoMap } from '@xyo-network/chain-protocol'
-import { initEvmProvider } from '@xyo-network/chain-services'
-import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
+import { initEvmProvider } from '@xyo-network/chain-orchestration'
+import { BridgeableToken__factory, LiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import { HDWallet } from '@xyo-network/wallet'
-import type { Config, IterableMap } from '@xyo-network/xl1-sdk'
-import {
-  hasMongoConfig,
-  mapToMapType,
-} from '@xyo-network/xl1-sdk'
+import type { Config } 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'
+import { getIterableMap } from './getIterableMap.ts'
 
 export interface GetServicesContext {
   config: Config
@@ -34,50 +28,20 @@ export const getServices = async (context: GetServicesContext): Promise<IBridgeS
   const ethTxStateMap = await getIterableMap<Hash, EthTxState>(config, 'liquidity_bridge_xl1_to_eth_eth_tx_state')
   const xl1TxStateMap = await getIterableMap<Hash, Xl1TxState>(config, 'liquidity_bridge_xl1_to_eth_xl1_tx_state')
   const provider = await initEvmProvider({ config })
-  // TODO: Get from config
   const {
-    remoteBridgeContractAddress, remoteChainWalletPrivateKey, mnemonic,
+    remoteBridgeContractAddress, remoteChainWalletPrivateKey, remoteTokenAddress, mnemonic,
   } = config.bridge
   const account = isDefined(mnemonic) ? await HDWallet.fromPhrase(mnemonic) : await HDWallet.random()
   const wallet = new Wallet(remoteChainWalletPrivateKey, provider)
+  const bridgeableToken = BridgeableToken__factory.connect(getAddress(remoteTokenAddress), wallet)
   const bridge = LiquidityPoolBridge__factory.connect(getAddress(remoteBridgeContractAddress), wallet)
+  // const approvalAmount = 18n * 10n ** 9n * 10n ** 18n // 18 billion tokens with 18 decimals
+  // const contractApprovalTx = await bridgeableToken.connect(wallet).approve(bridge.getAddress(), approvalAmount)
+  // await contractApprovalTx.wait(1)
   // Assert we are contract owner so we can call ownable methods
   const bridgeOwner = await bridge.owner()
   assertEx(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => 'Wallet is not the owner of the bridge contract')
   return {
-    account,
-    bridge,
-    ethTxStateMap,
-    gateway,
-    provider,
-    wallet,
-    xl1TxStateMap,
-  }
-}
-
-/**
- * Gets an iterable map based on the storage instructions in the config
- * @param config The config containing storage instructions
- * @param collection The collection to use if using MongoDB for persistence
- * @returns The iterable map
- */
-const getIterableMap = async <K extends {} = string, V extends Document = Document>
-(config: Config, collection: string): Promise<IterableMap<K, V>> => {
-  const mongoConfig = config.storage?.mongo
-  if (hasMongoConfig(mongoConfig)) {
-    const {
-      connectionString: dbConnectionString, database: dbName, domain: dbDomain, password: dbPassword, username: dbUserName,
-    } = mongoConfig
-    const payloadSdkConfig: BaseMongoSdkPrivateConfig = {
-      dbConnectionString, dbDomain, dbName, dbPassword, dbUserName,
-    }
-    const sdkBalanceSummaryMap = new BaseMongoSdk<V>({ ...payloadSdkConfig, collection })
-    const result = await MongoMap.create<MongoMap<K, V>>({
-      sdk: sdkBalanceSummaryMap,
-      getCache: { enabled: true, maxEntries: 5000 },
-    })
-    return result
-  } else {
-    return mapToMapType(new Map<K, V>())
+    account, bridge, bridgeableToken, ethTxStateMap, gateway, provider, wallet, xl1TxStateMap,
   }
 }

package/src/queue/flows/createXl1ToEthBridgeJob.ts

@@ -2,47 +2,62 @@ import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { FlowProducer } from 'bullmq'
 
 import {
-  ethTransactionMonitor, ethTransactionPreparation, ethTransactionSubmission, xl1ToEthBridgeParent, xl1TransactionMonitor, xl1TransactionPreparation,
-  xl1TransactionSubmission,
+  EthTransactionMonitor, EthTransactionPreparation, EthTransactionSubmission, Xl1ToEthBridgeParent, Xl1TransactionMonitor, Xl1TransactionPreparation,
+  Xl1TransactionSubmission,
 } from '../workers/index.ts'
 
-export const createXl1ToEthBridgeJob = async (flowProducer: FlowProducer, tx: SignedHydratedTransaction) => {
+/**
+ * Creates a job flow for bridging a transaction from XL1 to Ethereum.
+ * @param flowProducer The flow producer to run the job
+ * @param tx The bridge transaction
+ * @returns The JobNode representing the XL1 to ETH bridge job
+ */
+export const createXl1ToEthBridgeJob = async (
+  flowProducer: FlowProducer,
+  tx: SignedHydratedTransaction,
+) => {
   const flow = await flowProducer.add({
-    name: xl1ToEthBridgeParent.name,
-    queueName: xl1ToEthBridgeParent.queueName,
+    name: Xl1ToEthBridgeParent.name,
+    queueName: Xl1ToEthBridgeParent.queueName,
     data: { tx },
     children: [
       {
-        name: xl1TransactionPreparation.name,
-        queueName: xl1TransactionPreparation.queueName,
+        // Step 6 (runs after child completes)
+        name: EthTransactionMonitor.name,
+        queueName: EthTransactionMonitor.queueName,
         data: { tx },
+        opts: { attempts: 60, backoff: { type: 'fixed', delay: 5000 } },
         children: [
           {
-            name: xl1TransactionSubmission.name,
-            queueName: xl1TransactionSubmission.queueName,
+            // Step 5
+            name: EthTransactionSubmission.name,
+            queueName: EthTransactionSubmission.queueName,
             data: { tx },
             children: [
               {
-                name: xl1TransactionMonitor.name,
-                queueName: xl1TransactionMonitor.queueName,
+                // Step 4
+                name: EthTransactionPreparation.name,
+                queueName: EthTransactionPreparation.queueName,
                 data: { tx },
-                opts: { attempts: 60, backoff: { type: 'fixed', delay: 5000 } },
                 children: [
                   {
-                    name: ethTransactionPreparation.name,
-                    queueName: ethTransactionPreparation.queueName,
+                    // Step 3
+                    name: Xl1TransactionMonitor.name,
+                    queueName: Xl1TransactionMonitor.queueName,
                     data: { tx },
+                    opts: { attempts: 60, backoff: { type: 'fixed', delay: 5000 } },
                     children: [
                       {
-                        name: ethTransactionSubmission.name,
-                        queueName: ethTransactionSubmission.queueName,
+                        // Step 2
+                        name: Xl1TransactionSubmission.name,
+                        queueName: Xl1TransactionSubmission.queueName,
                         data: { tx },
                         children: [
                           {
-                            name: ethTransactionMonitor.name,
-                            queueName: ethTransactionMonitor.queueName,
+                            // Step 1 (runs first as deepest child)
+                            name: Xl1TransactionPreparation.name,
+                            queueName: Xl1TransactionPreparation.queueName,
                             data: { tx },
-                            opts: { attempts: 60, backoff: { type: 'fixed', delay: 5000 } },
                           },
                         ],
                       },

package/src/queue/workers/{ethTransactionMonitor.ts → EthTransactionMonitor.ts}

@@ -8,7 +8,7 @@ import type { Redis } from 'ioredis'
 import type { IBridgeServiceCollection } from '../../services/index.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
-type JobData = Pick<IBridgeServiceCollection, 'bridge' | 'ethTxStateMap' | 'provider' | 'wallet'> & { tx: SignedHydratedTransaction }
+type JobData = { tx: SignedHydratedTransaction }
 interface ReturnType {
   blockHash: string
   blockNumber: number
@@ -16,13 +16,14 @@ interface ReturnType {
 
 const name = 'Monitor Submitted ETH Transaction'
 const queueName = 'eth-tx-monitor'
-const createWorker = (connection: Redis) => {
-  new Worker(
+const createWorker = (connection: Redis, services?: IBridgeServiceCollection) => {
+  const provider = assertEx(services?.provider, () => 'provider service not provided')
+  const stateMap = assertEx(services?.ethTxStateMap, () => 'ethTxStateMap service not provided')
+
+  const worker = new Worker(
     queueName,
     async (job: Job<JobData, ReturnType>) => {
-      const {
-        provider, ethTxStateMap: stateMap, tx,
-      } = job.data
+      const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       const state = assertEx(await stateMap.get(hash), () => 'State not found')
       const submissionHash = assertEx(state?.submissionHash, () => 'submissionHash not found')
@@ -35,8 +36,16 @@ const createWorker = (connection: Redis) => {
     },
     { connection },
   )
+
+  worker.on('failed', (job, err) => {
+    console.error(`[${name}] Job ${job?.id} failed:`, err.message)
+  })
+
+  worker.on('error', (err) => {
+    console.error(`[${name}] Worker error:`, err)
+  })
 }
 
-export const ethTransactionMonitor: WorkerDescription = {
+export const EthTransactionMonitor: WorkerDescription = {
   createWorker, name, queueName,
 }

package/src/queue/workers/{ethTransactionPreparation.ts → EthTransactionPreparation.ts}

@@ -1,6 +1,8 @@
 import { assertEx, hexToBigInt } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { isBridgeIntent, type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
+import {
+  isBridgeIntent, isSignedTransactionBoundWitness, type SignedHydratedTransaction,
+} from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import { getAddress } from 'ethers'
@@ -9,20 +11,21 @@ import type { Redis } from 'ioredis'
 import type { IBridgeServiceCollection } from '../../services/index.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
-type JobData = Pick<IBridgeServiceCollection, 'bridge' | 'ethTxStateMap'> & { tx: SignedHydratedTransaction }
+type JobData = { tx: SignedHydratedTransaction }
 
 interface ReturnType {}
 
 const name = 'Prepare ETH Transaction'
 const queueName = 'eth-tx-prepare'
 
-export const createWorker = (connection: Redis) => {
-  new Worker(
+export const createWorker = (connection: Redis, services?: IBridgeServiceCollection) => {
+  const bridge = assertEx(services?.bridge, () => 'bridge service not provided')
+  const stateMap = assertEx(services?.ethTxStateMap, () => 'ethTxStateMap service not provided')
+
+  const worker = new Worker(
     queueName,
     async (job: Job<JobData, ReturnType>) => {
-      const {
-        bridge, ethTxStateMap: stateMap, tx,
-      } = job.data
+      const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       await job.log(`[${hash}] preparing ETH transaction`)
       await job.log(`[${hash}] building ETH transaction`)
@@ -30,7 +33,8 @@ 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, 0n)
+      const nonce = hexToBigInt(await PayloadBuilder.hash(tx[0]))
+      const preparedTx = await bridge.getFunction('bridgeFromRemote').populateTransaction(srcAddress, destAddress, amount, nonce)
       await job.log(`[${hash}] built ETH transaction`)
       await job.log(`[${hash}] storing ETH preparedTx`)
       await stateMap.set(hash, { preparedTx })
@@ -40,8 +44,16 @@ export const createWorker = (connection: Redis) => {
     },
     { connection },
   )
+
+  worker.on('failed', (job, err) => {
+    console.error(`[${name}] Job ${job?.id} failed:`, err.message)
+  })
+
+  worker.on('error', (err) => {
+    console.error(`[${name}] Worker error:`, err)
+  })
 }
 
-export const ethTransactionPreparation: WorkerDescription = {
+export const EthTransactionPreparation: WorkerDescription = {
   createWorker, name, queueName,
 }

package/src/queue/workers/{ethTransactionSubmission.ts → EthTransactionSubmission.ts}

@@ -6,9 +6,10 @@ import { Worker } from 'bullmq'
 import type { Redis } from 'ioredis'
 
 import type { EthTxState, IBridgeServiceCollection } from '../../services/index.ts'
+import { submitEthTransaction } from './util/index.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
-type JobData = Pick<IBridgeServiceCollection, 'bridge' | 'ethTxStateMap' | 'wallet'> & { tx: SignedHydratedTransaction }
+type JobData = { tx: SignedHydratedTransaction }
 
 interface ReturnType {
   submissionHash: Required<EthTxState>['submissionHash']
@@ -16,13 +17,16 @@ interface ReturnType {
 
 const name = 'Submit ETH Transaction'
 const queueName = 'eth-tx-submit'
-const createWorker = (connection: Redis) => {
-  new Worker(
+const createWorker = (connection: Redis, services?: IBridgeServiceCollection) => {
+  const bridge = assertEx(services?.bridge, () => 'bridge service not provided')
+  const bridgeableToken = assertEx(services?.bridgeableToken, () => 'bridgeableToken service not provided')
+  const wallet = assertEx(services?.wallet, () => 'wallet service not provided')
+  const stateMap = assertEx(services?.ethTxStateMap, () => 'ethTxStateMap service not provided')
+
+  const worker = new Worker(
     queueName,
     async (job: Job<JobData, ReturnType>) => {
-      const {
-        ethTxStateMap: stateMap, tx, wallet,
-      } = job.data
+      const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       const state = assertEx(await stateMap.get(hash), () => `[${hash}] state not found`)
       const preparedTx = assertEx(state?.preparedTx, () => `[${hash}] preparedTx not found`)
@@ -36,8 +40,11 @@ const createWorker = (connection: Redis) => {
 
       // Submit the transaction to the Ethereum network
       await job.log(`[${hash}] Submitting ETH tx`)
-      const submissionResponse = await wallet.sendTransaction(preparedTx)
-      const submissionHash = submissionResponse.hash
+      // const submissionResponse = await wallet.sendTransaction(preparedTx)
+      // const submissionHash = submissionResponse.hash
+
+      const submissionHash = assertEx(await submitEthTransaction(tx, bridgeableToken, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`)
+
       await job.log(`[${hash}] Submitted ETH tx and received submission response hash ${submissionHash}`)
 
       // Store the submission hash in the state
@@ -70,8 +77,16 @@ const createWorker = (connection: Redis) => {
     },
     { connection, concurrency: 1 },
   )
+
+  worker.on('failed', (job, err) => {
+    console.error(`[${name}] Job ${job?.id} failed:`, err.message)
+  })
+
+  worker.on('error', (err) => {
+    console.error(`[${name}] Worker error:`, err)
+  })
 }
 
-export const ethTransactionSubmission: WorkerDescription = {
+export const EthTransactionSubmission: WorkerDescription = {
   createWorker, name, queueName,
 }

package/src/queue/workers/WorkerDescription.ts

@@ -1,7 +1,9 @@
 import type { Redis } from 'ioredis'
 
+import type { IBridgeServiceCollection } from '../../services/index.ts'
+
 export interface WorkerDescription {
-  createWorker: (connection: Redis) => void
+  createWorker: (connection: Redis, services?: IBridgeServiceCollection) => void
   name: string
   queueName: string
 }

package/src/queue/workers/{xl1ToEthBridgeParent.ts → Xl1ToEthBridgeParent.ts}

@@ -7,7 +7,7 @@ import type { WorkerDescription } from './WorkerDescription.ts'
 const name = 'Bridge XL1 to Ethereum'
 const queueName = 'xl1-to-eth-bridge'
 const createWorker = (connection: Redis) => {
-  new Worker(
+  const worker = new Worker(
     queueName,
     async (job: Job) => {
       await job.log(`[${job.name}] start`)
@@ -18,8 +18,16 @@ const createWorker = (connection: Redis) => {
     },
     { connection },
   )
+
+  worker.on('failed', (job, err) => {
+    console.error(`[${name}] Job ${job?.id} failed:`, err.message)
+  })
+
+  worker.on('error', (err) => {
+    console.error(`[${name}] Worker error:`, err)
+  })
 }
 
-export const xl1ToEthBridgeParent: WorkerDescription = {
+export const Xl1ToEthBridgeParent: WorkerDescription = {
   createWorker, name, queueName,
 }