@xyo-network/chain-bridge 1.19.15 → 1.19.17

package/dist/node/index.mjs

@@ -40,6 +40,9 @@ var getFlowProducer = /* @__PURE__ */ __name((connection2) => {
   return flowProducer;
 }, "getFlowProducer");
 
+// src/queue/flows/createXl1ToEthBridgeJob.ts
+import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/sdk-js";
+
 // src/queue/workers/createWorkers.ts
 var createWorkers = /* @__PURE__ */ __name((connection2, services) => {
   Xl1ToEthBridgeParent.createWorker(connection2);
@@ -91,26 +94,88 @@ var EthTransactionMonitor = {
 };
 
 // src/queue/workers/EthTransactionPreparation.ts
-import { assertEx as assertEx2, hexToBigInt } from "@xylabs/sdk-js";
-import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/sdk-js";
-import { isBridgeIntent } from "@xyo-network/xl1-sdk";
+import { assertEx as assertEx5, 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";
 import { getAddress } from "ethers";
+
+// src/queue/workers/util/submitEthTransaction.ts
+import { assertEx as assertEx2, hexToBigInt, toEthAddress } from "@xylabs/sdk-js";
+import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/sdk-js";
+import { isBridgeIntent } from "@xyo-network/xl1-sdk";
+var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, wallet) => {
+  const xl1Transaction = assertEx2(tx[0], () => "No corresponding XL1 transaction found");
+  const bridgeIntent = assertEx2(tx[1].find(isBridgeIntent), () => "No bridge intent found");
+  const srcAddress = toEthAddress(bridgeIntent.srcAddress);
+  const destAddress = toEthAddress(bridgeIntent.destAddress);
+  const amount = hexToBigInt(bridgeIntent.destAmount);
+  const nonce = hexToBigInt(await PayloadBuilder2.hash(xl1Transaction));
+  const bridgeTx = await bridge.connect(wallet).bridgeFromRemote(srcAddress, destAddress, amount, nonce);
+  const receipt = await bridgeTx.wait(1);
+  return receipt?.hash;
+}, "submitEthTransaction");
+
+// src/queue/workers/util/submitXl1Transaction.ts
+import { isAllowedBlockPayload } from "@xyo-network/xl1-sdk";
+var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, gateway) => {
+  const offChainPayloads = preparedTx[1].filter((p) => !isAllowedBlockPayload(p));
+  const result = await gateway.addTransactionToChain(preparedTx, offChainPayloads);
+  return result;
+}, "submitXl1Transaction");
+
+// src/queue/workers/util/validateSufficientAllowance.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) => {
+  const bridgeIntent = assertEx3(tx[1].find(isBridgeIntent2), () => "No bridge intent found");
+  const amount = hexToBigInt2(bridgeIntent.destAmount);
+  const liquiditySourceAddress = await bridge.liquiditySource();
+  const bridgeAddress = await bridge.getAddress();
+  const remainingAllowance = await bridgeableToken.allowance(liquiditySourceAddress, bridgeAddress);
+  await logger?.log(`Remaining allowance: ${remainingAllowance.toString()}`);
+  return remainingAllowance >= amount;
+}, "validateSufficientAllowance");
+
+// src/queue/workers/util/validateSufficientBalance.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) => {
+  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");
+
+// src/queue/workers/EthTransactionPreparation.ts
 var name2 = "Prepare ETH Transaction";
 var queueName2 = "eth-tx-prepare";
 var createWorker2 = /* @__PURE__ */ __name((connection2, services) => {
-  const bridge = assertEx2(services?.bridge, () => "bridge service not provided");
-  const stateMap = assertEx2(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+  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");
   const worker = new Worker2(queueName2, async (job) => {
     const { tx } = job.data;
-    const hash = await PayloadBuilder2.hash(tx[0]);
+    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)) {
+      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)) {
+      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 = assertEx2(tx[1].find(isBridgeIntent), () => "No bridge intent found");
-    const amount = hexToBigInt(bridgeIntent.destAmount);
+    const bridgeIntent = assertEx5(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 = hexToBigInt(await PayloadBuilder2.hash(tx[0]));
+    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}] storing ETH preparedTx`);
@@ -137,47 +202,21 @@ var EthTransactionPreparation = {
 };
 
 // src/queue/workers/EthTransactionSubmission.ts
-import { assertEx as assertEx4, isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx6, isDefined as isDefined3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/sdk-js";
 import { Worker as Worker3 } from "bullmq";
-
-// src/queue/workers/util/submitEthTransaction.ts
-import { assertEx as assertEx3, hexToBigInt as hexToBigInt2, toEthAddress } from "@xylabs/sdk-js";
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/sdk-js";
-import { isBridgeIntent as isBridgeIntent2 } from "@xyo-network/xl1-sdk";
-var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, wallet) => {
-  const xl1Transaction = assertEx3(tx[0], () => "No corresponding XL1 transaction found");
-  const bridgeIntent = assertEx3(tx[1].find(isBridgeIntent2), () => "No bridge intent found");
-  const srcAddress = toEthAddress(bridgeIntent.srcAddress);
-  const destAddress = toEthAddress(bridgeIntent.destAddress);
-  const amount = hexToBigInt2(bridgeIntent.destAmount);
-  const nonce = hexToBigInt2(await PayloadBuilder3.hash(xl1Transaction));
-  const bridgeTx = await bridge.connect(wallet).bridgeFromRemote(srcAddress, destAddress, amount, nonce);
-  const receipt = await bridgeTx.wait(1);
-  return receipt?.hash;
-}, "submitEthTransaction");
-
-// src/queue/workers/util/submitXl1Transaction.ts
-import { isAllowedBlockPayload } from "@xyo-network/xl1-sdk";
-var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, gateway) => {
-  const offChainPayloads = preparedTx[1].filter((p) => !isAllowedBlockPayload(p));
-  const result = await gateway.addTransactionToChain(preparedTx, offChainPayloads);
-  return result;
-}, "submitXl1Transaction");
-
-// src/queue/workers/EthTransactionSubmission.ts
 var name3 = "Submit ETH Transaction";
 var queueName3 = "eth-tx-submit";
 var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
-  const bridge = assertEx4(services?.bridge, () => "bridge service not provided");
-  const bridgeableToken = assertEx4(services?.bridgeableToken, () => "bridgeableToken service not provided");
-  const wallet = assertEx4(services?.wallet, () => "wallet service not provided");
-  const stateMap = assertEx4(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+  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");
   const worker = new Worker3(queueName3, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder4.hash(tx[0]);
-    const state = assertEx4(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx4(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx6(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx6(state?.preparedTx, () => `[${hash}] preparedTx not found`);
     const { submissionHash: existingSubmissionHash } = state;
     if (isDefined3(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
@@ -186,7 +225,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
       };
     }
     await job.log(`[${hash}] Submitting ETH tx`);
-    const submissionHash = assertEx4(await submitEthTransaction(tx, bridgeableToken, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`);
+    const submissionHash = assertEx6(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;
@@ -240,20 +279,20 @@ var Xl1ToEthBridgeParent = {
 };
 
 // src/queue/workers/Xl1TransactionMonitor.ts
-import { assertEx as assertEx5, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
+import { assertEx as assertEx7, 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 = assertEx5(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx5(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const gateway = assertEx7(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx7(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 = assertEx5(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`);
-    const state = assertEx5(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const submissionHash = assertEx5(state?.submissionHash, () => `[${hash}] submissionHash not found`);
+    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`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transactionByHash(submissionHash);
     if (isDefined4(foundTx) && !isNull(foundTx)) {
@@ -286,13 +325,13 @@ var Xl1TransactionMonitor = {
 };
 
 // src/queue/workers/Xl1TransactionPreparation.ts
-import { assertEx as assertEx6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx8 } 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 = assertEx6(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const stateMap = assertEx8(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker6(queueName6, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder6.hash(tx[0]);
@@ -322,19 +361,19 @@ var Xl1TransactionPreparation = {
 };
 
 // src/queue/workers/Xl1TransactionSubmission.ts
-import { assertEx as assertEx7, isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx9, 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 = assertEx7(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx7(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const gateway = assertEx9(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx9(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 = assertEx7(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx7(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx9(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx9(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}`);
@@ -370,12 +409,16 @@ var Xl1TransactionSubmission = {
 
 // src/queue/flows/createXl1ToEthBridgeJob.ts
 var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) => {
+  const jobId = await PayloadBuilder8.hash(tx[0]);
   const flow = await flowProducer2.add({
     name: Xl1ToEthBridgeParent.name,
     queueName: Xl1ToEthBridgeParent.queueName,
     data: {
       tx
     },
+    opts: {
+      jobId
+    },
     children: [
       {
         // Step 6 (runs after child completes)
@@ -385,6 +428,7 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
           tx
         },
         opts: {
+          jobId,
           attempts: 60,
           backoff: {
             type: "fixed",
@@ -407,6 +451,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                 data: {
                   tx
                 },
+                opts: {
+                  jobId
+                },
                 children: [
                   {
                     // Step 3
@@ -416,6 +463,7 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                       tx
                     },
                     opts: {
+                      jobId,
                       attempts: 60,
                       backoff: {
                         type: "fixed",
@@ -430,6 +478,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                         data: {
                           tx
                         },
+                        opts: {
+                          jobId
+                        },
                         children: [
                           {
                             // Step 1 (runs first as deepest child)
@@ -437,6 +488,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                             queueName: Xl1TransactionPreparation.queueName,
                             data: {
                               tx
+                            },
+                            opts: {
+                              jobId
                             }
                           }
                         ]
@@ -495,14 +549,14 @@ var asToken = /* @__PURE__ */ __name((value) => {
 }, "asToken");
 
 // src/config/getBridgeEscrowAddress.ts
-import { asAddress as asAddress2, assertEx as assertEx8 } from "@xylabs/sdk-js";
+import { asAddress as asAddress2, assertEx as assertEx10 } 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 assertEx9 } from "@xylabs/sdk-js";
+import { asAddress as asAddress3, assertEx as assertEx11 } from "@xylabs/sdk-js";
 var tryGetBridgeFeesAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress3(config.feesAddress);
   return address;
@@ -530,17 +584,17 @@ var getMinBridgeAmount = /* @__PURE__ */ __name((config) => {
 }, "getMinBridgeAmount");
 
 // src/config/getRemoteChainId.ts
-import { assertEx as assertEx10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx12 } from "@xylabs/sdk-js";
 var getRemoteChainId = /* @__PURE__ */ __name((config) => {
-  const remoteChainId = assertEx10(asChainId(config.remoteChainId), () => "Invalid remote chain ID in config");
+  const remoteChainId = assertEx12(asChainId(config.remoteChainId), () => "Invalid remote chain ID in config");
   return remoteChainId;
 }, "getRemoteChainId");
 
 // src/config/getRemoteTokenAddress.ts
-import { assertEx as assertEx11 } from "@xylabs/sdk-js";
+import { assertEx as assertEx13 } from "@xylabs/sdk-js";
 var getRemoteTokenAddress = /* @__PURE__ */ __name((config) => {
   const token = asToken(config.remoteTokenAddress);
-  return assertEx11(token, () => "Remote token address is not defined in bridge configuration");
+  return assertEx13(token, () => "Remote token address is not defined in bridge configuration");
 }, "getRemoteTokenAddress");
 
 // src/config/getBridgeWalletAccount.ts
@@ -578,13 +632,13 @@ var getTransferAddresses = /* @__PURE__ */ __name(async (config) => {
 }, "getTransferAddresses");
 
 // src/config/getXl1ChainId.ts
-import { assertEx as assertEx12, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx14, isDefined as isDefined7 } from "@xylabs/sdk-js";
 var getXl1ChainId = /* @__PURE__ */ __name((config) => {
   const xl1ChainId = config.xl1ChainId;
   if (isDefined7(xl1ChainId)) {
-    return assertEx12(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
+    return assertEx14(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
   }
-  return assertEx12(asChainId(config.chain.id), () => "Invalid chain.id in config");
+  return assertEx14(asChainId(config.chain.id), () => "Invalid chain.id in config");
 }, "getXl1ChainId");
 
 // src/config/getXl1TokenAddress.ts
@@ -650,7 +704,7 @@ var makeBridgeConfigRoute = /* @__PURE__ */ __name((config) => {
 // src/server/routes/bridge/routeDefinitions/routes/bridgeFromRemoteStatus.ts
 import { requestHandlerValidator as requestHandlerValidator2 } from "@xylabs/express";
 import { toAddress, toHex } from "@xylabs/sdk-js";
-import { PayloadZodStrictOfSchema } from "@xyo-network/payload-model";
+import { PayloadZodStrictOfSchema } from "@xyo-network/sdk-js";
 import { BridgeDestinationObservationFieldsZod, BridgeDestinationObservationSchema } from "@xyo-network/xl1-sdk";
 import { z } from "zod";
 
@@ -710,17 +764,16 @@ var makeBridgeFromRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemote.ts
 import { requestHandlerValidator as requestHandlerValidator3 } from "@xylabs/express";
-import { PayloadZodLooseOfSchema, PayloadZodStrictOfSchema as PayloadZodStrictOfSchema2 } from "@xyo-network/payload-model";
-import { PayloadBuilder as PayloadBuilder11 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder12, PayloadZodLooseOfSchema, PayloadZodStrictOfSchema as PayloadZodStrictOfSchema2 } from "@xyo-network/sdk-js";
 import { BridgeIntentFieldsZod, BridgeIntentSchema as BridgeIntentSchema2, BridgeSourceObservationFieldsZod, BridgeSourceObservationSchema, SignedTransactionBoundWitnessZod, TransferZod } from "@xyo-network/xl1-sdk";
 import { z as z2 } from "zod";
 
 // src/util/calculateBridgeFees.ts
-import { hexToBigInt as hexToBigInt3, toHex as toHex2 } from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt5, toHex as toHex2 } from "@xylabs/sdk-js";
 var calculateBridgeFees = /* @__PURE__ */ __name((srcAmount, feeStructure) => {
   const { feeFixed, feeRateBasisPoints } = feeStructure;
-  const srcAmountBigInt = hexToBigInt3(srcAmount);
-  const feeFixedBigInt = hexToBigInt3(feeFixed);
+  const srcAmountBigInt = hexToBigInt5(srcAmount);
+  const feeFixedBigInt = hexToBigInt5(feeFixed);
   const feeVariableBigInt = srcAmountBigInt * BigInt(feeRateBasisPoints) / 10000n;
   const feeVariable = toHex2(feeVariableBigInt);
   const feeTotalBigInt = feeFixedBigInt + feeVariableBigInt;
@@ -734,12 +787,12 @@ var calculateBridgeFees = /* @__PURE__ */ __name((srcAmount, feeStructure) => {
 }, "calculateBridgeFees");
 
 // src/util/createBridgeTransfer.ts
-import { hexToBigInt as hexToBigInt4 } from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt6 } from "@xylabs/sdk-js";
 import { createTransferPayload } from "@xyo-network/xl1-sdk";
 var createBridgeTransfer = /* @__PURE__ */ __name((sender, srcAmount, escrowAddress, feesAddress, context) => {
   const { feeFixed, feeVariable } = context;
-  const escrowAmount = hexToBigInt4(srcAmount);
-  const feesAmount = hexToBigInt4(feeFixed) + hexToBigInt4(feeVariable);
+  const escrowAmount = hexToBigInt6(srcAmount);
+  const feesAmount = hexToBigInt6(feeFixed) + hexToBigInt6(feeVariable);
   const transfers = escrowAddress === feesAddress ? {
     [feesAddress]: escrowAmount + feesAmount
   } : {
@@ -752,7 +805,7 @@ var createBridgeTransfer = /* @__PURE__ */ __name((sender, srcAmount, escrowAddr
 
 // src/util/generateBridgeEstimate.ts
 import { toAddress as toAddress2 } from "@xylabs/sdk-js";
-import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder9 } from "@xyo-network/sdk-js";
 import { BridgeIntentSchema } from "@xyo-network/xl1-sdk";
 import { v4 } from "uuid";
 var generateBridgeEstimate = /* @__PURE__ */ __name(async (srcAddress, srcAmount, destAddress, config, nonceOverride) => {
@@ -776,7 +829,7 @@ var generateBridgeEstimate = /* @__PURE__ */ __name(async (srcAddress, srcAmount
     destToken: remoteTokenAddress,
     nonce
   };
-  const bridgeIntent = new PayloadBuilder8({
+  const bridgeIntent = new PayloadBuilder9({
     schema: BridgeIntentSchema
   }).fields(bridgeIntentFields).build();
   const transfer = createBridgeTransfer(sender, srcAmount, escrowAddress, feesAddress, fees);
@@ -788,24 +841,24 @@ var generateBridgeEstimate = /* @__PURE__ */ __name(async (srcAddress, srcAmount
 
 // src/util/validateBridgeEstimateExact.ts
 import { isUndefined as isUndefined3 } from "@xylabs/sdk-js";
-import { PayloadBuilder as PayloadBuilder9 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder10 } from "@xyo-network/sdk-js";
 var validateBridgeEstimateExact = /* @__PURE__ */ __name(async (intent, transfer, config) => {
   const { srcAddress, srcAmount, destAddress } = intent;
   const [calculatedIntent, calculatedTransfer] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config);
   if (isUndefined3(calculatedIntent) || isUndefined3(calculatedTransfer)) return false;
   const { nonce: expectedIntentNonce, ...expectedIntentStatic } = calculatedIntent;
   const { nonce: actualIntentNonce, ...actualIntentStatic } = intent;
-  if (await PayloadBuilder9.dataHash(expectedIntentStatic) !== await PayloadBuilder9.dataHash(actualIntentStatic)) return false;
+  if (await PayloadBuilder10.dataHash(expectedIntentStatic) !== await PayloadBuilder10.dataHash(actualIntentStatic)) return false;
   const { epoch: expectedTransferEpoch, ...expectedTransferStatic } = calculatedTransfer;
   const { epoch: actualTransferEpoch, ...actualTransferStatic } = transfer;
-  if (await PayloadBuilder9.dataHash(expectedTransferStatic) !== await PayloadBuilder9.dataHash(actualTransferStatic)) return false;
+  if (await PayloadBuilder10.dataHash(expectedTransferStatic) !== await PayloadBuilder10.dataHash(actualTransferStatic)) return false;
   return true;
 }, "validateBridgeEstimateExact");
 
 // src/util/validateBridgeTransaction.ts
 import { asAddress as asAddress4, isDefined as isDefined9 } from "@xylabs/sdk-js";
 import { addressesContains, BoundWitnessValidator, payloadHashesContainsAll } from "@xyo-network/boundwitness-validator";
-import { PayloadBuilder as PayloadBuilder10 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder11 } from "@xyo-network/sdk-js";
 var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent, transfer, config) => {
   const { srcAddress } = intent;
   const chainId = getXl1ChainId(config);
@@ -814,7 +867,7 @@ var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent
   if (isDefined9(errors) && errors.length > 0) return false;
   const sender = asAddress4(srcAddress, true);
   if (!addressesContains(signedTxBw, sender)) return false;
-  const hashes = await PayloadBuilder10.hashes([
+  const hashes = await PayloadBuilder11.hashes([
     intent,
     transfer
   ]);
@@ -862,14 +915,14 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
         ]
       ];
       await createXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction);
-      const srcConfirmation = await PayloadBuilder11.hash(signedTxBw);
+      const srcConfirmation = await PayloadBuilder12.hash(signedTxBw);
       const bridgeCommonFieldsZod = z2.object({}).extend(BridgeSourceObservationFieldsZod.shape);
       const bridgeCommonFields = bridgeCommonFieldsZod.parse(bridgeIntent);
       const bridgeObservationFields = {
         ...bridgeCommonFields,
         srcConfirmation
       };
-      const bridgeObservation = new PayloadBuilder11({
+      const bridgeObservation = new PayloadBuilder12({
         schema: BridgeSourceObservationSchema
       }).fields(bridgeObservationFields).build();
       res.json(bridgeObservation);
@@ -879,8 +932,8 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteEstimate.ts
 import { requestHandlerValidator as requestHandlerValidator4 } from "@xylabs/express";
-import { assertEx as assertEx13, toAddress as toAddress3 } from "@xylabs/sdk-js";
-import { PayloadZodStrictOfSchema as PayloadZodStrictOfSchema3 } from "@xyo-network/payload-model";
+import { assertEx as assertEx15, 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";
 var BridgeToRemoteEstimateBodyZod = BridgeIntentFieldsZod2.pick({
@@ -910,7 +963,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 = assertEx13(gateway.connection.viewer, () => new Error("Viewer not available on gateway connection"));
+      const viewer = assertEx15(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);
@@ -930,86 +983,126 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) =
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteStatus.ts
 import { requestHandlerValidator as requestHandlerValidator5 } from "@xylabs/express";
-import { asAddress as asAddress5, asHex as asHex3, toHex as toHex3 } from "@xylabs/sdk-js";
-import { PayloadZodStrictOfSchema as PayloadZodStrictOfSchema4 } from "@xyo-network/payload-model";
-import { BridgeDestinationObservationFieldsZod as BridgeDestinationObservationFieldsZod2, BridgeDestinationObservationSchema as BridgeDestinationObservationSchema2, BridgeIntentFieldsZod as BridgeIntentFieldsZod3, BridgeIntentSchema as BridgeIntentSchema4, BridgeSourceObservationFieldsZod as BridgeSourceObservationFieldsZod2, BridgeSourceObservationSchema as BridgeSourceObservationSchema2 } from "@xyo-network/xl1-sdk";
+import { asHex as asHex3, isDefined as isDefined10 } 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";
 import { z as z4 } from "zod";
+var BridgeIntentResponseZod = PayloadZodStrictOfSchema4(BridgeIntentSchema4).extend(BridgeIntentFieldsZod3.shape);
+var BridgeSourceResponseZod = PayloadZodStrictOfSchema4(BridgeSourceObservationSchema2).extend(BridgeSourceObservationFieldsZod2.shape);
+var BridgeDestinationResponseZod = PayloadZodStrictOfSchema4(BridgeDestinationObservationSchema2).extend(BridgeDestinationObservationFieldsZod2.shape);
 var BridgeToRemoteStatusResponseZod = z4.union([
   z4.tuple([]),
   z4.tuple([
-    PayloadZodStrictOfSchema4(BridgeIntentSchema4).extend(BridgeIntentFieldsZod3.shape)
+    BridgeIntentResponseZod
   ]),
   z4.tuple([
-    PayloadZodStrictOfSchema4(BridgeIntentSchema4).extend(BridgeIntentFieldsZod3.shape),
-    PayloadZodStrictOfSchema4(BridgeSourceObservationSchema2).extend(BridgeSourceObservationFieldsZod2.shape)
+    BridgeIntentResponseZod,
+    BridgeSourceResponseZod
   ]),
   z4.tuple([
-    PayloadZodStrictOfSchema4(BridgeIntentSchema4).extend(BridgeIntentFieldsZod3.shape),
-    PayloadZodStrictOfSchema4(BridgeSourceObservationSchema2).extend(BridgeSourceObservationFieldsZod2.shape),
-    PayloadZodStrictOfSchema4(BridgeDestinationObservationSchema2).extend(BridgeDestinationObservationFieldsZod2.shape)
+    BridgeIntentResponseZod,
+    BridgeSourceResponseZod,
+    BridgeDestinationResponseZod
   ])
 ]);
+var statusQueues;
+var getStatusQueues = /* @__PURE__ */ __name((config) => {
+  if (statusQueues) return statusQueues;
+  const connection2 = getConnection(config);
+  statusQueues = {
+    ethTransactionMonitor: new Queue(EthTransactionMonitor.queueName, {
+      connection: connection2
+    }),
+    ethTransactionPreparation: new Queue(EthTransactionPreparation.queueName, {
+      connection: connection2
+    }),
+    ethTransactionSubmission: new Queue(EthTransactionSubmission.queueName, {
+      connection: connection2
+    }),
+    xl1ToEthBridgeParent: new Queue(Xl1ToEthBridgeParent.queueName, {
+      connection: connection2
+    }),
+    xl1TransactionMonitor: new Queue(Xl1TransactionMonitor.queueName, {
+      connection: connection2
+    }),
+    xl1TransactionPreparation: new Queue(Xl1TransactionPreparation.queueName, {
+      connection: connection2
+    }),
+    xl1TransactionSubmission: new Queue(Xl1TransactionSubmission.queueName, {
+      connection: connection2
+    })
+  };
+  return statusQueues;
+}, "getStatusQueues");
+var getStatusQueueJobs = /* @__PURE__ */ __name(async (queues, jobId) => {
+  const [ethTransactionMonitorJob, ethTransactionPreparationJob, ethTransactionSubmissionJob, xl1ToEthBridgeParentJob, xl1TransactionMonitorJob, xl1TransactionPreparationJob, xl1TransactionSubmissionJob] = 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)
+  ]);
+  return {
+    ethTransactionMonitorJob,
+    ethTransactionPreparationJob,
+    ethTransactionSubmissionJob,
+    xl1ToEthBridgeParentJob,
+    xl1TransactionMonitorJob,
+    xl1TransactionPreparationJob,
+    xl1TransactionSubmissionJob
+  };
+}, "getStatusQueueJobs");
 var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
   const params = z4.object({
     chainId: getRemoteChainIdZod(config),
     nonce: z4.string().nonempty()
   });
-  const query = z4.object({
-    mockStatus: z4.coerce.number().default(0)
-  });
   const validateRequest2 = requestHandlerValidator5({
     params,
-    query,
     response: BridgeToRemoteStatusResponseZod
   });
   return {
     method: "get",
     path: "/bridge/chains/:chainId/bridgeToRemote/status/:nonce",
     handlers: validateRequest2(async (req, res) => {
-      const { chainId } = req.params;
-      const { mockStatus = 0 } = req.query;
+      const jobId = req.params.nonce;
       const result = [];
-      const { remoteTokenAddress, xl1ChainId, xl1TokenAddress } = await getBridgeSettings(config);
-      const src = xl1ChainId;
-      const srcAddress = asAddress5("2222222222222222222222222222222222222222", true);
-      const srcAmount = asHex3("0x200", true);
-      const srcToken = xl1TokenAddress;
-      const dest = chainId;
-      const destAddress = asAddress5("3333333333333333333333333333333333333333", true);
-      const destAmount = asHex3("0x100", true);
-      const destToken = remoteTokenAddress;
-      if (mockStatus === 0) return res.sendStatus(404);
-      if (mockStatus > 0) {
-        const [observation] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config, req.params.nonce);
-        result[0] = observation;
-      }
-      if (mockStatus > 1) {
+      const queues = getStatusQueues(config);
+      const statusQueueJobs = await getStatusQueueJobs(queues, jobId);
+      const tx = Object.values(statusQueueJobs).map((job) => job?.data?.tx).find((tx2) => isDefined10(tx2));
+      if (!tx) return res.sendStatus(404);
+      const bridgeIntent = tx[1].find(isBridgeIntent5);
+      if (!bridgeIntent) return res.sendStatus(404);
+      result[0] = asBridgeIntent(PayloadBuilder13.omitMeta(bridgeIntent));
+      const { xl1TransactionMonitorJob } = statusQueueJobs;
+      const xl1MonitorState = xl1TransactionMonitorJob ? await xl1TransactionMonitorJob.getState() : void 0;
+      const srcConfirmation = asHex3(jobId);
+      if (xl1MonitorState === "completed" && isDefined10(srcConfirmation)) {
+        const bridgeCommonFieldsZod = z4.object({}).extend(BridgeSourceObservationFieldsZod2.shape);
+        const bridgeCommonFields = bridgeCommonFieldsZod.parse(bridgeIntent);
         const observation = {
           schema: BridgeSourceObservationSchema2,
-          dest,
-          destAddress,
-          destAmount,
-          destToken,
-          src,
-          srcAddress,
-          srcAmount,
-          srcToken,
-          srcConfirmation: toHex3("0x8888")
+          ...bridgeCommonFields,
+          srcConfirmation
         };
         result[1] = observation;
       }
-      if (mockStatus > 2) {
+      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 bridgeDestinationFieldsZod = z4.object({}).extend(BridgeDestinationObservationFieldsZod2.shape);
+        const bridgeDestinationFields = bridgeDestinationFieldsZod.parse({
+          ...bridgeIntent,
+          destConfirmation
+        });
         const observation = {
           schema: BridgeDestinationObservationSchema2,
-          dest,
-          destAddress,
-          destAmount,
-          destToken,
-          src,
-          srcAddress,
-          srcAmount,
-          srcToken,
-          destConfirmation: toHex3("0x9999")
+          ...bridgeDestinationFields
         };
         result[2] = observation;
       }
@@ -1064,7 +1157,7 @@ var getApp = /* @__PURE__ */ __name((config, gateway) => {
 }, "getApp");
 
 // src/services/getServices.ts
-import { assertEx as assertEx14, isDefined as isDefined10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx16, isDefined as isDefined11 } from "@xylabs/sdk-js";
 import { initEvmProvider } from "@xyo-network/chain-orchestration";
 import { BridgeableToken__factory, LiquidityPoolBridge__factory } from "@xyo-network/typechain";
 import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
@@ -1109,12 +1202,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 = isDefined10(mnemonic) ? await HDWallet2.fromPhrase(mnemonic) : await HDWallet2.random();
+  const account = isDefined11(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();
-  assertEx14(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
+  assertEx16(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
   return {
     account,
     bridge,