@xyo-network/chain-bridge 1.20.1 → 1.20.3

package/dist/node/index.mjs

@@ -340,22 +340,28 @@ var validateBridgeEstimateExact = /* @__PURE__ */ __name(async (intent, transfer
 }, "validateBridgeEstimateExact");
 
 // src/validation/validateBridgeTransaction.ts
-import { asAddress as asAddress4, isDefined as isDefined6 } from "@xylabs/sdk-js";
-import { addressesContains, BoundWitnessValidator, payloadHashesContainsAll } from "@xyo-network/boundwitness-validator";
+import { asAddress as asAddress4 } from "@xylabs/sdk-js";
+import { addressesContains, BoundWitnessValidator, payloadHashesContainsAll, payloadSchemasContainsAll } from "@xyo-network/boundwitness-validator";
 import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/sdk-js";
+import { BridgeIntentSchema as BridgeIntentSchema2, TransferSchema } from "@xyo-network/xl1-sdk";
 var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent, transfer, config) => {
   const { srcAddress } = intent;
   const chainId = getXl1ChainId(config);
   if (signedTxBw.chain !== chainId) return false;
-  const errors = await new BoundWitnessValidator(signedTxBw).validate();
-  if (isDefined6(errors) && errors.length > 0) return false;
-  const sender = asAddress4(srcAddress, true);
-  if (!addressesContains(signedTxBw, sender)) return false;
+  if (signedTxBw.payload_hashes.length != 2) return false;
+  if (!payloadSchemasContainsAll(signedTxBw, [
+    BridgeIntentSchema2,
+    TransferSchema
+  ])) return false;
   const hashes = await PayloadBuilder4.hashes([
     intent,
     transfer
   ]);
   if (!payloadHashesContainsAll(signedTxBw, hashes)) return false;
+  const errors = await new BoundWitnessValidator(signedTxBw).validate();
+  if (errors.length > 0) return false;
+  const sender = asAddress4(srcAddress, true);
+  if (!addressesContains(signedTxBw, sender)) return false;
   return true;
 }, "validateBridgeTransaction");
 
@@ -482,7 +488,7 @@ var EthTransactionPreparation = {
 };
 
 // src/queue/workers/EthTransactionSubmission.ts
-import { assertEx as assertEx13, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx13, isDefined as isDefined6 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/sdk-js";
 import { Worker as Worker3 } from "bullmq";
 
@@ -523,7 +529,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const hash = await PayloadBuilder7.hash(tx[0]);
     const state = assertEx13(await stateMap.get(hash), () => `[${hash}] state not found`);
     const { submissionHash: existingSubmissionHash } = state;
-    if (isDefined7(existingSubmissionHash)) {
+    if (isDefined6(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
       return {
         submissionHash: existingSubmissionHash
@@ -555,7 +561,7 @@ var EthTransactionSubmission = {
 };
 
 // src/queue/workers/EthTransactionSubmissionStorage.ts
-import { assertEx as assertEx14, isDefined as isDefined8 } from "@xylabs/sdk-js";
+import { assertEx as assertEx14, isDefined as isDefined7 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/sdk-js";
 import { Worker as Worker4 } from "bullmq";
 var name4 = "Store ETH Transaction Submission";
@@ -567,7 +573,7 @@ var createWorker4 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const hash = await PayloadBuilder8.hash(tx[0]);
     const state = assertEx14(await stateMap.get(hash), () => `[${hash}] state not found`);
     const { submissionHash: existingSubmissionHash } = state;
-    if (isDefined8(existingSubmissionHash)) {
+    if (isDefined7(existingSubmissionHash)) {
       await job.log(`[${hash}] submissionHash already stored as ${existingSubmissionHash}`);
       return {
         submissionHash: existingSubmissionHash
@@ -631,7 +637,7 @@ var Xl1ToEthBridgeParent = {
 };
 
 // src/queue/workers/Xl1TransactionMonitor.ts
-import { assertEx as assertEx15, isDefined as isDefined9, isNull } from "@xylabs/sdk-js";
+import { assertEx as assertEx15, isDefined as isDefined8, isNull } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder9 } from "@xyo-network/sdk-js";
 import { UnrecoverableError, Worker as Worker6 } from "bullmq";
 var name6 = "Monitor Submitted XL1 Transaction";
@@ -647,7 +653,7 @@ var createWorker6 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const submissionHash = assertEx15(state.submissionHash, () => `[${hash}] submissionHash not found`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transaction.byHash(submissionHash);
-    if (isDefined9(foundTx) && !isNull(foundTx)) {
+    if (isDefined8(foundTx) && !isNull(foundTx)) {
       await job.log(`[${hash}] Found transaction on chain`);
       const submissionHash2 = await PayloadBuilder9.hash(foundTx[0]);
       return {
@@ -720,7 +726,7 @@ var Xl1TransactionPreparation = {
 };
 
 // src/queue/workers/Xl1TransactionSubmission.ts
-import { assertEx as assertEx17, isDefined as isDefined10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx17, isDefined as isDefined9 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder11 } from "@xyo-network/sdk-js";
 import { Worker as Worker8 } from "bullmq";
 var name8 = "Submit XL1 Transaction";
@@ -734,7 +740,7 @@ var createWorker8 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const state = assertEx17(await stateMap.get(hash), () => `[${hash}] state not found`);
     const preparedTx = assertEx17(state?.preparedTx, () => `[${hash}] preparedTx not found`);
     const { submissionHash: existingSubmissionHash } = state;
-    if (isDefined10(existingSubmissionHash)) {
+    if (isDefined9(existingSubmissionHash)) {
       await job.log(`[${hash}] Tx already submitted with submission response hash ${existingSubmissionHash}`);
       return {
         submissionHash: existingSubmissionHash
@@ -765,7 +771,7 @@ var Xl1TransactionSubmission = {
 };
 
 // src/queue/workers/Xl1TransactionSubmissionStorage.ts
-import { assertEx as assertEx18, isDefined as isDefined11 } from "@xylabs/sdk-js";
+import { assertEx as assertEx18, isDefined as isDefined10 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder12 } from "@xyo-network/sdk-js";
 import { Worker as Worker9 } from "bullmq";
 var name9 = "Store XL1 Transaction Submission";
@@ -777,7 +783,7 @@ var createWorker9 = /* @__PURE__ */ __name((connection2, telemetry2, services) =
     const hash = await PayloadBuilder12.hash(tx[0]);
     const state = assertEx18(await stateMap.get(hash), () => `[${hash}] state not found`);
     const { submissionHash: existingSubmissionHash } = state;
-    if (isDefined11(existingSubmissionHash)) {
+    if (isDefined10(existingSubmissionHash)) {
       await job.log(`[${hash}] submissionHash already stored as ${existingSubmissionHash}`);
       return {
         submissionHash: existingSubmissionHash
@@ -813,10 +819,16 @@ var Xl1TransactionSubmissionStorage = {
   queueName: queueName9
 };
 
-// src/queue/flows/createXl1ToEthBridgeJob.ts
+// src/queue/flows/createXl1ToEthBridgeJob/getJobIdForXl1ToEthBridgeJob.ts
 import { PayloadBuilder as PayloadBuilder13 } from "@xyo-network/sdk-js";
-var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) => {
+var getJobIdForXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (tx) => {
   const jobId = await PayloadBuilder13.hash(tx[0]);
+  return jobId;
+}, "getJobIdForXl1ToEthBridgeJob");
+
+// src/queue/flows/createXl1ToEthBridgeJob/createXl1ToEthBridgeJob.ts
+var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) => {
+  const jobId = await getJobIdForXl1ToEthBridgeJob(tx);
   const flow = await flowProducer2.add({
     // Step 0 (runs first as parent job)
     name: Xl1ToEthBridgeParent.name,
@@ -965,6 +977,16 @@ var createXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) =
   return flow;
 }, "createXl1ToEthBridgeJob");
 
+// src/queue/flows/createXl1ToEthBridgeJob/getXl1ToEthBridgeJob.ts
+var getXl1ToEthBridgeJob = /* @__PURE__ */ __name(async (flowProducer2, tx) => {
+  const id = await getJobIdForXl1ToEthBridgeJob(tx);
+  const flow = await flowProducer2.getFlow({
+    queueName: Xl1ToEthBridgeParent.queueName,
+    id
+  });
+  return flow;
+}, "getXl1ToEthBridgeJob");
+
 // src/queue/getXl1ToEthQueueJobs.ts
 var getStatusQueueJobs = /* @__PURE__ */ __name(async (queues, jobId) => {
   const [ethTransactionMonitorJob, ethTransactionPreparationJob, ethTransactionSubmissionJob, xl1ToEthBridgeParentJob, xl1TransactionMonitorJob, xl1TransactionPreparationJob, xl1TransactionSubmissionJob, xl1TransactionSubmissionStorageJob] = await Promise.all([
@@ -1033,14 +1055,14 @@ var getXl1ToEthQueues = /* @__PURE__ */ __name((config) => {
 }, "getXl1ToEthQueues");
 
 // src/queue/telemetry.ts
-import { isDefined as isDefined12 } from "@xylabs/sdk-js";
+import { isDefined as isDefined11 } from "@xylabs/sdk-js";
 import { BullMQOtel } from "bullmq-otel";
 var telemetry;
 var options = {
   enableMetrics: true
 };
 var getTelemetry = /* @__PURE__ */ __name(() => {
-  if (isDefined12(telemetry)) return telemetry;
+  if (isDefined11(telemetry)) return telemetry;
   telemetry = new BullMQOtel(options);
   return telemetry;
 }, "getTelemetry");
@@ -1161,12 +1183,13 @@ var makeBridgeFromRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemote.ts
 import { requestHandlerValidator as requestHandlerValidator3 } from "@xylabs/express";
+import { isDefined as isDefined12 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder14, PayloadZodLooseOfSchema, PayloadZodStrictOfSchema as PayloadZodStrictOfSchema2 } from "@xyo-network/sdk-js";
-import { BridgeIntentFieldsZod, BridgeIntentSchema as BridgeIntentSchema2, BridgeSourceObservationFieldsZod, BridgeSourceObservationSchema, SignedTransactionBoundWitnessZod, TransferZod } from "@xyo-network/xl1-sdk";
+import { BridgeIntentFieldsZod, BridgeIntentSchema as BridgeIntentSchema3, BridgeSourceObservationFieldsZod, BridgeSourceObservationSchema, SignedTransactionBoundWitnessZod, TransferZod } from "@xyo-network/xl1-sdk";
 import { z as z2 } from "zod";
 var BridgeToRemoteBodyZod = z2.tuple([
   SignedTransactionBoundWitnessZod,
-  PayloadZodLooseOfSchema(BridgeIntentSchema2).extend(BridgeIntentFieldsZod.shape),
+  PayloadZodLooseOfSchema(BridgeIntentSchema3).extend(BridgeIntentFieldsZod.shape),
   TransferZod
 ]);
 var BridgeToRemoteResponseZod = PayloadZodStrictOfSchema2(BridgeSourceObservationSchema).extend(BridgeSourceObservationFieldsZod.shape);
@@ -1208,6 +1231,11 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
           bridgeIntent
         ]
       ];
+      const existingFlow = await getXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction);
+      if (isDefined12(existingFlow)) {
+        res.status(200).send();
+        return;
+      }
       await createXl1ToEthBridgeJob(flowProducer2, singedHydratedTransaction);
       const srcConfirmation = await PayloadBuilder14.hash(signedTxBw);
       const bridgeCommonFieldsZod = z2.object({}).extend(BridgeSourceObservationFieldsZod.shape);
@@ -1219,7 +1247,7 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
       const bridgeObservation = new PayloadBuilder14({
         schema: BridgeSourceObservationSchema
       }).fields(bridgeObservationFields).build();
-      res.json(bridgeObservation);
+      res.status(202).json(bridgeObservation);
     })
   };
 }, "makeBridgeToRemoteRoute");
@@ -1228,7 +1256,7 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
 import { requestHandlerValidator as requestHandlerValidator4 } from "@xylabs/express";
 import { assertEx as assertEx19, 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 { BridgeIntentFieldsZod as BridgeIntentFieldsZod2, BridgeIntentSchema as BridgeIntentSchema4, buildUnsignedTransaction, toXL1BlockNumber, TransactionBoundWitnessZod, TransferZod as TransferZod2 } from "@xyo-network/xl1-sdk";
 import { z as z3 } from "zod";
 var BridgeToRemoteEstimateBodyZod = BridgeIntentFieldsZod2.pick({
   destAddress: true,
@@ -1237,7 +1265,7 @@ var BridgeToRemoteEstimateBodyZod = BridgeIntentFieldsZod2.pick({
 });
 var BridgeToRemoteEstimateResponseZod = z3.tuple([
   TransactionBoundWitnessZod,
-  PayloadZodStrictOfSchema3(BridgeIntentSchema3).extend(BridgeIntentFieldsZod2.shape),
+  PayloadZodStrictOfSchema3(BridgeIntentSchema4).extend(BridgeIntentFieldsZod2.shape),
   TransferZod2
 ]);
 var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) => {
@@ -1279,9 +1307,9 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) =
 import { requestHandlerValidator as requestHandlerValidator5 } from "@xylabs/express";
 import { asHex as asHex3, isDefined as isDefined13 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder15, 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 { asBridgeIntent, BridgeDestinationObservationFieldsZod as BridgeDestinationObservationFieldsZod2, BridgeDestinationObservationSchema as BridgeDestinationObservationSchema2, BridgeIntentFieldsZod as BridgeIntentFieldsZod3, BridgeIntentSchema as BridgeIntentSchema5, BridgeSourceObservationFieldsZod as BridgeSourceObservationFieldsZod2, BridgeSourceObservationSchema as BridgeSourceObservationSchema2, isBridgeIntent as isBridgeIntent5 } from "@xyo-network/xl1-sdk";
 import { z as z4 } from "zod";
-var BridgeIntentResponseZod = PayloadZodStrictOfSchema4(BridgeIntentSchema4).extend(BridgeIntentFieldsZod3.shape);
+var BridgeIntentResponseZod = PayloadZodStrictOfSchema4(BridgeIntentSchema5).extend(BridgeIntentFieldsZod3.shape);
 var BridgeSourceResponseZod = PayloadZodStrictOfSchema4(BridgeSourceObservationSchema2).extend(BridgeSourceObservationFieldsZod2.shape);
 var BridgeDestinationResponseZod = PayloadZodStrictOfSchema4(BridgeDestinationObservationSchema2).extend(BridgeDestinationObservationFieldsZod2.shape);
 var BridgeToRemoteStatusResponseZod = z4.union([