@xyo-network/chain-bridge 1.19.16 → 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);
@@ -406,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)
@@ -421,6 +428,7 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
           tx
         },
         opts: {
+          jobId,
           attempts: 60,
           backoff: {
             type: "fixed",
@@ -443,6 +451,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                 data: {
                   tx
                 },
+                opts: {
+                  jobId
+                },
                 children: [
                   {
                     // Step 3
@@ -452,6 +463,7 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                       tx
                     },
                     opts: {
+                      jobId,
                       attempts: 60,
                       backoff: {
                         type: "fixed",
@@ -466,6 +478,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                         data: {
                           tx
                         },
+                        opts: {
+                          jobId
+                        },
                         children: [
                           {
                             // Step 1 (runs first as deepest child)
@@ -473,6 +488,9 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                             queueName: Xl1TransactionPreparation.queueName,
                             data: {
                               tx
+                            },
+                            opts: {
+                              jobId
                             }
                           }
                         ]
@@ -746,7 +764,7 @@ var makeBridgeFromRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemote.ts
 import { requestHandlerValidator as requestHandlerValidator3 } from "@xylabs/express";
-import { PayloadBuilder as PayloadBuilder11, PayloadZodLooseOfSchema, PayloadZodStrictOfSchema as PayloadZodStrictOfSchema2 } 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";
 
@@ -787,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) => {
@@ -811,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);
@@ -823,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);
@@ -849,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
   ]);
@@ -897,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);
@@ -965,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/sdk-js";
-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;
       }
@@ -1099,7 +1157,7 @@ var getApp = /* @__PURE__ */ __name((config, gateway) => {
 }, "getApp");
 
 // src/services/getServices.ts
-import { assertEx as assertEx16, 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";
@@ -1144,7 +1202,7 @@ 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);