@xyo-network/chain-bridge 1.19.8 → 1.19.9

package/dist/node/index.mjs

@@ -1,6 +1,10 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
+// src/BridgeActor.ts
+import { creatable } from "@xylabs/sdk-js";
+import { ActorV3, XyoGatewayRunnerMoniker as XyoGatewayRunnerMoniker2 } 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";
@@ -132,7 +136,7 @@ var EthTransactionPreparation = {
 };
 
 // src/queue/workers/EthTransactionSubmission.ts
-import { assertEx as assertEx4, isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { assertEx as assertEx5, isDefined as isDefined3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
 import { Worker as Worker3 } from "bullmq";
 
@@ -153,27 +157,29 @@ var submitEthTransaction = /* @__PURE__ */ __name(async (tx, bridgeableToken, br
 }, "submitEthTransaction");
 
 // src/queue/workers/util/submitXl1Transaction.ts
-import { isAllowedBlockPayload } from "@xyo-network/xl1-sdk";
+import { assertEx as assertEx4 } from "@xylabs/sdk-js";
 var submitXl1Transaction = /* @__PURE__ */ __name(async (preparedTx, gateway) => {
-  const onChain = preparedTx[1].filter(isAllowedBlockPayload);
-  const offChainPayloads = preparedTx[1].filter((p) => !isAllowedBlockPayload(p));
-  const result = await gateway.addPayloadsToChain(onChain, offChainPayloads);
-  return result;
+  const runner = assertEx4(gateway.connection.runner, () => "No runner available on gateway connection");
+  const result = await runner.broadcastTransaction(preparedTx);
+  return [
+    result,
+    preparedTx
+  ];
 }, "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 = 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 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 = assertEx5(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx5(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}`);
@@ -182,7 +188,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 = assertEx5(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;
@@ -236,20 +242,20 @@ var Xl1ToEthBridgeParent = {
 };
 
 // src/queue/workers/Xl1TransactionMonitor.ts
-import { assertEx as assertEx5, isDefined as isDefined4, isNull } from "@xylabs/sdk-js";
+import { assertEx as assertEx6, 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 = assertEx5(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx5(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const gateway = assertEx6(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx6(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 = 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`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transactionByHash(submissionHash);
     if (isDefined4(foundTx) && !isNull(foundTx)) {
@@ -282,13 +288,13 @@ var Xl1TransactionMonitor = {
 };
 
 // src/queue/workers/Xl1TransactionPreparation.ts
-import { assertEx as assertEx6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx7 } 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 = assertEx6(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const stateMap = assertEx7(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
   const worker = new Worker6(queueName6, async (job) => {
     const { tx } = job.data;
     const hash = await PayloadBuilder6.hash(tx[0]);
@@ -318,19 +324,19 @@ var Xl1TransactionPreparation = {
 };
 
 // src/queue/workers/Xl1TransactionSubmission.ts
-import { assertEx as assertEx7, isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx8, 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 = assertEx7(services?.gateway, () => "gateway service not provided");
-  const stateMap = assertEx7(services?.xl1TxStateMap, () => "xl1TxStateMap service not provided");
+  const gateway = assertEx8(services?.gateway, () => "gateway service not provided");
+  const stateMap = assertEx8(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 = assertEx8(await stateMap.get(hash), () => `[${hash}] state not found`);
+    const preparedTx = assertEx8(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}`);
@@ -491,14 +497,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 assertEx9 } 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 assertEx9 } from "@xylabs/sdk-js";
+import { asAddress as asAddress3, assertEx as assertEx10 } from "@xylabs/sdk-js";
 var tryGetBridgeFeesAddress = /* @__PURE__ */ __name((config) => {
   const address = asAddress3(config.actors.bridge.feesAddress);
   return address;
@@ -526,17 +532,17 @@ var getMinBridgeAmount = /* @__PURE__ */ __name((config) => {
 }, "getMinBridgeAmount");
 
 // src/config/getRemoteChainId.ts
-import { assertEx as assertEx10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx11 } from "@xylabs/sdk-js";
 var getRemoteChainId = /* @__PURE__ */ __name((config) => {
-  const remoteChainId = assertEx10(asChainId(config.actors.bridge.remoteChainId), () => "Invalid remote chain ID in config");
+  const remoteChainId = assertEx11(asChainId(config.actors.bridge.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 assertEx12 } from "@xylabs/sdk-js";
 var getRemoteTokenAddress = /* @__PURE__ */ __name((config) => {
   const token = asToken(config.actors.bridge.remoteTokenAddress);
-  return assertEx11(token, () => "Remote token address is not defined in bridge configuration");
+  return assertEx12(token, () => "Remote token address is not defined in bridge configuration");
 }, "getRemoteTokenAddress");
 
 // src/config/getBridgeWalletAccount.ts
@@ -574,13 +580,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 assertEx13, isDefined as isDefined7 } from "@xylabs/sdk-js";
 var getXl1ChainId = /* @__PURE__ */ __name((config) => {
   const xl1ChainId = config.actors.bridge.xl1ChainId;
   if (isDefined7(xl1ChainId)) {
-    return assertEx12(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
+    return assertEx13(asChainId(xl1ChainId), () => "Invalid xl1ChainId in bridge config");
   }
-  return assertEx12(asChainId(config.chain.id), () => "Invalid chain.id in config");
+  return assertEx13(asChainId(config.chain.id), () => "Invalid chain.id in config");
 }, "getXl1ChainId");
 
 // src/config/getXl1TokenAddress.ts
@@ -615,25 +621,6 @@ var getBridgeSettings = /* @__PURE__ */ __name(async (config) => {
   };
 }, "getBridgeSettings");
 
-// src/config/getGateway.ts
-import { isDefined as isDefined9 } from "@xylabs/sdk-js";
-import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
-import { ADDRESS_INDEX as ADDRESS_INDEX2, buildJsonRpcProviderLocator, generateXyoBaseWalletFromPhrase as generateXyoBaseWalletFromPhrase2, HttpRpcTransport, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
-var gatewayInstance;
-var getGateway = /* @__PURE__ */ __name(async (config) => {
-  if (isDefined9(gatewayInstance)) return gatewayInstance;
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.actors.bridge;
-  const walletPhrase = isDefined9(mnemonic) ? mnemonic : HDWallet2.generateMnemonic();
-  const wallet = await generateXyoBaseWalletFromPhrase2(walletPhrase);
-  const signerAccount = await wallet.derivePath(ADDRESS_INDEX2.XYO);
-  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
-  const locator = await buildJsonRpcProviderLocator({
-    transportFactory,
-    signerAccount
-  });
-  return await locator.getInstance(XyoGatewayRunnerMoniker);
-}, "getGateway");
-
 // src/server/routes/bridge/routeDefinitions/routes/bridgeConfig.ts
 var BridgeConfigResponseZod = BridgeSettingsZod;
 var validateRequest = requestHandlerValidator({
@@ -810,7 +797,7 @@ var validateBridgeEstimateExact = /* @__PURE__ */ __name(async (intent, transfer
 }, "validateBridgeEstimateExact");
 
 // src/util/validateBridgeTransaction.ts
-import { asAddress as asAddress4, isDefined as isDefined10 } from "@xylabs/sdk-js";
+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/payload-builder";
 var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent, transfer, config) => {
@@ -818,7 +805,7 @@ var validateBridgeTransaction = /* @__PURE__ */ __name(async (signedTxBw, intent
   const chainId = getXl1ChainId(config);
   if (signedTxBw.chain !== chainId) return false;
   const errors = await new BoundWitnessValidator(signedTxBw).validate();
-  if (isDefined10(errors) && errors.length > 0) return false;
+  if (isDefined9(errors) && errors.length > 0) return false;
   const sender = asAddress4(srcAddress, true);
   if (!addressesContains(signedTxBw, sender)) return false;
   const hashes = await PayloadBuilder10.hashes([
@@ -886,10 +873,9 @@ 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 { assertEx as assertEx14, toAddress as toAddress3 } from "@xylabs/sdk-js";
 import { PayloadZodStrictOfSchema as PayloadZodStrictOfSchema3 } from "@xyo-network/payload-model";
-import { buildUnsignedTransaction, TransferZod as TransferZod2 } from "@xyo-network/xl1-sdk";
-import { BridgeIntentFieldsZod as BridgeIntentFieldsZod2, BridgeIntentSchema as BridgeIntentSchema3, toXL1BlockNumber, TransactionBoundWitnessZod } from "@xyo-network/xl1-sdk";
+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({
   destAddress: true,
@@ -901,7 +887,7 @@ var BridgeToRemoteEstimateResponseZod = z3.tuple([
   PayloadZodStrictOfSchema3(BridgeIntentSchema3).extend(BridgeIntentFieldsZod2.shape),
   TransferZod2
 ]);
-var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config) => {
+var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config, gateway) => {
   const params = z3.object({
     chainId: getRemoteChainIdZod(config)
   });
@@ -918,8 +904,7 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config) => {
       const { srcAddress, srcAmount, destAddress } = req.body;
       const [bridgeIntent, transfer] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config);
       const sender = toAddress3(srcAddress);
-      const gateway = await getGateway(config);
-      const viewer = assertEx13(gateway.connection.viewer, () => new Error("Viewer not available on gateway connection"));
+      const viewer = assertEx14(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);
@@ -1028,10 +1013,10 @@ var makeBridgeToRemoteStatusRoute = /* @__PURE__ */ __name((config) => {
 }, "makeBridgeToRemoteStatusRoute");
 
 // src/server/routes/bridge/routeDefinitions/getRouteDefinitions.ts
-var getRouteDefinitions = /* @__PURE__ */ __name((config) => {
+var getRouteDefinitions = /* @__PURE__ */ __name((config, gateway) => {
   return [
     makeBridgeConfigRoute(config),
-    makeBridgeToRemoteEstimateRoute(config),
+    makeBridgeToRemoteEstimateRoute(config, gateway),
     makeBridgeToRemoteRoute(config),
     makeBridgeToRemoteStatusRoute(config),
     makeBridgeFromRemoteStatusRoute(config)
@@ -1039,20 +1024,20 @@ var getRouteDefinitions = /* @__PURE__ */ __name((config) => {
 }, "getRouteDefinitions");
 
 // src/server/routes/bridge/addBridgeRoutes.ts
-var addBridgeRoutes = /* @__PURE__ */ __name((app, config) => {
-  const routeDefinitions = getRouteDefinitions(config);
+var addBridgeRoutes = /* @__PURE__ */ __name((app, config, gateway) => {
+  const routeDefinitions = getRouteDefinitions(config, gateway);
   for (const definition of routeDefinitions) {
     app[definition.method](definition.path, definition.handlers);
   }
 }, "addBridgeRoutes");
 
 // src/server/routes/addRoutes.ts
-var addRoutes = /* @__PURE__ */ __name((app, config) => {
-  addBridgeRoutes(app, config);
+var addRoutes = /* @__PURE__ */ __name((app, config, gateway) => {
+  addBridgeRoutes(app, config, gateway);
 }, "addRoutes");
 
 // src/server/app.ts
-var getApp = /* @__PURE__ */ __name((node, config) => {
+var getApp = /* @__PURE__ */ __name((node, config, gateway) => {
   addInstrumentation();
   const app = express();
   app.set("etag", false);
@@ -1068,19 +1053,19 @@ var getApp = /* @__PURE__ */ __name((node, config) => {
   disableCaseSensitiveRouting(app);
   app.node = node;
   addFlowProducer(app, config);
-  addRoutes(app, config);
+  addRoutes(app, config, gateway);
   app.use(standardErrors);
   return app;
 }, "getApp");
 
 // src/server/server.ts
-import { assertEx as assertEx18, isDefined as isDefined15, isString } from "@xylabs/sdk-js";
+import { assertEx as assertEx19, isDefined as isDefined14, isString } from "@xylabs/sdk-js";
 import { boot } from "@xyo-network/bios";
-import { HDWallet as HDWallet4 } from "@xyo-network/wallet";
+import { HDWallet as HDWallet3 } from "@xyo-network/wallet";
 
 // src/manifest/getModuleLocator.ts
 import { BaseMongoSdk } from "@xylabs/mongo";
-import { assertEx as assertEx16, isDefined as isDefined13 } from "@xylabs/sdk-js";
+import { assertEx as assertEx17, 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";
@@ -1090,10 +1075,10 @@ import { initTelemetry } from "@xyo-network/chain-telemetry";
 import { AbstractModule, LoggerModuleStatusReporter } from "@xyo-network/module-abstract";
 import { ModuleFactoryLocator } from "@xyo-network/module-factory-locator";
 import { MemorySentinel } from "@xyo-network/sentinel-memory";
-import { hasMongoConfig, mapToMapType, XyoGatewayRunnerMoniker as XyoGatewayRunnerMoniker2 } from "@xyo-network/xl1-sdk";
+import { hasMongoConfig, mapToMapType, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
 
 // src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts
-import { asAddress as asAddress6, asHex as asHex4, assertEx as assertEx14, delay, hexFromBigInt, hexToBigInt as hexToBigInt5, isDefined as isDefined11, isUndefined as isUndefined4 } from "@xylabs/sdk-js";
+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 { PayloadBuilder as PayloadBuilder12 } from "@xyo-network/payload-builder";
 import { asSchema } from "@xyo-network/payload-model";
 import { AbstractSentinel } from "@xyo-network/sentinel-abstract";
@@ -1123,19 +1108,19 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
   _successCounter;
   _wallet;
   get bridge() {
-    return assertEx14(this._bridge, () => new Error("Bridge contract not initialized"));
+    return assertEx15(this._bridge, () => new Error("Bridge contract not initialized"));
   }
   get completedTransactions() {
-    return assertEx14(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 : defaultJobCheckIntervalMs;
+    return isDefined10(this.config.jobCheckInterval) ? this.config.jobCheckInterval : defaultJobCheckIntervalMs;
   }
   get pendingTransactions() {
-    return assertEx14(this.params.pendingTransactions, () => "Pending transactions map is not defined");
+    return assertEx15(this.params.pendingTransactions, () => "Pending transactions map is not defined");
   }
   get wallet() {
-    return assertEx14(this._wallet, () => "wallet is required");
+    return assertEx15(this._wallet, () => "wallet is required");
   }
   async createHandler() {
     await super.createHandler();
@@ -1152,20 +1137,20 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
       description: "Number of errors"
     });
     const { provider, bridgeAddress } = this.params;
-    const key = assertEx14(this.account?.private?.hex, () => new Error("Account private key is required"));
+    const key = assertEx15(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 = assertEx14(hexFromBigInt(network.chainId), () => new Error("Failed to parse bridgeChainId"));
+    this._bridgeChainId = assertEx15(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();
     this._bridgeRemoteChainId = asHex4(bridgeRemoteChain);
   }
   async reportHandler(payloads) {
-    if (isDefined11(payloads) && payloads.length > 0) {
+    if (isDefined10(payloads) && payloads.length > 0) {
       const signedHydratedTransaction = tryUnflattenHydratedTransaction(payloads);
-      if (isDefined11(signedHydratedTransaction)) {
+      if (isDefined10(signedHydratedTransaction)) {
         const txHash = await PayloadBuilder12.hash(signedHydratedTransaction[0]);
         this.logger?.info(`Adding transaction ${signedHydratedTransaction[0]} with hash ${txHash} to pending transactions for monitoring`);
         await this.pendingTransactions.set(txHash, signedHydratedTransaction);
@@ -1193,7 +1178,7 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
         hash,
         signedHydratedTransaction
       ]);
-      if (isDefined11(result)) results.push(result[1]);
+      if (isDefined10(result)) results.push(result[1]);
       await delay(this.jobCheckInterval);
     }
     return flattenHydratedTransactions(results);
@@ -1246,7 +1231,7 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
 };
 
 // src/modules/XL1TransactionCompletionMonitorSentinel/XL1TransactionCompletionMonitorSentinel.ts
-import { assertEx as assertEx15, delay as delay2, isDefined as isDefined12, isNull as isNull2, isUndefined as isUndefined5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx16, 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";
@@ -1268,16 +1253,16 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
   _reportMutex = new Mutex2();
   _successCounter;
   get completedTransactions() {
-    return assertEx15(this.params.completedTransactions, () => "Completed transactions map is not defined");
+    return assertEx16(this.params.completedTransactions, () => "Completed transactions map is not defined");
   }
   get jobCheckInterval() {
-    return isDefined12(this.config.jobCheckInterval) ? this.config.jobCheckInterval : defaultJobCheckIntervalMs2;
+    return isDefined11(this.config.jobCheckInterval) ? this.config.jobCheckInterval : defaultJobCheckIntervalMs2;
   }
   get pendingTransactions() {
-    return assertEx15(this.params.pendingTransactions, () => "Pending transactions map is not defined");
+    return assertEx16(this.params.pendingTransactions, () => "Pending transactions map is not defined");
   }
   get viewer() {
-    return assertEx15(this.params.viewer, () => "Viewer is not defined in params");
+    return assertEx16(this.params.viewer, () => "Viewer is not defined in params");
   }
   async createHandler() {
     await super.createHandler();
@@ -1295,9 +1280,9 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
     });
   }
   async reportHandler(payloads) {
-    if (isDefined12(payloads) && payloads.length > 0) {
+    if (isDefined11(payloads) && payloads.length > 0) {
       const signedHydratedTransaction = tryUnflattenHydratedTransaction2(payloads);
-      if (isDefined12(signedHydratedTransaction)) {
+      if (isDefined11(signedHydratedTransaction)) {
         const txHash = await PayloadBuilder13.hash(signedHydratedTransaction[0]);
         this.logger?.info(`Adding transaction ${signedHydratedTransaction[0]} with hash ${txHash} to pending transactions for monitoring`);
         await this.pendingTransactions.set(txHash, signedHydratedTransaction);
@@ -1325,7 +1310,7 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
         hash,
         signedHydratedTransaction
       ]);
-      if (isDefined12(result)) results.push(result[1]);
+      if (isDefined11(result)) results.push(result[1]);
       await delay2(this.jobCheckInterval);
     }
     return flattenHydratedTransactions2(results);
@@ -1337,7 +1322,7 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
       this._checkCounter?.add(1);
       this._attemptsCounter?.add(1);
       const tx = await this.viewer.transactionByHash(hash);
-      if (isDefined12(tx) && !isNull2(tx)) {
+      if (isDefined11(tx) && !isNull2(tx)) {
         await this.completedTransactions.set(hash, signedHydratedTransaction);
         this.logger?.info(`Found transaction ${signedHydratedTransaction[0]} with hash ${hash}`);
         this.logger?.info(`Removing completed transaction ${signedHydratedTransaction[0]} with hash ${hash}`);
@@ -1378,7 +1363,7 @@ var getModuleLocator = /* @__PURE__ */ __name(async (context) => {
       port
     }
   });
-  if (isDefined13(logger)) AbstractModule.defaultLogger = logger;
+  if (isDefined12(logger)) AbstractModule.defaultLogger = logger;
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : void 0;
   const moduleLocator = new ModuleFactoryLocator();
   const mongoConfig = config.storage?.mongo;
@@ -1414,8 +1399,8 @@ var getModuleLocator = /* @__PURE__ */ __name(async (context) => {
     meterProvider,
     statusReporter
   }));
-  const gateway = await locator.getInstance(XyoGatewayRunnerMoniker2);
-  const viewer = assertEx16(gateway.connection.viewer, () => "Gateway viewer is not defined");
+  const gateway = await locator.getInstance(XyoGatewayRunnerMoniker);
+  const viewer = assertEx17(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 = {
@@ -1480,7 +1465,7 @@ var getIterableMap = /* @__PURE__ */ __name(async (config, collection) => {
 
 // src/manifest/getNode.ts
 import { ManifestWrapper } from "@xyo-network/manifest-wrapper";
-import { buildJsonRpcProviderLocator as buildJsonRpcProviderLocator2, HttpRpcTransport as HttpRpcTransport2 } from "@xyo-network/xl1-sdk";
+import { buildJsonRpcProviderLocator, HttpRpcTransport } from "@xyo-network/xl1-sdk";
 
 // src/manifest/node.json
 var node_default = {
@@ -1508,9 +1493,9 @@ var NodeManifest = node_default;
 var getNode = /* @__PURE__ */ __name(async (context) => {
   const { config, wallet } = context;
   const { chainRpcApiUrl: endpoint } = config.actors.bridge;
-  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport2(endpoint, schemas), "transportFactory");
+  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
   const signerAccount = await getBridgeWalletAccount(config);
-  const locator = await buildJsonRpcProviderLocator2({
+  const locator = await buildJsonRpcProviderLocator({
     signerAccount,
     transportFactory
   });
@@ -1528,10 +1513,10 @@ var getNode = /* @__PURE__ */ __name(async (context) => {
 }, "getNode");
 
 // src/manifest/getServices.ts
-import { assertEx as assertEx17, isDefined as isDefined14 } from "@xylabs/sdk-js";
+import { assertEx as assertEx18, isDefined as isDefined13 } from "@xylabs/sdk-js";
 import { initEvmProvider as initEvmProvider2 } from "@xyo-network/chain-orchestration";
 import { BridgeableToken__factory, LiquidityPoolBridge__factory as LiquidityPoolBridge__factory2 } from "@xyo-network/typechain";
-import { HDWallet as HDWallet3 } from "@xyo-network/wallet";
+import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
 import { getAddress as getAddress3, Wallet as Wallet2 } from "ethers";
 
 // src/manifest/getIterableMap.ts
@@ -1567,21 +1552,20 @@ var getIterableMap2 = /* @__PURE__ */ __name(async (config, collection) => {
 }, "getIterableMap");
 
 // src/manifest/getServices.ts
-var getServices = /* @__PURE__ */ __name(async (context) => {
+var getServices = /* @__PURE__ */ __name(async (context, gateway) => {
   const { config } = context;
-  const gateway = await getGateway(config);
   const ethTxStateMap = await getIterableMap2(config, "liquidity_bridge_xl1_to_eth_eth_tx_state");
   const xl1TxStateMap = await getIterableMap2(config, "liquidity_bridge_xl1_to_eth_xl1_tx_state");
   const provider = await initEvmProvider2({
     config
   });
   const { remoteBridgeContractAddress, remoteChainWalletPrivateKey, remoteTokenAddress, mnemonic } = config.actors.bridge;
-  const account = isDefined14(mnemonic) ? await HDWallet3.fromPhrase(mnemonic) : await HDWallet3.random();
+  const account = isDefined13(mnemonic) ? await HDWallet2.fromPhrase(mnemonic) : await HDWallet2.random();
   const wallet = new Wallet2(remoteChainWalletPrivateKey, provider);
   const bridgeableToken = BridgeableToken__factory.connect(getAddress3(remoteTokenAddress), wallet);
   const bridge = LiquidityPoolBridge__factory2.connect(getAddress3(remoteBridgeContractAddress), wallet);
   const bridgeOwner = await bridge.owner();
-  assertEx17(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
+  assertEx18(bridgeOwner.toLowerCase() === wallet.address.toLowerCase(), () => "Wallet is not the owner of the bridge contract");
   return {
     account,
     bridge,
@@ -1614,38 +1598,79 @@ var getSeedPhrase = /* @__PURE__ */ __name(async (bios, config, logger) => {
     if (isString(mnemonic)) {
       seedPhrase = mnemonic;
     } else {
-      seedPhrase = HDWallet4.generateMnemonic();
+      seedPhrase = HDWallet3.generateMnemonic();
       logger?.log("[Bridge] No mnemonic provided, using random mnemonic. This is not recommended for production use.");
       logger?.log(`[Bridge] Mnemonic: ${seedPhrase}`);
     }
     await bios.seedPhraseStore.set("os", seedPhrase);
   }
-  return assertEx18(await bios.seedPhraseStore.get("os"), () => "Unable to acquire mnemonic from bios");
+  return assertEx19(await bios.seedPhraseStore.get("os"), () => "Unable to acquire mnemonic from bios");
 }, "getSeedPhrase");
-var getServer = /* @__PURE__ */ __name(async (context) => {
+var getServer = /* @__PURE__ */ __name(async (context, gateway) => {
   const { logger, config } = context;
   const { port, mnemonic } = config.actors.bridge;
   const bios = await boot();
-  const seedPhrase = isDefined15(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger);
-  const wallet = await HDWallet4.fromPhrase(seedPhrase);
+  const seedPhrase = isDefined14(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger);
+  const wallet = await HDWallet3.fromPhrase(seedPhrase);
   const nodeContext = {
     wallet,
     logger,
     config
   };
   const node = context.node ?? await getNode(nodeContext);
-  const app = getApp(node, config);
+  const app = getApp(node, config, gateway);
   const services = await getServices({
     config,
     logger
-  });
+  }, gateway);
   addWorkers(config, services);
   const server = app.listen(port, hostname, () => logger?.log(`[Bridge] Server listening at http://${hostname}:${port}`));
   server.setTimeout(2e4);
   return server;
 }, "getServer");
+
+// src/BridgeActor.ts
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate, "_ts_decorate");
+var BridgeActor = class extends ActorV3 {
+  static {
+    __name(this, "BridgeActor");
+  }
+  _gatewayRunner;
+  server;
+  get gatewayRunner() {
+    return this._gatewayRunner;
+  }
+  async createHandler() {
+    await super.createHandler();
+    this._gatewayRunner = await this.locator.getInstance(XyoGatewayRunnerMoniker2);
+  }
+  async startHandler() {
+    await super.startHandler();
+    this.stopServer();
+    await this.startServer();
+  }
+  async stopHandler() {
+    await super.stopHandler();
+    this.stopServer();
+  }
+  async startServer() {
+    this.server = await getServer(this.context, this._gatewayRunner);
+  }
+  stopServer() {
+    this.server?.close();
+    this.server = void 0;
+  }
+};
+BridgeActor = _ts_decorate([
+  creatable()
+], BridgeActor);
 export {
-  getApp,
-  getServer
+  BridgeActor
 };
 //# sourceMappingURL=index.mjs.map