@xyo-network/chain-bridge 1.19.18 → 1.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-bridge",
-  "version": "1.19.18",
+  "version": "1.20.1",
   "description": "XYO Layer One Bridge",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -49,22 +49,22 @@
     "types": "tsc --noEmit -p tsconfig.test.json"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "~0.212.0",
-    "@opentelemetry/instrumentation-express": "~0.60.0",
-    "@opentelemetry/instrumentation-http": "~0.212.0",
+    "@opentelemetry/instrumentation": "~0.213.0",
+    "@opentelemetry/instrumentation-express": "~0.61.0",
+    "@opentelemetry/instrumentation-http": "~0.213.0",
     "@xylabs/express": "~5.0.80",
     "@xylabs/mongo": "~5.0.80",
     "@xylabs/sdk-js": "~5.0.80",
-    "@xyo-network/boundwitness-validator": "~5.3.10",
-    "@xyo-network/chain-orchestration": "~1.19.18",
-    "@xyo-network/chain-protocol": "~1.19.18",
-    "@xyo-network/chain-services": "~1.19.18",
-    "@xyo-network/sdk-js": "~5.3.10",
-    "@xyo-network/sentinel-abstract": "~5.3.10",
-    "@xyo-network/sentinel-model": "~5.3.10",
-    "@xyo-network/typechain": "~4.1.1",
-    "@xyo-network/wallet-model": "~5.3.10",
-    "@xyo-network/xl1-sdk": "~1.24.29",
+    "@xyo-network/boundwitness-validator": "~5.3.15",
+    "@xyo-network/chain-orchestration": "~1.20.1",
+    "@xyo-network/chain-protocol": "~1.20.1",
+    "@xyo-network/chain-services": "~1.20.1",
+    "@xyo-network/sdk-js": "~5.3.15",
+    "@xyo-network/sentinel-abstract": "~5.3.15",
+    "@xyo-network/sentinel-model": "~5.3.15",
+    "@xyo-network/typechain": "~4.1.2",
+    "@xyo-network/wallet-model": "~5.3.15",
+    "@xyo-network/xl1-sdk": "~1.25.18",
     "async-mutex": "~0.5.0",
     "bullmq": "~5.70.1",
     "bullmq-otel": "~1.3.0",
@@ -82,31 +82,31 @@
     "@types/cors": "~2.8.19",
     "@types/express": "5.0.6",
     "@types/express-serve-static-core": "~5.1.1",
-    "@types/node": "~25.3.0",
+    "@types/node": "~25.3.3",
     "@xylabs/mongo": "~5.0.80",
     "@xylabs/sdk-js": "~5.0.80",
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
     "@xylabs/tsconfig": "~7.3.2",
     "@xylabs/vitest-extended": "~5.0.80",
-    "@xyo-network/account": "~5.3.10",
-    "@xyo-network/account-model": "~5.3.10",
-    "@xyo-network/archivist-abstract": "~5.3.10",
-    "@xyo-network/archivist-mongodb": "~5.3.10",
-    "@xyo-network/archivist-view": "~5.3.10",
+    "@xyo-network/account": "~5.3.15",
+    "@xyo-network/account-model": "~5.3.15",
+    "@xyo-network/archivist-abstract": "~5.3.15",
+    "@xyo-network/archivist-mongodb": "~5.3.15",
+    "@xyo-network/archivist-view": "~5.3.15",
     "@xyo-network/bios": "~7.2.1",
     "@xyo-network/bios-model": "~7.2.1",
-    "@xyo-network/boundwitness-builder": "~5.3.10",
-    "@xyo-network/chain-protocol": "~1.19.18",
-    "@xyo-network/chain-services": "~1.19.18",
-    "@xyo-network/chain-telemetry": "~1.19.18",
-    "@xyo-network/module-abstract": "~5.3.10",
-    "@xyo-network/module-abstract-mongodb": "~5.3.10",
-    "@xyo-network/node-memory": "~5.3.10",
-    "@xyo-network/sdk-js": "~5.3.10",
-    "@xyo-network/sentinel-memory": "~5.3.10",
-    "@xyo-network/xl1-sdk": "~1.24.29",
+    "@xyo-network/boundwitness-builder": "~5.3.15",
+    "@xyo-network/chain-protocol": "~1.20.1",
+    "@xyo-network/chain-services": "~1.20.1",
+    "@xyo-network/chain-telemetry": "~1.20.1",
+    "@xyo-network/module-abstract": "~5.3.15",
+    "@xyo-network/module-abstract-mongodb": "~5.3.15",
+    "@xyo-network/node-memory": "~5.3.15",
+    "@xyo-network/sdk-js": "~5.3.15",
+    "@xyo-network/sentinel-memory": "~5.3.15",
+    "@xyo-network/xl1-sdk": "~1.25.18",
     "async-mutex": "~0.5.0",
-    "axios": "~1.13.5",
+    "axios": "~1.13.6",
     "dotenv": "~17.3.1",
     "eslint": "^9.39.3",
     "ethers": "^6.16.0",

package/src/config/getTestGateway.ts

@@ -0,0 +1,24 @@
+import { assertEx, isDefined } from '@xylabs/sdk-js'
+import { basicRemoteRunnerLocator, type BridgeConfig } from '@xyo-network/chain-orchestration'
+import { HDWallet } from '@xyo-network/sdk-js'
+import type { XyoGatewayRunner } from '@xyo-network/xl1-sdk'
+import {
+  ADDRESS_INDEX, generateXyoBaseWalletFromPhrase, HttpRpcRemoteConfigZod, XyoGatewayRunnerMoniker,
+} from '@xyo-network/xl1-sdk'
+
+let gatewayInstance: XyoGatewayRunner | undefined
+
+export const getTestGateway = async (config: BridgeConfig): Promise<XyoGatewayRunner> => {
+  if (isDefined(gatewayInstance)) return gatewayInstance
+  const { mnemonic } = config
+  const httpRpcConfig = HttpRpcRemoteConfigZod.safeParse(config.remote?.rpc)
+  const endpoint = assertEx(
+    httpRpcConfig.success ? assertEx(httpRpcConfig.data.url, () => 'RPC URL is required for gateway [no httpConfig]') : undefined,
+    () => '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)
+  const locator = await basicRemoteRunnerLocator('test', { rpc: { protocol: 'http', url: endpoint } }, signerAccount)
+  return await locator.getInstance<XyoGatewayRunner>(XyoGatewayRunnerMoniker)
+}

package/src/config/index.ts

@@ -5,11 +5,11 @@ export * from './getBridgeFeesAddress.ts'
 export * from './getBridgeSettings.ts'
 export * from './getBridgeWalletAccount.ts'
 export * from './getFeeStructure.ts'
-export * from './getGateway.ts'
 export * from './getMaxBridgeAmount.ts'
 export * from './getMinBridgeAmount.ts'
 export * from './getRemoteChainId.ts'
 export * from './getRemoteTokenAddress.ts'
+export * from './getTestGateway.ts'
 export * from './getTransferAddresses.ts'
 export * from './getXl1ChainId.ts'
 export * from './getXl1TokenAddress.ts'

package/src/modules/index.ts

@@ -1,2 +1 @@
 export * from './EVMLiquidityBridgeTransactionCompletionMonitorSentinel/index.ts'
-export * from './XL1TransactionCompletionMonitorSentinel/index.ts'

package/src/queue/flowProducer.ts

@@ -3,10 +3,14 @@ import { FlowProducer } from 'bullmq'
 import type { BullMQOtel } from 'bullmq-otel'
 import type { Redis } from 'ioredis'
 
+import { prefix } from './prefix.ts'
+
 let flowProducer: FlowProducer | undefined
 
 export const getFlowProducer = (connection: Redis, telemetry?: BullMQOtel) => {
   if (isDefined(flowProducer)) return flowProducer
-  flowProducer = new FlowProducer({ connection, telemetry })
+  flowProducer = new FlowProducer({
+    connection, telemetry, prefix,
+  })
   return flowProducer
 }

package/src/queue/flows/createEthToXl1BridgeJob.ts

@@ -0,0 +1,71 @@
+import { PayloadBuilder } from '@xyo-network/sdk-js'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
+import type { FlowProducer } from 'bullmq'
+
+import {
+  EthToXl1BridgeParent, Xl1TransactionMonitor, Xl1TransactionPreparation, Xl1TransactionSubmission,
+  Xl1TransactionSubmissionStorage,
+} from '../workers/index.ts'
+
+/**
+ * Creates a job flow for bridging a transaction from Ethereum to XL1.
+ * @param flowProducer The flow producer to run the job
+ * @param tx The bridge transaction
+ * @returns The JobNode representing the ETH to XL1 bridge job
+ */
+export const createEthToXl1BridgeJob = async (
+  flowProducer: FlowProducer,
+  tx: SignedHydratedTransaction,
+) => {
+  const jobId = await PayloadBuilder.hash(tx[0])
+  const flow = await flowProducer.add({
+    // Step 0 (runs first as parent job)
+    name: EthToXl1BridgeParent.name,
+    queueName: EthToXl1BridgeParent.queueName,
+    data: { tx },
+    opts: { jobId },
+    children: [
+      {
+        // Step 4
+        name: Xl1TransactionMonitor.name,
+        queueName: Xl1TransactionMonitor.queueName,
+        data: { tx },
+        opts: {
+          jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+        },
+        children: [
+          {
+            // Step 3
+            name: Xl1TransactionSubmissionStorage.name,
+            queueName: Xl1TransactionSubmissionStorage.queueName,
+            data: { tx },
+            opts: {
+              jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+            },
+            children: [
+              {
+                // Step 2
+                name: Xl1TransactionSubmission.name,
+                queueName: Xl1TransactionSubmission.queueName,
+                data: { tx },
+                opts: { jobId },
+                children: [
+                  {
+                    // Step 1 (runs first as deepest child)
+                    name: Xl1TransactionPreparation.name,
+                    queueName: Xl1TransactionPreparation.queueName,
+                    data: { tx },
+                    opts: {
+                      jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  })
+  return flow
+}

package/src/queue/flows/createXl1ToEthBridgeJob.ts

@@ -3,8 +3,8 @@ import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { FlowProducer } from 'bullmq'
 
 import {
-  EthTransactionMonitor, EthTransactionPreparation, EthTransactionSubmission, Xl1ToEthBridgeParent, Xl1TransactionMonitor, Xl1TransactionPreparation,
-  Xl1TransactionSubmission,
+  EthTransactionMonitor, EthTransactionPreparation, EthTransactionSubmission, EthTransactionSubmissionStorage, Xl1ToEthBridgeParent, Xl1TransactionMonitor,
+  Xl1TransactionPreparation, Xl1TransactionSubmission, Xl1TransactionSubmissionStorage,
 } from '../workers/index.ts'
 
 /**
@@ -19,13 +19,14 @@ export const createXl1ToEthBridgeJob = async (
 ) => {
   const jobId = await PayloadBuilder.hash(tx[0])
   const flow = await flowProducer.add({
+    // Step 0 (runs first as parent job)
     name: Xl1ToEthBridgeParent.name,
     queueName: Xl1ToEthBridgeParent.queueName,
     data: { tx },
     opts: { jobId },
     children: [
       {
-        // Step 6 (runs after child completes)
+        // Step 8
         name: EthTransactionMonitor.name,
         queueName: EthTransactionMonitor.queueName,
         data: { tx },
@@ -34,40 +35,67 @@ export const createXl1ToEthBridgeJob = async (
         },
         children: [
           {
-            // Step 5
-            name: EthTransactionSubmission.name,
-            queueName: EthTransactionSubmission.queueName,
+            // Step 7
+            name: EthTransactionSubmissionStorage.name,
+            queueName: EthTransactionSubmissionStorage.queueName,
             data: { tx },
+            opts: {
+              jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+            },
             children: [
               {
-                // Step 4
-                name: EthTransactionPreparation.name,
-                queueName: EthTransactionPreparation.queueName,
+                // Step 6
+                name: EthTransactionSubmission.name,
+                queueName: EthTransactionSubmission.queueName,
                 data: { tx },
                 opts: { jobId },
                 children: [
                   {
-                    // Step 3
-                    name: Xl1TransactionMonitor.name,
-                    queueName: Xl1TransactionMonitor.queueName,
+                    // Step 5
+                    name: EthTransactionPreparation.name,
+                    queueName: EthTransactionPreparation.queueName,
                     data: { tx },
                     opts: {
                       jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
                     },
                     children: [
                       {
-                        // Step 2
-                        name: Xl1TransactionSubmission.name,
-                        queueName: Xl1TransactionSubmission.queueName,
+                        // Step 4
+                        name: Xl1TransactionMonitor.name,
+                        queueName: Xl1TransactionMonitor.queueName,
                         data: { tx },
-                        opts: { jobId },
+                        opts: {
+                          jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+                        },
                         children: [
                           {
-                            // Step 1 (runs first as deepest child)
-                            name: Xl1TransactionPreparation.name,
-                            queueName: Xl1TransactionPreparation.queueName,
+                            // Step 3
+                            name: Xl1TransactionSubmissionStorage.name,
+                            queueName: Xl1TransactionSubmissionStorage.queueName,
                             data: { tx },
-                            opts: { jobId },
+                            opts: {
+                              jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+                            },
+                            children: [
+                              {
+                                // Step 2
+                                name: Xl1TransactionSubmission.name,
+                                queueName: Xl1TransactionSubmission.queueName,
+                                data: { tx },
+                                opts: { jobId },
+                                children: [
+                                  {
+                                    // Step 1 (runs first as deepest child)
+                                    name: Xl1TransactionPreparation.name,
+                                    queueName: Xl1TransactionPreparation.queueName,
+                                    data: { tx },
+                                    opts: {
+                                      jobId, attempts: 60, backoff: { type: 'fixed', delay: 5000 },
+                                    },
+                                  },
+                                ],
+                              },
+                            ],
                           },
                         ],
                       },

package/src/queue/flows/index.ts

@@ -1 +1,2 @@
+export * from './createEthToXl1BridgeJob.ts'
 export * from './createXl1ToEthBridgeJob.ts'

package/src/queue/getXl1ToEthQueueJobs.ts

@@ -0,0 +1,57 @@
+import type { Xl1ToEthQueues } from './getXl1ToEthQueues.ts'
+import type {
+  EthTransactionMonitorJob, EthTransactionPreparationJob,
+  EthTransactionSubmissionJob,
+  Xl1ToEthBridgeParentJob,
+  Xl1TransactionMonitorJob, Xl1TransactionPreparationJob, Xl1TransactionSubmissionJob,
+  Xl1TransactionSubmissionStorageJob,
+} from './workers/index.ts'
+
+export interface StatusQueueJobs {
+  ethTransactionMonitorJob?: EthTransactionMonitorJob
+  ethTransactionPreparationJob?: EthTransactionPreparationJob
+  ethTransactionSubmissionJob?: EthTransactionSubmissionJob
+  xl1ToEthBridgeParentJob?: Xl1ToEthBridgeParentJob
+  xl1TransactionMonitorJob?: Xl1TransactionMonitorJob
+  xl1TransactionPreparationJob?: Xl1TransactionPreparationJob
+  xl1TransactionSubmissionJob?: Xl1TransactionSubmissionJob
+  xl1TransactionSubmissionStorageJob?: Xl1TransactionSubmissionStorageJob
+}
+
+/**
+ * Checks all the relevant status queues for a job with the given id and returns the jobs found in an object
+ * @param queues The status queues to check for jobs
+ * @param jobId The job id to look for in the queues, which is the same as the tx hash of the bridge transaction
+ * @returns An object containing the jobs found in the status queues corresponding to the given job id
+ */
+export const getStatusQueueJobs = async (queues: Xl1ToEthQueues, jobId: string): Promise<StatusQueueJobs> => {
+  const [
+    ethTransactionMonitorJob,
+    ethTransactionPreparationJob,
+    ethTransactionSubmissionJob,
+    xl1ToEthBridgeParentJob,
+    xl1TransactionMonitorJob,
+    xl1TransactionPreparationJob,
+    xl1TransactionSubmissionJob,
+    xl1TransactionSubmissionStorageJob,
+  ] = await Promise.all([
+    queues.ethTransactionMonitor.getJob(jobId),
+    queues.ethTransactionPreparation.getJob(jobId),
+    queues.ethTransactionSubmission.getJob(jobId),
+    queues.xl1ToEthBridgeParent.getJob(jobId),
+    queues.xl1TransactionMonitor.getJob(jobId),
+    queues.xl1TransactionPreparation.getJob(jobId),
+    queues.xl1TransactionSubmission.getJob(jobId),
+    queues.xl1TransactionSubmissionStorage.getJob(jobId),
+  ])
+  return {
+    ethTransactionMonitorJob,
+    ethTransactionPreparationJob,
+    ethTransactionSubmissionJob,
+    xl1ToEthBridgeParentJob,
+    xl1TransactionMonitorJob,
+    xl1TransactionPreparationJob,
+    xl1TransactionSubmissionStorageJob,
+    xl1TransactionSubmissionJob,
+  }
+}

package/src/queue/getXl1ToEthQueues.ts

@@ -0,0 +1,39 @@
+import type { BridgeConfig } from '@xyo-network/chain-orchestration'
+import { Queue } from 'bullmq'
+
+import { getConnection } from './connection.ts'
+import { prefix } from './prefix.ts'
+import {
+  EthTransactionMonitor, EthTransactionPreparation, EthTransactionSubmission, Xl1ToEthBridgeParent, Xl1TransactionMonitor, Xl1TransactionPreparation,
+  Xl1TransactionSubmission,
+  Xl1TransactionSubmissionStorage,
+} from './workers/index.ts'
+
+export interface Xl1ToEthQueues {
+  ethTransactionMonitor: Queue
+  ethTransactionPreparation: Queue
+  ethTransactionSubmission: Queue
+  xl1ToEthBridgeParent: Queue
+  xl1TransactionMonitor: Queue
+  xl1TransactionPreparation: Queue
+  xl1TransactionSubmission: Queue
+  xl1TransactionSubmissionStorage: Queue
+}
+
+let xl1ToEthQueues: Xl1ToEthQueues | undefined
+
+export const getXl1ToEthQueues = (config: BridgeConfig): Xl1ToEthQueues => {
+  if (xl1ToEthQueues) return xl1ToEthQueues
+  const connection = getConnection(config)
+  xl1ToEthQueues = {
+    ethTransactionMonitor: new Queue(EthTransactionMonitor.queueName, { connection, prefix }),
+    ethTransactionPreparation: new Queue(EthTransactionPreparation.queueName, { connection, prefix }),
+    ethTransactionSubmission: new Queue(EthTransactionSubmission.queueName, { connection, prefix }),
+    xl1ToEthBridgeParent: new Queue(Xl1ToEthBridgeParent.queueName, { connection, prefix }),
+    xl1TransactionMonitor: new Queue(Xl1TransactionMonitor.queueName, { connection, prefix }),
+    xl1TransactionPreparation: new Queue(Xl1TransactionPreparation.queueName, { connection, prefix }),
+    xl1TransactionSubmission: new Queue(Xl1TransactionSubmission.queueName, { connection, prefix }),
+    xl1TransactionSubmissionStorage: new Queue(Xl1TransactionSubmissionStorage.queueName, { connection, prefix }),
+  }
+  return xl1ToEthQueues
+}

package/src/queue/index.ts

@@ -1,5 +1,8 @@
 export * from './connection.ts'
 export * from './flowProducer.ts'
 export * from './flows/index.ts'
+export * from './getXl1ToEthQueueJobs.ts'
+export * from './getXl1ToEthQueues.ts'
+export * from './prefix.ts'
 export * from './telemetry.ts'
 export * from './workers/index.ts'

package/src/queue/prefix.ts

@@ -0,0 +1 @@
+export const prefix = 'xl1-bridge'

package/src/queue/workers/EthToXl1BridgeParent.ts

@@ -0,0 +1,40 @@
+import type { Job } from 'bullmq'
+import { Worker } from 'bullmq'
+import type { BullMQOtel } from 'bullmq-otel'
+import type { Redis } from 'ioredis'
+
+import { prefix } from '../prefix.ts'
+import type { WorkerDescription } from './WorkerDescription.ts'
+
+export type EthToXl1BridgeParentJobData = {}
+export interface EthToXl1BridgeParentJobReturn { }
+export type EthToXl1BridgeParentJob = Job<EthToXl1BridgeParentJobData, EthToXl1BridgeParentJobReturn>
+
+const name = 'Bridge Ethereum to XL1'
+const queueName = 'eth-to-xl1-bridge'
+const createWorker = (connection: Redis, telemetry?: BullMQOtel) => {
+  const worker = new Worker(
+    queueName,
+    async (job: EthToXl1BridgeParentJob) => {
+      await job.log(`[${job.name}] start`)
+      // Parent job has no work other than waiting on children
+      await job.log(`[${job.name}] done`)
+      return {}
+    },
+    {
+      connection, telemetry, prefix,
+    },
+  )
+
+  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 EthToXl1BridgeParent: WorkerDescription = {
+  createWorker, name, queueName,
+}

package/src/queue/workers/EthTransactionMonitor.ts

@@ -7,6 +7,7 @@ import type { BullMQOtel } from 'bullmq-otel'
 import type { Redis } from 'ioredis'
 
 import type { IBridgeServiceCollection } from '../../services/index.ts'
+import { prefix } from '../prefix.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
 export type EthTransactionMonitorJobData = { tx: SignedHydratedTransaction }
@@ -15,6 +16,7 @@ export interface EthTransactionMonitorJobReturn {
   blockNumber: number
   submissionHash: string
 }
+export type EthTransactionMonitorJob = Job<EthTransactionMonitorJobData, EthTransactionMonitorJobReturn>
 
 const name = 'Monitor Submitted ETH Transaction'
 const queueName = 'eth-tx-monitor'
@@ -24,7 +26,7 @@ const createWorker = (connection: Redis, telemetry?: BullMQOtel, services?: IBri
 
   const worker = new Worker(
     queueName,
-    async (job: Job<EthTransactionMonitorJobData, EthTransactionMonitorJobReturn>) => {
+    async (job: EthTransactionMonitorJob) => {
       const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       const state = assertEx(await stateMap.get(hash), () => 'State not found')
@@ -38,7 +40,9 @@ const createWorker = (connection: Redis, telemetry?: BullMQOtel, services?: IBri
         blockHash, blockNumber, submissionHash,
       }
     },
-    { connection, telemetry },
+    {
+      connection, telemetry, prefix,
+    },
   )
 
   worker.on('failed', (job, err) => {

package/src/queue/workers/EthTransactionPreparation.ts

@@ -10,11 +10,13 @@ import type { Redis } from 'ioredis'
 import type { IBridgeServiceCollection } from '../../services/index.ts'
 import {
   validateSufficientLiquiditySourceAllowance, validateSufficientLiquiditySourceBalance, validateSufficientRunnerEthBalanceForGas,
-} from './util/index.ts'
+} from '../../validation/index.ts'
+import { prefix } from '../prefix.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
-export type EthTransactionPrepareJobData = { tx: SignedHydratedTransaction }
-export type EthTransactionPrepareJobReturn = Record<string, never>
+export type EthTransactionPreparationJobData = { tx: SignedHydratedTransaction }
+export type EthTransactionPreparationJobReturn = Record<string, never>
+export type EthTransactionPreparationJob = Job<EthTransactionPreparationJobData, EthTransactionPreparationJobReturn>
 
 const name = 'Prepare ETH Transaction'
 const queueName = 'eth-tx-prepare'
@@ -27,7 +29,7 @@ export const createWorker = (connection: Redis, telemetry?: BullMQOtel, services
 
   const worker = new Worker(
     queueName,
-    async (job: Job<EthTransactionPrepareJobData, EthTransactionPrepareJobReturn>) => {
+    async (job: EthTransactionPreparationJob) => {
       const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       await job.log(`[${hash}] preparing ETH transaction`)
@@ -60,7 +62,9 @@ export const createWorker = (connection: Redis, telemetry?: BullMQOtel, services
       await job.log(`[${hash}] prepared ETH transaction`)
       return {}
     },
-    { connection, telemetry },
+    {
+      connection, telemetry, prefix,
+    },
   )
 
   worker.on('failed', (job, err) => {

package/src/queue/workers/EthTransactionSubmission.ts

@@ -7,14 +7,15 @@ import type { BullMQOtel } from 'bullmq-otel'
 import type { Redis } from 'ioredis'
 
 import type { EthTxState, IBridgeServiceCollection } from '../../services/index.ts'
+import { prefix } from '../prefix.ts'
 import { submitEthTransaction } from './util/index.ts'
 import type { WorkerDescription } from './WorkerDescription.ts'
 
 export type EthTransactionSubmissionJobData = { tx: SignedHydratedTransaction }
-
 export interface EthTransactionSubmissionJobReturn {
   submissionHash: Required<EthTxState>['submissionHash']
 }
+export type EthTransactionSubmissionJob = Job<EthTransactionSubmissionJobData, EthTransactionSubmissionJobReturn>
 
 const name = 'Submit ETH Transaction'
 const queueName = 'eth-tx-submit'
@@ -26,7 +27,7 @@ const createWorker = (connection: Redis, telemetry?: BullMQOtel, services?: IBri
 
   const worker = new Worker(
     queueName,
-    async (job: Job<EthTransactionSubmissionJobData, EthTransactionSubmissionJobReturn>) => {
+    async (job: EthTransactionSubmissionJob) => {
       const { tx } = job.data
       const hash = await PayloadBuilder.hash(tx[0])
       const state = assertEx(await stateMap.get(hash), () => `[${hash}] state not found`)
@@ -40,21 +41,12 @@ const createWorker = (connection: Redis, telemetry?: BullMQOtel, services?: IBri
 
       // Submit the transaction to the Ethereum network
       await job.log(`[${hash}] Submitting ETH tx`)
-
       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
-      await job.log(`[${hash}] Storing ETH submissionHash`)
-      state.submissionHash = submissionHash
-      await stateMap.set(hash, state)
-      await job.log(`[${hash}] Stored ETH submissionHash`)
-
       return { submissionHash }
     },
     {
-      connection, telemetry, concurrency: 1,
+      connection, telemetry, concurrency: 1, prefix,
     },
   )