@xyo-network/chain-bridge 1.19.10 → 1.19.12

package/dist/node/config/getGateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getGateway.d.ts","sourceRoot":"","sources":["../../../src/config/getGateway.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,MAAM,EAAkC,gBAAgB,EACzD,MAAM,sBAAsB,CAAA;AAO7B,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,CASzE,CAAA"}
+{"version":3,"file":"getGateway.d.ts","sourceRoot":"","sources":["../../../src/config/getGateway.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,MAAM,EAAkC,gBAAgB,EACzD,MAAM,sBAAsB,CAAA;AAO7B,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAUzE,CAAA"}

package/dist/node/index.mjs

@@ -136,7 +136,7 @@ var EthTransactionPreparation = {
 };
 
 // src/queue/workers/EthTransactionSubmission.ts
-import { assertEx as assertEx5, isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx4, isDefined as isDefined3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
 import { Worker as Worker3 } from "bullmq";
 
@@ -157,29 +157,26 @@ var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, br
 }, "submitEthTransaction");
 
 // src/queue/workers/util/submitXl1Transaction.ts
-import { assertEx as assertEx4 } from "@xylabs/sdk-js";
+import { isAllowedBlockPayload } from "@xyo-network/xl1-sdk";
 var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, gateway) => {
-  const runner = assertEx4(gateway.connection.runner, () => "No runner available on gateway connection");
-  const result = await runner.broadcastTransaction(preparedTx);
-  return [
-    result,
-    preparedTx
-  ];
+  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 = assertEx5(services?.bridge, () => "bridge service not provided");
-  const bridgeableToken = assertEx5(services?.bridgeableToken, () => "bridgeableToken service not provided");
-  const wallet = assertEx5(services?.wallet, () => "wallet service not provided");
-  const stateMap = assertEx5(services?.ethTxStateMap, () => "ethTxStateMap service not provided");
+  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 worker = new Worker3(queueName3, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder4.hash(tx[0]);
-    const state = assertEx5(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx5(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx4(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx4(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}`);
@@ -188,7 +185,7 @@ var createWorker3 = /* @__PURE__ */ __name((connection2, services) => {
       };
     }
     await job.log(`[${hash}] Submitting ETH tx`);
-    const submissionHash = assertEx5(await submitEthTransaction(tx, bridgeableToken, bridge, wallet), () => `[${hash}] submissionHash not found in receipt`);
+    const submissionHash = assertEx4(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;
@@ -242,20 +239,20 @@ var Xl1ToEthBridgeParent = {
 };
 
 // src/queue/workers/Xl1TransactionMonitor.ts
-import { assertEx as assertEx6, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
+import { assertEx as assertEx5, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
 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 = assertEx6(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx6(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const gateway = assertEx5(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx5(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 = assertEx6(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`);
-    const state = assertEx6(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const submissionHash = assertEx6(state?.submissionHash, () => `[${hash}] submissionHash not found`);
+    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`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transactionByHash(submissionHash);
     if (isDefined4(foundTx) && !isNull(foundTx)) {
@@ -288,13 +285,13 @@ var Xl1TransactionMonitor = {
 };
 
 // src/queue/workers/Xl1TransactionPreparation.ts
-import { assertEx as assertEx7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx6 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/payload-builder";
 import { Worker as Worker6 } from "bullmq";
 var name6 = "Prepare XL1 Transaction";
 var queueName6 = "xl1-tx-prepare";
 var createWorker6 = /* @__PURE__ */ __name((connection2, services) => {
-  const stateMap = assertEx7(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const stateMap = assertEx6(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker6(queueName6, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder6.hash(tx[0]);
@@ -324,19 +321,19 @@ var Xl1TransactionPreparation = {
 };
 
 // src/queue/workers/Xl1TransactionSubmission.ts
-import { assertEx as assertEx8, isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx7, isDefined as isDefined5 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/payload-builder";
 import { Worker as Worker7 } from "bullmq";
 var name7 = "Submit XL1 Transaction";
 var queueName7 = "xl1-tx-submit";
 var createWorker7 = /* @__PURE__ */ __name((connection2, services) => {
-  const gateway = assertEx8(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx8(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 Worker7(queueName7, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder7.hash(tx[0]);
-    const state = assertEx8(await stateMap.get(hash), () => `[${hash}] state not found`);
-    const preparedTx = assertEx8(state?.preparedTx, () => `[${hash}] preparedTx not found`);
+    const state = assertEx7(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx7(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}`);
@@ -497,14 +494,14 @@ var asToken = /* @__PURE__ */ __name((value) => {
 }, "asToken");
 
 // src/config/getBridgeEscrowAddress.ts
-import { asAddress as asAddress2, assertEx as assertEx9 } from "@xylabs/sdk-js";
+import { asAddress as asAddress2, assertEx as assertEx8 } from "@xylabs/sdk-js";
 var tryGetBridgeEscrowAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress2(config.actors.bridge.escrowAddress);
   return address;
 }, "tryGetBridgeEscrowAddress");
 
 // src/config/getBridgeFeesAddress.ts
-import { asAddress as asAddress3, assertEx as assertEx10 } from "@xylabs/sdk-js";
+import { asAddress as asAddress3, assertEx as assertEx9 } from "@xylabs/sdk-js";
 var tryGetBridgeFeesAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress3(config.actors.bridge.feesAddress);
   return address;
@@ -532,17 +529,17 @@ var getMinBridgeAmount = /* @__PURE__ */ __name((config) => {
 }, "getMinBridgeAmount");
 
 // src/config/getRemoteChainId.ts
-import { assertEx as assertEx11 } from "@xylabs/sdk-js";
+import { assertEx as assertEx10 } from "@xylabs/sdk-js";
 var getRemoteChainId = /* @__PURE__ */ __name((config) => {
-  const remoteChainId = assertEx11(asChainId(config.actors.bridge.remoteChainId), () => "Invalid remote chain ID in config");
+  const remoteChainId = assertEx10(asChainId(config.actors.bridge.remoteChainId), () => "Invalid remote chain ID in config");
   return remoteChainId;
 }, "getRemoteChainId");
 
 // src/config/getRemoteTokenAddress.ts
-import { assertEx as assertEx12 } from "@xylabs/sdk-js";
+import { assertEx as assertEx11 } from "@xylabs/sdk-js";
 var getRemoteTokenAddress = /* @__PURE__ */ __name((config) => {
   const token = asToken(config.actors.bridge.remoteTokenAddress);
-  return assertEx12(token, () => "Remote token address is not defined in bridge configuration");
+  return assertEx11(token, () => "Remote token address is not defined in bridge configuration");
 }, "getRemoteTokenAddress");
 
 // src/config/getBridgeWalletAccount.ts
@@ -580,13 +577,13 @@ var getTransferAddresses = /* @__PURE__ */ __name(async (config) => {
 }, "getTransferAddresses");
 
 // src/config/getXl1ChainId.ts
-import { assertEx as assertEx13, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx12, isDefined as isDefined7 } from "@xylabs/sdk-js";
 var getXl1ChainId = /* @__PURE__ */ __name((config) => {
   const xl1ChainId = config.actors.bridge.xl1ChainId;
   if (isDefined7(xl1ChainId)) {
-    return assertEx13(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
+    return assertEx12(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
   }
-  return assertEx13(asChainId(config.chain.id), () => "Invalid chain.id in config");
+  return assertEx12(asChainId(config.chain.id), () => "Invalid chain.id in config");
 }, "getXl1ChainId");
 
 // src/config/getXl1TokenAddress.ts
@@ -873,7 +870,7 @@ var makeBridgeToRemoteRoute = /* @__PURE__ */ __name((config) => {
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteEstimate.ts
 import { requestHandlerValidator as requestHandlerValidator4 } from "@xylabs/express";
-import { assertEx as assertEx14, toAddress as toAddress3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx13, toAddress as toAddress3 } from "@xylabs/sdk-js";
 import { PayloadZodStrictOfSchema as PayloadZodStrictOfSchema3 } from "@xyo-network/payload-model";
 import { BridgeIntentFieldsZod as BridgeIntentFieldsZod2, BridgeIntentSchema as BridgeIntentSchema3, buildUnsignedTransaction, toXL1BlockNumber, TransactionBoundWitnessZod, TransferZod as TransferZod2 } from "@xyo-network/xl1-sdk";
 import { z as z3 } from "zod";
@@ -904,7 +901,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 = assertEx14(gateway.connection.viewer, () => new Error("Viewer not available on gateway connection"));
+      const viewer = assertEx13(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);
@@ -1065,7 +1062,7 @@ import { HDWallet as HDWallet3 } from "@xyo-network/wallet";
 
 // src/manifest/getModuleLocator.ts
 import { BaseMongoSdk } from "@xylabs/mongo";
-import { assertEx as assertEx17, isDefined as isDefined12 } from "@xylabs/sdk-js";
+import { assertEx as assertEx16, isDefined as isDefined12 } from "@xylabs/sdk-js";
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
 import { MongoDBArchivistV2 } from "@xyo-network/archivist-mongodb";
 import { ViewArchivist } from "@xyo-network/archivist-view";
@@ -1078,7 +1075,7 @@ import { MemorySentinel } from "@xyo-network/sentinel-memory";
 import { hasMongoConfig, mapToMapType, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
 
 // src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts
-import { asAddress as asAddress6, asHex as asHex4, assertEx as assertEx15, delay, hexFromBigInt, hexToBigInt as hexToBigInt5, isDefined as isDefined10, isUndefined as isUndefined4 } from "@xylabs/sdk-js";
+import { asAddress as asAddress6, asHex as asHex4, assertEx as assertEx14, delay, hexFromBigInt, hexToBigInt as hexToBigInt5, isDefined as isDefined10, isUndefined as isUndefined4 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder12 } from "@xyo-network/payload-builder";
 import { asSchema } from "@xyo-network/payload-model";
 import { AbstractSentinel } from "@xyo-network/sentinel-abstract";
@@ -1108,19 +1105,19 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
   _successCounter;
   _wallet;
   get bridge() {
-    return assertEx15(this._bridge, () => new Error("Bridge contract not initialized"));
+    return assertEx14(this._bridge, () => new Error("Bridge contract not initialized"));
   }
   get completedTransactions() {
-    return assertEx15(this.params.completedTransactions, () => "Completed transactions map is not defined");
+    return assertEx14(this.params.completedTransactions, () => "Completed transactions map is not defined");
   }
   get jobCheckInterval() {
     return isDefined10(this.config.jobCheckInterval) ? this.config.jobCheckInterval : defaultJobCheckIntervalMs;
   }
   get pendingTransactions() {
-    return assertEx15(this.params.pendingTransactions, () => "Pending transactions map is not defined");
+    return assertEx14(this.params.pendingTransactions, () => "Pending transactions map is not defined");
   }
   get wallet() {
-    return assertEx15(this._wallet, () => "wallet is required");
+    return assertEx14(this._wallet, () => "wallet is required");
   }
   async createHandler() {
     await super.createHandler();
@@ -1137,11 +1134,11 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
       description: "Number of errors"
     });
     const { provider, bridgeAddress } = this.params;
-    const key = assertEx15(this.account?.private?.hex, () => new Error("Account private key is required"));
+    const key = assertEx14(this.account?.private?.hex, () => new Error("Account private key is required"));
     this._wallet = new Wallet(key, provider);
     this._bridge = LiquidityPoolBridge__factory.connect(getAddress2(bridgeAddress), this._wallet);
     const network = await provider.getNetwork();
-    this._bridgeChainId = assertEx15(hexFromBigInt(network.chainId), () => new Error("Failed to parse bridgeChainId"));
+    this._bridgeChainId = assertEx14(hexFromBigInt(network.chainId), () => new Error("Failed to parse bridgeChainId"));
     const tokenAddress = await this.bridge.token();
     this._bridgeTokenAddress = asAddress6(tokenAddress, true);
     const bridgeRemoteChain = await this.bridge.remoteChain();
@@ -1231,7 +1228,7 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
 };
 
 // src/modules/XL1TransactionCompletionMonitorSentinel/XL1TransactionCompletionMonitorSentinel.ts
-import { assertEx as assertEx16, delay as delay2, isDefined as isDefined11, isNull as isNull2, isUndefined as isUndefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx15, delay as delay2, isDefined as isDefined11, isNull as isNull2, isUndefined as isUndefined5 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder13 } from "@xyo-network/payload-builder";
 import { asSchema as asSchema2 } from "@xyo-network/payload-model";
 import { AbstractSentinel as AbstractSentinel2 } from "@xyo-network/sentinel-abstract";
@@ -1253,16 +1250,16 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
   _reportMutex = new Mutex2();
   _successCounter;
   get completedTransactions() {
-    return assertEx16(this.params.completedTransactions, () => "Completed transactions map is not defined");
+    return assertEx15(this.params.completedTransactions, () => "Completed transactions map is not defined");
   }
   get jobCheckInterval() {
     return isDefined11(this.config.jobCheckInterval) ? this.config.jobCheckInterval : defaultJobCheckIntervalMs2;
   }
   get pendingTransactions() {
-    return assertEx16(this.params.pendingTransactions, () => "Pending transactions map is not defined");
+    return assertEx15(this.params.pendingTransactions, () => "Pending transactions map is not defined");
   }
   get viewer() {
-    return assertEx16(this.params.viewer, () => "Viewer is not defined in params");
+    return assertEx15(this.params.viewer, () => "Viewer is not defined in params");
   }
   async createHandler() {
     await super.createHandler();
@@ -1400,7 +1397,7 @@ var getModuleLocator = /* @__PURE__ */ __name(async (context) => {
     statusReporter
   }));
   const gateway = await locator.getInstance(XyoGatewayRunnerMoniker);
-  const viewer = assertEx17(gateway.connection.viewer, () => "Gateway viewer is not defined");
+  const viewer = assertEx16(gateway.connection.viewer, () => "Gateway viewer is not defined");
   const pendingXl1ToEthXl1BridgeIntentTransactions = await getIterableMap(config, "liquidity_bridge_xl1_to_eth_xl1_pending");
   const completedXl1ToEthXl1BridgeIntentTransactions = await getIterableMap(config, "liquidity_bridge_xl1_to_eth_xl1_completed");
   const xl1TransactionCompletionMonitorSentinelParams = {
@@ -1464,6 +1461,7 @@ var getIterableMap = /* @__PURE__ */ __name(async (config, collection) => {
 }, "getIterableMap");
 
 // src/manifest/getNode.ts
+import { assertEx as assertEx17 } from "@xylabs/sdk-js";
 import { ManifestWrapper } from "@xyo-network/manifest-wrapper";
 import { buildJsonRpcProviderLocator, HttpRpcTransport } from "@xyo-network/xl1-sdk";
 
@@ -1492,7 +1490,7 @@ var NodeManifest = node_default;
 // src/manifest/getNode.ts
 var getNode = /* @__PURE__ */ __name(async (context) => {
   const { config, wallet } = context;
-  const { chainRpcApiUrl: endpoint } = config.actors.bridge;
+  const endpoint = assertEx17(config.actors.bridge.remote?.rpc?.url ?? config.remote?.rpc?.url, () => "RPC URL is required for Node");
   const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
   const signerAccount = await getBridgeWalletAccount(config);
   const locator = await buildJsonRpcProviderLocator({