@xyo-network/chain-bridge 1.19.17 → 1.19.18

package/dist/node/index.mjs

@@ -32,10 +32,11 @@ var getConnection = /* @__PURE__ */ __name((config) => {
 import { isDefined as isDefined2 } from "@xylabs/sdk-js";
 import { FlowProducer } from "bullmq";
 var flowProducer;
-var getFlowProducer = /* @__PURE__ */ __name((connection2) => {
+var getFlowProducer = /* @__PURE__ */ __name((connection2, telemetry2) => {
   if (isDefined2(flowProducer)) return flowProducer;
   flowProducer = new FlowProducer({
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   return flowProducer;
 }, "getFlowProducer");
@@ -44,14 +45,14 @@ var getFlowProducer = /* @__PURE__ */ __name((connection2) => {
 import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/sdk-js";
 
 // src/queue/workers/createWorkers.ts
-var createWorkers = /* @__PURE__ */ __name((connection2, services) => {
-  Xl1ToEthBridgeParent.createWorker(connection2);
-  Xl1TransactionPreparation.createWorker(connection2, services);
-  Xl1TransactionSubmission.createWorker(connection2, services);
-  Xl1TransactionMonitor.createWorker(connection2, services);
-  EthTransactionPreparation.createWorker(connection2, services);
-  EthTransactionSubmission.createWorker(connection2, services);
-  EthTransactionMonitor.createWorker(connection2, services);
+var createWorkers = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  Xl1ToEthBridgeParent.createWorker(connection2, telemetry2);
+  Xl1TransactionPreparation.createWorker(connection2, telemetry2, services);
+  Xl1TransactionSubmission.createWorker(connection2, telemetry2, services);
+  Xl1TransactionMonitor.createWorker(connection2, telemetry2, services);
+  EthTransactionPreparation.createWorker(connection2, telemetry2, services);
+  EthTransactionSubmission.createWorker(connection2, telemetry2, services);
+  EthTransactionMonitor.createWorker(connection2, telemetry2, services);
 }, "createWorkers");
 
 // src/queue/workers/EthTransactionMonitor.ts
@@ -60,7 +61,7 @@ import { PayloadBuilder } from "@xyo-network/sdk-js";
 import { Worker } from "bullmq";
 var name = "Monitor Submitted ETH Transaction";
 var queueName = "eth-tx-monitor";
-var createWorker = /* @__PURE__ */ __name((connection2, services) => {
+var createWorker = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
   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) => {
@@ -75,10 +76,12 @@ var createWorker = /* @__PURE__ */ __name((connection2, services) => {
     await stateMap.set(hash, state);
     return {
       blockHash,
-      blockNumber
+      blockNumber,
+      submissionHash
     };
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name}] Job ${job?.id} failed:`, err.message);
@@ -94,7 +97,7 @@ var EthTransactionMonitor = {
 };
 
 // src/queue/workers/EthTransactionPreparation.ts
-import { assertEx as assertEx5, hexToBigInt as hexToBigInt4 } from "@xylabs/sdk-js";
+import { assertEx as assertEx6, hexToBigInt as hexToBigInt4 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/sdk-js";
 import { isBridgeIntent as isBridgeIntent4 } from "@xyo-network/xl1-sdk";
 import { Worker as Worker2 } from "bullmq";
@@ -124,10 +127,10 @@ var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, gateway) =>
   return result;
 }, "submitXl1Transaction");
 
-// src/queue/workers/util/validateSufficientAllowance.ts
+// src/queue/workers/util/validateSufficientLiquiditySourceAllowance.ts
 import { assertEx as assertEx3, hexToBigInt as hexToBigInt2 } from "@xylabs/sdk-js";
 import { isBridgeIntent as isBridgeIntent2 } from "@xyo-network/xl1-sdk";
-var validateSufficientAllowance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
+var validateSufficientLiquiditySourceAllowance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
   const bridgeIntent = assertEx3(tx[1].find(isBridgeIntent2), () => "No bridge intent found");
   const amount = hexToBigInt2(bridgeIntent.destAmount);
   const liquiditySourceAddress = await bridge.liquiditySource();
@@ -135,49 +138,79 @@ var validateSufficientAllowance = /* @__PURE__ */ __name(async (tx, bridgeableTo
   const remainingAllowance = await bridgeableToken.allowance(liquiditySourceAddress, bridgeAddress);
   await logger?.log(`Remaining allowance: ${remainingAllowance.toString()}`);
   return remainingAllowance >= amount;
-}, "validateSufficientAllowance");
+}, "validateSufficientLiquiditySourceAllowance");
 
-// src/queue/workers/util/validateSufficientBalance.ts
+// src/queue/workers/util/validateSufficientLiquiditySourceBalance.ts
 import { assertEx as assertEx4, hexToBigInt as hexToBigInt3 } from "@xylabs/sdk-js";
 import { isBridgeIntent as isBridgeIntent3 } from "@xyo-network/xl1-sdk";
-var validateSufficientBalance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
+var validateSufficientLiquiditySourceBalance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
   const bridgeIntent = assertEx4(tx[1].find(isBridgeIntent3), () => "No bridge intent found");
   const amount = hexToBigInt3(bridgeIntent.destAmount);
   const liquiditySourceAddress = await bridge.liquiditySource();
   const balance = await bridgeableToken.balanceOf(liquiditySourceAddress);
   await logger?.log(`Remaining balance: ${balance.toString()}`);
   return balance >= amount;
-}, "validateSufficientBalance");
+}, "validateSufficientLiquiditySourceBalance");
+
+// src/queue/workers/util/validateSufficientRunnerEthBalanceForGas.ts
+import { assertEx as assertEx5 } from "@xylabs/sdk-js";
+var DEFAULT_GAS_BUFFER_BPS = 2000n;
+var validateSufficientRunnerEthBalanceForGas = /* @__PURE__ */ __name(async (preparedTx, wallet, logger, bufferBps = DEFAULT_GAS_BUFFER_BPS) => {
+  const provider = assertEx5(wallet.provider, () => "Wallet provider is not defined");
+  const feeData = await provider.getFeeData();
+  const perGas = feeData.maxFeePerGas ?? feeData.gasPrice;
+  if (perGas == null) {
+    await logger?.log("[gas] unable to resolve gas price / maxFeePerGas from provider");
+    return true;
+  }
+  const transactionRequest = {
+    ...preparedTx,
+    from: await wallet.getAddress()
+  };
+  const estGas = await provider.estimateGas(transactionRequest);
+  const txValue = preparedTx?.value ?? 0n;
+  const baseRequired = estGas * perGas + txValue;
+  const required = baseRequired * (10000n + bufferBps) / 10000n;
+  const balance = await provider.getBalance(await wallet.getAddress());
+  await logger?.log(`[gas] runner=${await wallet.getAddress()} balance=${balance.toString()} estGas=${estGas.toString()} perGas=${perGas.toString()} value=${txValue.toString()} requiredWithBuffer=${required.toString()} bufferBps=${bufferBps.toString()}`);
+  return balance >= required;
+}, "validateSufficientRunnerEthBalanceForGas");
 
 // src/queue/workers/EthTransactionPreparation.ts
 var name2 = "Prepare ETH Transaction";
 var queueName2 = "eth-tx-prepare";
-var createWorker2 = /* @__PURE__ */ __name((connection2, services) => {
-  const bridge = assertEx5(services?.bridge, () => "bridge service not provided");
-  const bridgeableToken = assertEx5(services?.bridgeableToken, () => "bridgeableToken service not provided");
-  const stateMap = assertEx5(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+var createWorker2 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  const bridge = assertEx6(services?.bridge, () => "bridge service not provided");
+  const bridgeableToken = assertEx6(services?.bridgeableToken, () => "bridgeableToken service not provided");
+  const stateMap = assertEx6(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+  const wallet = assertEx6(services?.wallet, () => "wallet service not provided");
   const worker = new Worker2(queueName2, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder3.hash(tx[0]);
     await job.log(`[${hash}] preparing ETH transaction`);
     await job.log(`[${hash}] validating liquiditySource has sufficient allowance`);
-    if (!await validateSufficientAllowance(tx, bridgeableToken, bridge, job)) {
+    if (!await validateSufficientLiquiditySourceAllowance(tx, bridgeableToken, bridge, job)) {
       throw new Error("Liquidity source does not have sufficient allowance for the bridge to execute the transaction");
     }
     await job.log(`[${hash}] validated liquiditySource has sufficient allowance`);
     await job.log(`[${hash}] validating liquiditySource has sufficient balance`);
-    if (!await validateSufficientBalance(tx, bridgeableToken, bridge, job)) {
+    if (!await validateSufficientLiquiditySourceBalance(tx, bridgeableToken, bridge, job)) {
       throw new Error("Liquidity source does not have sufficient balance for the bridge to execute the transaction");
     }
     await job.log(`[${hash}] validated liquiditySource has sufficient balance`);
     await job.log(`[${hash}] building ETH transaction`);
-    const bridgeIntent = assertEx5(tx[1].find(isBridgeIntent4), () => "No bridge intent found");
+    const bridgeIntent = assertEx6(tx[1].find(isBridgeIntent4), () => "No bridge intent found");
     const amount = hexToBigInt4(bridgeIntent.destAmount);
     const srcAddress = getAddress(bridgeIntent.srcAddress);
     const destAddress = getAddress(bridgeIntent.destAddress);
     const nonce = hexToBigInt4(await PayloadBuilder3.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}] validating tx runner has sufficient ETH for gas`);
+    if (!await validateSufficientRunnerEthBalanceForGas(preparedTx, wallet, job)) {
+      throw new Error("Transaction runner does not have sufficient ETH to cover estimated gas (with buffer)");
+    }
+    await job.log(`[${hash}] validated tx runner has sufficient ETH for gas`);
     await job.log(`[${hash}] storing ETH preparedTx`);
     await stateMap.set(hash, {
       preparedTx
@@ -186,7 +219,8 @@ var createWorker2 = /* @__PURE__ */ __name((connection2, services) => {
     await job.log(`[${hash}] prepared ETH transaction`);
     return {};
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name2}] Job ${job?.id} failed:`, err.message);
@@ -202,21 +236,20 @@ var EthTransactionPreparation = {
 };
 
 // src/queue/workers/EthTransactionSubmission.ts
-import { assertEx as assertEx6, isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx7, isDefined as isDefined3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/sdk-js";
 import { Worker as Worker3 } from "bullmq";
 var name3 = "Submit ETH Transaction";
 var queueName3 = "eth-tx-submit";
-var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
-  const bridge = assertEx6(services?.bridge, () => "bridge service not provided");
-  const bridgeableToken = assertEx6(services?.bridgeableToken, () => "bridgeableToken service not provided");
-  const wallet = assertEx6(services?.wallet, () => "wallet service not provided");
-  const stateMap = assertEx6(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+var createWorker3 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  const bridge = assertEx7(services?.bridge, () => "bridge service not provided");
+  const bridgeableToken = assertEx7(services?.bridgeableToken, () => "bridgeableToken service not provided");
+  const wallet = assertEx7(services?.wallet, () => "wallet service not provided");
+  const stateMap = assertEx7(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
   const worker = new Worker3(queueName3, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder4.hash(tx[0]);
-    const state = assertEx6(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx6(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx7(await stateMap.get(hash), () => `[${hash}] state not found`);
     const { submissionHash: existingSubmissionHash } = state;
     if (isDefined3(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
@@ -225,7 +258,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
       };
     }
     await job.log(`[${hash}] Submitting ETH tx`);
-    const submissionHash = assertEx6(await submitEthTransaction(tx, bridgeableToken, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`);
+    const submissionHash = assertEx7(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}`);
     await job.log(`[${hash}] Storing ETH submissionHash`);
     state.submissionHash = submissionHash;
@@ -236,6 +269,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
     };
   }, {
     connection: connection2,
+    telemetry: telemetry2,
     concurrency: 1
   });
   worker.on("failed", (job, err) => {
@@ -255,15 +289,14 @@ var EthTransactionSubmission = {
 import { Worker as Worker4 } from "bullmq";
 var name4 = "Bridge XL1 to Ethereum";
 var queueName4 = "xl1-to-eth-bridge";
-var createWorker4 = /* @__PURE__ */ __name((connection2) => {
+var createWorker4 = /* @__PURE__ */ __name((connection2, telemetry2) => {
   const worker = new Worker4(queueName4, async (job) => {
     await job.log(`[${job.name}] start`);
     await job.log(`[${job.name}] done`);
-    return {
-      ok: true
-    };
+    return {};
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name4}] Job ${job?.id} failed:`, err.message);
@@ -279,20 +312,20 @@ var Xl1ToEthBridgeParent = {
 };
 
 // src/queue/workers/Xl1TransactionMonitor.ts
-import { assertEx as assertEx7, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
+import { assertEx as assertEx8, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/sdk-js";
 import { UnrecoverableError, Worker as Worker5 } from "bullmq";
 var name5 = "Monitor Submitted XL1 Transaction";
 var queueName5 = "xl1-tx-monitor";
-var createWorker5 = /* @__PURE__ */ __name((connection2, services) => {
-  const gateway = assertEx7(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx7(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+var createWorker5 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  const gateway = assertEx8(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx8(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker5(queueName5, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder5.hash(tx[0]);
-    const viewer = assertEx7(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`);
-    const state = assertEx7(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const submissionHash = assertEx7(state?.submissionHash, () => `[${hash}] submissionHash not found`);
+    const viewer = assertEx8(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`);
+    const state = assertEx8(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const submissionHash = assertEx8(state?.submissionHash, () => `[${hash}] submissionHash not found`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transactionByHash(submissionHash);
     if (isDefined4(foundTx) && !isNull(foundTx)) {
@@ -309,7 +342,8 @@ var createWorker5 = /* @__PURE__ */ __name((connection2, services) => {
     await job.log(`[${hash}] Transaction not yet included, retrying later`);
     throw new Error(`[${hash}] Transaction not yet included`);
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name5}] Job ${job?.id} failed:`, err.message);
@@ -325,13 +359,13 @@ var Xl1TransactionMonitor = {
 };
 
 // src/queue/workers/Xl1TransactionPreparation.ts
-import { assertEx as assertEx8 } from "@xylabs/sdk-js";
+import { assertEx as assertEx9 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/sdk-js";
 import { Worker as Worker6 } from "bullmq";
 var name6 = "Prepare XL1 Transaction";
 var queueName6 = "xl1-tx-prepare";
-var createWorker6 = /* @__PURE__ */ __name((connection2, services) => {
-  const stateMap = assertEx8(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+var createWorker6 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  const stateMap = assertEx9(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker6(queueName6, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder6.hash(tx[0]);
@@ -343,9 +377,12 @@ var createWorker6 = /* @__PURE__ */ __name((connection2, services) => {
     });
     await job.log(`[${hash}] stored XL1 preparedTx`);
     await job.log(`[${hash}] prepared XL1 transaction`);
-    return {};
+    return {
+      preparedTx
+    };
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name6}] Job ${job?.id} failed:`, err.message);
@@ -361,19 +398,19 @@ var Xl1TransactionPreparation = {
 };
 
 // src/queue/workers/Xl1TransactionSubmission.ts
-import { assertEx as assertEx9, isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx10, isDefined as isDefined5 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/sdk-js";
 import { Worker as Worker7 } from "bullmq";
 var name7 = "Submit XL1 Transaction";
 var queueName7 = "xl1-tx-submit";
-var createWorker7 = /* @__PURE__ */ __name((connection2, services) => {
-  const gateway = assertEx9(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx9(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+var createWorker7 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
+  const gateway = assertEx10(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx10(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker7(queueName7, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder7.hash(tx[0]);
-    const state = assertEx9(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx9(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx10(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx10(state?.preparedTx, () => `[${hash}] preparedTx not found`);
     const { submissionHash: existingSubmissionHash } = state;
     if (isDefined5(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
@@ -392,7 +429,8 @@ var createWorker7 = /* @__PURE__ */ __name((connection2, services) => {
       submissionHash
     };
   }, {
-    connection: connection2
+    connection: connection2,
+    telemetry: telemetry2
   });
   worker.on("failed", (job, err) => {
     console.error(`[${name7}] Job ${job?.id} failed:`, err.message);
@@ -508,10 +546,24 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
   return flow;
 }, "createXl1ToEthBridgeJob");
 
+// src/queue/telemetry.ts
+import { isDefined as isDefined6 } from "@xylabs/sdk-js";
+import { BullMQOtel } from "bullmq-otel";
+var telemetry;
+var options = {
+  enableMetrics: true
+};
+var getTelemetry = /* @__PURE__ */ __name(() => {
+  if (isDefined6(telemetry)) return telemetry;
+  telemetry = new BullMQOtel(options);
+  return telemetry;
+}, "getTelemetry");
+
 // src/server/addFlowProducer.ts
 var addFlowProducer = /* @__PURE__ */ __name((app, config) => {
   const connection2 = getConnection(config);
-  const flowProducer2 = getFlowProducer(connection2);
+  const telemetry2 = getTelemetry();
+  const flowProducer2 = getFlowProducer(connection2, telemetry2);
   app.flowProducer = flowProducer2;
   return app;
 }, "addFlowProducer");
@@ -549,14 +601,14 @@ var asToken = /* @__PURE__ */ __name((value) => {
 }, "asToken");
 
 // src/config/getBridgeEscrowAddress.ts
-import { asAddress as asAddress2, assertEx as assertEx10 } from "@xylabs/sdk-js";
+import { asAddress as asAddress2, assertEx as assertEx11 } from "@xylabs/sdk-js";
 var tryGetBridgeEscrowAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress2(config.escrowAddress);
   return address;
 }, "tryGetBridgeEscrowAddress");
 
 // src/config/getBridgeFeesAddress.ts
-import { asAddress as asAddress3, assertEx as assertEx11 } from "@xylabs/sdk-js";
+import { asAddress as asAddress3, assertEx as assertEx12 } from "@xylabs/sdk-js";
 var tryGetBridgeFeesAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress3(config.feesAddress);
   return address;
@@ -584,22 +636,22 @@ var getMinBridgeAmount = /* @__PURE__ */ __name((config) => {
 }, "getMinBridgeAmount");
 
 // src/config/getRemoteChainId.ts
-import { assertEx as assertEx12 } from "@xylabs/sdk-js";
+import { assertEx as assertEx13 } from "@xylabs/sdk-js";
 var getRemoteChainId = /* @__PURE__ */ __name((config) => {
-  const remoteChainId = assertEx12(asChainId(config.remoteChainId), () => "Invalid remote chain ID in config");
+  const remoteChainId = assertEx13(asChainId(config.remoteChainId), () => "Invalid remote chain ID in config");
   return remoteChainId;
 }, "getRemoteChainId");
 
 // src/config/getRemoteTokenAddress.ts
-import { assertEx as assertEx13 } from "@xylabs/sdk-js";
+import { assertEx as assertEx14 } from "@xylabs/sdk-js";
 var getRemoteTokenAddress = /* @__PURE__ */ __name((config) => {
   const token = asToken(config.remoteTokenAddress);
-  return assertEx13(token, () => "Remote token address is not defined in bridge configuration");
+  return assertEx14(token, () => "Remote token address is not defined in bridge configuration");
 }, "getRemoteTokenAddress");
 
 // src/config/getBridgeWalletAccount.ts
-import { isDefined as isDefined6, isUndefined } from "@xylabs/sdk-js";
-import { HDWallet } from "@xyo-network/wallet";
+import { isDefined as isDefined7, isUndefined } from "@xylabs/sdk-js";
+import { HDWallet } from "@xyo-network/sdk-js";
 import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from "@xyo-network/xl1-sdk";
 var accountServiceSingleton;
 var getBridgeWalletAccount = /* @__PURE__ */ __name(async (config) => {
@@ -632,20 +684,20 @@ var getTransferAddresses = /* @__PURE__ */ __name(async (config) => {
 }, "getTransferAddresses");
 
 // src/config/getXl1ChainId.ts
-import { assertEx as assertEx14, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx15, isDefined as isDefined8 } from "@xylabs/sdk-js";
 var getXl1ChainId = /* @__PURE__ */ __name((config) => {
   const xl1ChainId = config.xl1ChainId;
-  if (isDefined7(xl1ChainId)) {
-    return assertEx14(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
+  if (isDefined8(xl1ChainId)) {
+    return assertEx15(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
   }
-  return assertEx14(asChainId(config.chain.id), () => "Invalid chain.id in config");
+  return assertEx15(asChainId(config.chain.id), () => "Invalid chain.id in config");
 }, "getXl1ChainId");
 
 // src/config/getXl1TokenAddress.ts
-import { isDefined as isDefined8 } from "@xylabs/sdk-js";
+import { isDefined as isDefined9 } from "@xylabs/sdk-js";
 var getXl1TokenAddress = /* @__PURE__ */ __name((config) => {
   const token = asToken(config.xl1TokenAddress);
-  if (isDefined8(token)) return token;
+  if (isDefined9(token)) return token;
   return getXl1ChainId(config);
 }, "getXl1TokenAddress");
 
@@ -856,7 +908,7 @@ var validateBridgeEstimateExact = /* @__PURE__ */ __name(async (intent, transfer
 }, "validateBridgeEstimateExact");
 
 // src/util/validateBridgeTransaction.ts
-import { asAddress as asAddress4, isDefined as isDefined9 } from "@xylabs/sdk-js";
+import { asAddress as asAddress4, isDefined as isDefined10 } from "@xylabs/sdk-js";
 import { addressesContains, BoundWitnessValidator, payloadHashesContainsAll } from "@xyo-network/boundwitness-validator";
 import { PayloadBuilder as PayloadBuilder11 } from "@xyo-network/sdk-js";
 var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent, transfer, config) => {
@@ -864,7 +916,7 @@ var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent
   const chainId = getXl1ChainId(config);
   if (signedTxBw.chain !== chainId) return false;
   const errors = await new BoundWitnessValidator(signedTxBw).validate();
-  if (isDefined9(errors) && errors.length > 0) return false;
+  if (isDefined10(errors) && errors.length > 0) return false;
   const sender = asAddress4(srcAddress, true);
   if (!addressesContains(signedTxBw, sender)) return false;
   const hashes = await PayloadBuilder11.hashes([
@@ -932,7 +984,7 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteEstimate.ts
 import { requestHandlerValidator as requestHandlerValidator4 } from "@xylabs/express";
-import { assertEx as assertEx15, toAddress as toAddress3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx16, toAddress as toAddress3 } from "@xylabs/sdk-js";
 import { PayloadZodStrictOfSchema as PayloadZodStrictOfSchema3 } from "@xyo-network/sdk-js";
 import { BridgeIntentFieldsZod as BridgeIntentFieldsZod2, BridgeIntentSchema as BridgeIntentSchema3, buildUnsignedTransaction, toXL1BlockNumber, TransactionBoundWitnessZod, TransferZod as TransferZod2 } from "@xyo-network/xl1-sdk";
 import { z as z3 } from "zod";
@@ -963,7 +1015,7 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) =
       const { srcAddress, srcAmount, destAddress } = req.body;
       const [bridgeIntent, transfer] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config);
       const sender = toAddress3(srcAddress);
-      const viewer = assertEx15(gateway.connection.viewer, () => new Error("Viewer not available on gateway connection"));
+      const viewer = assertEx16(gateway.connection.viewer, () => new Error("Viewer not available on gateway connection"));
       const currentBlockNumber = await viewer.currentBlockNumber();
       const nbf = toXL1BlockNumber(currentBlockNumber, true);
       const exp = toXL1BlockNumber(currentBlockNumber + 1e3, true);
@@ -983,7 +1035,7 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) =
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteStatus.ts
 import { requestHandlerValidator as requestHandlerValidator5 } from "@xylabs/express";
-import { asHex as asHex3, isDefined as isDefined10 } from "@xylabs/sdk-js";
+import { asHex as asHex3, isDefined as isDefined11 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder13, PayloadZodStrictOfSchema as PayloadZodStrictOfSchema4 } from "@xyo-network/sdk-js";
 import { asBridgeIntent, BridgeDestinationObservationFieldsZod as BridgeDestinationObservationFieldsZod2, BridgeDestinationObservationSchema as BridgeDestinationObservationSchema2, BridgeIntentFieldsZod as BridgeIntentFieldsZod3, BridgeIntentSchema as BridgeIntentSchema4, BridgeSourceObservationFieldsZod as BridgeSourceObservationFieldsZod2, BridgeSourceObservationSchema as BridgeSourceObservationSchema2, isBridgeIntent as isBridgeIntent5 } from "@xyo-network/xl1-sdk";
 import { Queue } from "bullmq";
@@ -1072,7 +1124,7 @@ var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
       const result = [];
       const queues = getStatusQueues(config);
       const statusQueueJobs = await getStatusQueueJobs(queues, jobId);
-      const tx = Object.values(statusQueueJobs).map((job) => job?.data?.tx).find((tx2) => isDefined10(tx2));
+      const tx = Object.values(statusQueueJobs).map((job) => job?.data?.tx).find((tx2) => isDefined11(tx2));
       if (!tx) return res.sendStatus(404);
       const bridgeIntent = tx[1].find(isBridgeIntent5);
       if (!bridgeIntent) return res.sendStatus(404);
@@ -1080,7 +1132,7 @@ var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
       const { xl1TransactionMonitorJob } = statusQueueJobs;
       const xl1MonitorState = xl1TransactionMonitorJob ? await xl1TransactionMonitorJob.getState() : void 0;
       const srcConfirmation = asHex3(jobId);
-      if (xl1MonitorState === "completed" && isDefined10(srcConfirmation)) {
+      if (xl1MonitorState === "completed" && isDefined11(srcConfirmation)) {
         const bridgeCommonFieldsZod = z4.object({}).extend(BridgeSourceObservationFieldsZod2.shape);
         const bridgeCommonFields = bridgeCommonFieldsZod.parse(bridgeIntent);
         const observation = {
@@ -1092,9 +1144,9 @@ var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
       }
       const { ethTransactionMonitorJob } = statusQueueJobs;
       const ethMonitorState = ethTransactionMonitorJob ? await ethTransactionMonitorJob.getState() : void 0;
-      const blockHash = ethTransactionMonitorJob?.returnvalue?.blockHash;
-      const destConfirmation = asHex3(blockHash);
-      if (ethMonitorState === "completed" && isDefined10(blockHash)) {
+      const submissionHash = ethTransactionMonitorJob?.returnvalue?.submissionHash;
+      const destConfirmation = asHex3(submissionHash);
+      if (ethMonitorState === "completed" && isDefined11(submissionHash)) {
         const bridgeDestinationFieldsZod = z4.object({}).extend(BridgeDestinationObservationFieldsZod2.shape);
         const bridgeDestinationFields = bridgeDestinationFieldsZod.parse({
           ...bridgeIntent,
@@ -1157,10 +1209,10 @@ var getApp = /* @__PURE__ */ __name((config, gateway) => {
 }, "getApp");
 
 // src/services/getServices.ts
-import { assertEx as assertEx16, isDefined as isDefined11 } from "@xylabs/sdk-js";
+import { assertEx as assertEx17, isDefined as isDefined12 } from "@xylabs/sdk-js";
 import { initEvmProvider } from "@xyo-network/chain-orchestration";
+import { HDWallet as HDWallet2 } from "@xyo-network/sdk-js";
 import { BridgeableToken__factory, LiquidityPoolBridge__factory } from "@xyo-network/typechain";
-import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
 import { getAddress as getAddress2, Wallet } from "ethers";
 
 // src/services/getIterableMap.ts
@@ -1202,12 +1254,12 @@ var getServices = /* @__PURE__ */ __name(async (context, gateway) => {
   const xl1TxStateMap = await getIterableMap(config, "liquidity_bridge_xl1_to_eth_xl1_tx_state");
   const provider = await initEvmProvider(context);
   const { remoteBridgeContractAddress, remoteChainWalletPrivateKey, remoteTokenAddress, mnemonic } = config;
-  const account = isDefined11(mnemonic) ? await HDWallet2.fromPhrase(mnemonic) : await HDWallet2.random();
+  const account = isDefined12(mnemonic) ? await HDWallet2.fromPhrase(mnemonic) : await HDWallet2.random();
   const wallet = new Wallet(remoteChainWalletPrivateKey, provider);
   const bridgeableToken = BridgeableToken__factory.connect(getAddress2(remoteTokenAddress), wallet);
   const bridge = LiquidityPoolBridge__factory.connect(getAddress2(remoteBridgeContractAddress), wallet);
   const bridgeOwner = await bridge.owner();
-  assertEx16(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
+  assertEx17(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
   return {
     account,
     bridge,
@@ -1223,7 +1275,8 @@ var getServices = /* @__PURE__ */ __name(async (context, gateway) => {
 // src/server/addWorkers.ts
 var addWorkers = /* @__PURE__ */ __name((config, services) => {
   const connection2 = getConnection(config);
-  createWorkers(connection2, services);
+  const telemetry2 = getTelemetry();
+  createWorkers(connection2, telemetry2, services);
 }, "addWorkers");
 
 // src/server/server.ts