@xyo-network/chain-bridge 1.20.4 → 1.20.8

package/dist/node/index.mjs

@@ -7,9 +7,8 @@ import { asBridgeConfigContext } from "@xyo-network/chain-orchestration";
 import { ActorV3, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
 
 // src/server/app.ts
-import { customPoweredByHeader, disableCaseSensitiveRouting, disableExpressDefaultPoweredByHeader, getJsonBodyParser, getJsonBodyParserOptions, responseProfiler, standardErrors, standardResponses } from "@xylabs/express";
-import compression from "compression";
-import cors from "cors";
+import { standardErrors } from "@xylabs/express";
+import { sharedMiddleware } from "@xyo-network/chain-orchestration";
 import express from "express";
 
 // src/queue/connection.ts
@@ -118,12 +117,8 @@ import { hexToBigInt, toHex } from "@xylabs/sdk-js";
 var calculateBridgeFees = /* @__PURE__ */ __name((srcAmount, feeStructure) => {
   const { feeFixed, feeRateBasisPoints } = feeStructure;
   const srcAmountBigInt = hexToBigInt(srcAmount);
-  const feeFixedBigInt = hexToBigInt(feeFixed);
   const feeVariableBigInt = srcAmountBigInt * BigInt(feeRateBasisPoints) / 10000n;
   const feeVariable = toHex(feeVariableBigInt);
-  const feeTotalBigInt = feeFixedBigInt + feeVariableBigInt;
-  const destAmountBigInt = srcAmountBigInt > feeTotalBigInt ? srcAmountBigInt - feeTotalBigInt : 0n;
-  const destAmount = toHex(destAmountBigInt);
   return {
     feeFixed,
     feeVariable,
@@ -368,8 +363,12 @@ var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent
 // src/validation/validateSufficientLiquiditySourceAllowance.ts
 import { assertEx as assertEx7, hexToBigInt as hexToBigInt3 } from "@xylabs/sdk-js";
 import { isBridgeIntent } from "@xyo-network/xl1-sdk";
-var validateSufficientLiquiditySourceAllowance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
-  const bridgeIntent = assertEx7(tx[1].find(isBridgeIntent), () => "No bridge intent found");
+var validateSufficientLiquiditySourceAllowance = /* @__PURE__ */ __name(async (tx, offChainPayloads, bridgeableToken, bridge, logger) => {
+  const allPayloads = [
+    ...tx[1],
+    ...offChainPayloads
+  ];
+  const bridgeIntent = assertEx7(allPayloads.find(isBridgeIntent), () => "No bridge intent found");
   const amount = hexToBigInt3(bridgeIntent.destAmount);
   const liquiditySourceAddress = await bridge.liquiditySource();
   const bridgeAddress = await bridge.getAddress();
@@ -381,8 +380,12 @@ var validateSufficientLiquiditySourceAllowance = /* @__PURE__ */ __name(async (t
 // src/validation/validateSufficientLiquiditySourceBalance.ts
 import { assertEx as assertEx8, hexToBigInt as hexToBigInt4 } from "@xylabs/sdk-js";
 import { isBridgeIntent as isBridgeIntent2 } from "@xyo-network/xl1-sdk";
-var validateSufficientLiquiditySourceBalance = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, logger) => {
-  const bridgeIntent = assertEx8(tx[1].find(isBridgeIntent2), () => "No bridge intent found");
+var validateSufficientLiquiditySourceBalance = /* @__PURE__ */ __name(async (tx, offChainPayloads, bridgeableToken, bridge, logger) => {
+  const allPayloads = [
+    ...tx[1],
+    ...offChainPayloads
+  ];
+  const bridgeIntent = assertEx8(allPayloads.find(isBridgeIntent2), () => "No bridge intent found");
   const amount = hexToBigInt4(bridgeIntent.destAmount);
   const liquiditySourceAddress = await bridge.liquiditySource();
   const balance = await bridgeableToken.balanceOf(liquiditySourceAddress);
@@ -436,21 +439,25 @@ var createWorker2 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
   const stateMap = assertEx11(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
   const wallet = assertEx11(services?.wallet, () => "wallet service not provided");
   const worker = new Worker2(queueName2, async (job) => {
-    const { tx } = job.data;
+    const { tx, offChainPayloads } = job.data;
     const hash = await PayloadBuilder5.hash(tx[0]);
     await job.log(`[${hash}] preparing ETH transaction`);
     await job.log(`[${hash}] validating liquiditySource has sufficient allowance`);
-    if (!await validateSufficientLiquiditySourceAllowance(tx, bridgeableToken, bridge, job)) {
+    if (!await validateSufficientLiquiditySourceAllowance(tx, offChainPayloads, 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 validateSufficientLiquiditySourceBalance(tx, bridgeableToken, bridge, job)) {
+    if (!await validateSufficientLiquiditySourceBalance(tx, offChainPayloads, 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 = assertEx11(tx[1].find(isBridgeIntent3), () => "No bridge intent found");
+    const allPayloads = [
+      ...tx[1],
+      ...offChainPayloads
+    ];
+    const bridgeIntent = assertEx11(allPayloads.find(isBridgeIntent3), () => "No bridge intent found");
     const amount = hexToBigInt6(bridgeIntent.destAmount);
     const srcAddress = getAddress(bridgeIntent.srcAddress);
     const destAddress = getAddress(bridgeIntent.destAddress);
@@ -496,9 +503,13 @@ import { Worker as Worker3 } from "bullmq";
 import { assertEx as assertEx12, hexToBigInt as hexToBigInt7, toEthAddress } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/sdk-js";
 import { isBridgeIntent as isBridgeIntent4 } from "@xyo-network/xl1-sdk";
-var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, bridge, wallet) => {
+var submitEthTransaction = /* @__PURE__ */ __name(async (tx, offChainPayloads, bridge, wallet) => {
   const xl1Transaction = assertEx12(tx[0], () => "No corresponding XL1 transaction found");
-  const bridgeIntent = assertEx12(tx[1].find(isBridgeIntent4), () => "No bridge intent found");
+  const allPayloads = [
+    ...tx[1],
+    ...offChainPayloads
+  ];
+  const bridgeIntent = assertEx12(allPayloads.find(isBridgeIntent4), () => "No bridge intent found");
   const srcAddress = toEthAddress(bridgeIntent.srcAddress);
   const destAddress = toEthAddress(bridgeIntent.destAddress);
   const amount = hexToBigInt7(bridgeIntent.destAmount);
@@ -509,10 +520,8 @@ var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, br
 }, "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);
+var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, offChain = [], gateway) => {
+  const result = await gateway.addTransactionToChain(preparedTx, offChain);
   return result;
 }, "submitXl1Transaction");
 
@@ -521,11 +530,10 @@ var name3 = "Submit ETH Transaction";
 var queueName3 = "eth-tx-submit";
 var createWorker3 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
   const bridge = assertEx13(services?.bridge, () => "bridge service not provided");
-  const bridgeableToken = assertEx13(services?.bridgeableToken, () => "bridgeableToken service not provided");
   const wallet = assertEx13(services?.wallet, () => "wallet service not provided");
   const stateMap = assertEx13(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
   const worker = new Worker3(queueName3, async (job) => {
-    const { tx } = job.data;
+    const { tx, offChainPayloads } = job.data;
     const hash = await PayloadBuilder7.hash(tx[0]);
     const state = assertEx13(await stateMap.get(hash), () => `[${hash}] state not found`);
     const { submissionHash: existingSubmissionHash } = state;
@@ -536,7 +544,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
       };
     }
     await job.log(`[${hash}] Submitting ETH tx`);
-    const submissionHash = assertEx13(await submitEthTransaction(tx, bridgeableToken, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`);
+    const submissionHash = assertEx13(await submitEthTransaction(tx, offChainPayloads, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`);
     await job.log(`[${hash}] Submitted ETH tx and received submission response hash ${submissionHash}`);
     return {
       submissionHash
@@ -694,12 +702,13 @@ var queueName7 = "xl1-tx-prepare";
 var createWorker7 = /* @__PURE__ */ __name((connection2, telemetry2, services) => {
   const stateMap = assertEx16(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker7(queueName7, async (job) => {
-    const { tx } = job.data;
+    const { tx, offChainPayloads = [] } = job.data;
     const hash = await PayloadBuilder10.hash(tx[0]);
     await job.log(`[${hash}] preparing XL1 transaction`);
     const preparedTx = tx;
     await job.log(`[${hash}] storing XL1 preparedTx`);
     await stateMap.set(hash, {
+      offChainPayloads,
       preparedTx
     });
     await job.log(`[${hash}] stored XL1 preparedTx`);
@@ -738,16 +747,16 @@ var createWorker8 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const { tx } = job.data;
     const hash = await PayloadBuilder11.hash(tx[0]);
     const state = assertEx17(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx17(state?.preparedTx, () => `[${hash}] preparedTx not found`);
-    const { submissionHash: existingSubmissionHash } = state;
+    const { preparedTx, offChainPayloads = [], submissionHash: existingSubmissionHash } = state;
     if (isDefined9(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
       return {
         submissionHash: existingSubmissionHash
       };
     }
+    const txToSubmit = assertEx17(preparedTx, () => `[${hash}] preparedTx not found`);
     await job.log(`[${hash}] Submitting XL1 tx`);
-    const [submissionHash] = await submitXl1Transaction(preparedTx, gateway);
+    const [submissionHash] = await submitXl1Transaction(txToSubmit, offChainPayloads, gateway);
     await job.log(`[${hash}] Submitted XL1 tx`);
     return {
       submissionHash
@@ -827,14 +836,15 @@ var getJobIdForXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (tx) => {
 }, "getJobIdForXl1ToEthBridgeJob");
 
 // src/queue/flows/createXl1ToEthBridgeJob/createXl1ToEthBridgeJob.ts
-var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) => {
+var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx, offChainPayloads = []) => {
   const jobId = await getJobIdForXl1ToEthBridgeJob(tx);
   const flow = await flowProducer2.add({
     // Step 0 (runs first as parent job)
     name: Xl1ToEthBridgeParent.name,
     queueName: Xl1ToEthBridgeParent.queueName,
     data: {
-      tx
+      tx,
+      offChainPayloads
     },
     opts: {
       jobId
@@ -877,7 +887,8 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                 name: EthTransactionSubmission.name,
                 queueName: EthTransactionSubmission.queueName,
                 data: {
-                  tx
+                  tx,
+                  offChainPayloads
                 },
                 opts: {
                   jobId
@@ -888,7 +899,8 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                     name: EthTransactionPreparation.name,
                     queueName: EthTransactionPreparation.queueName,
                     data: {
-                      tx
+                      tx,
+                      offChainPayloads
                     },
                     opts: {
                       jobId,
@@ -947,7 +959,8 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
                                     name: Xl1TransactionPreparation.name,
                                     queueName: Xl1TransactionPreparation.queueName,
                                     data: {
-                                      tx
+                                      tx,
+                                      offChainPayloads
                                     },
                                     opts: {
                                       jobId,
@@ -1227,8 +1240,7 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
       const singedHydratedTransaction = [
         signedTxBw,
         [
-          transfer,
-          bridgeIntent
+          transfer
         ]
       ];
       const existingFlow = await getXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction);
@@ -1236,7 +1248,9 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
         res.status(200).send();
         return;
       }
-      await createXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction);
+      await createXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction, [
+        bridgeIntent
+      ]);
       const srcConfirmation = await PayloadBuilder14.hash(signedTxBw);
       const bridgeCommonFieldsZod = z2.object({}).extend(BridgeSourceObservationFieldsZod.shape);
       const bridgeCommonFields = bridgeCommonFieldsZod.parse(bridgeIntent);
@@ -1344,9 +1358,13 @@ var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
       const result = [];
       const queues = getXl1ToEthQueues(config);
       const statusQueueJobs = await getStatusQueueJobs(queues, jobId);
-      const tx = statusQueueJobs.xl1ToEthBridgeParentJob?.data?.tx;
+      const { tx, offChainPayloads = [] } = statusQueueJobs.xl1ToEthBridgeParentJob?.data ?? {};
       if (!tx) return res.sendStatus(404);
-      const bridgeIntent = tx[1].find(isBridgeIntent5);
+      const allPayloads = [
+        ...tx[1],
+        ...offChainPayloads
+      ];
+      const bridgeIntent = allPayloads.find(isBridgeIntent5);
       if (!bridgeIntent) return res.sendStatus(404);
       result[0] = asBridgeIntent(PayloadBuilder15.omitMeta(bridgeIntent));
       const { xl1TransactionMonitorJob } = statusQueueJobs;
@@ -1412,17 +1430,7 @@ var addRoutes = /* @__PURE__ */ __name((app, config, gateway) => {
 var getApp = /* @__PURE__ */ __name((config, gateway) => {
   addInstrumentation();
   const app = express();
-  app.set("etag", false);
-  app.use(cors());
-  app.use(compression());
-  app.use(responseProfiler);
-  app.use(getJsonBodyParser(getJsonBodyParserOptions({
-    limit: "1mb"
-  })));
-  app.use(standardResponses);
-  disableExpressDefaultPoweredByHeader(app);
-  app.use(customPoweredByHeader);
-  disableCaseSensitiveRouting(app);
+  sharedMiddleware(app);
   addFlowProducer(app, config);
   addRoutes(app, config, gateway);
   app.use(standardErrors);