@xyo-network/chain-bridge 1.18.1 → 1.18.2

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,EACS,gBAAgB,EAChC,MAAM,sBAAsB,CAAA;AAS7B,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAWzE,CAAA"}
+{"version":3,"file":"getGateway.d.ts","sourceRoot":"","sources":["../../../src/config/getGateway.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,MAAM,EACN,gBAAgB,EACjB,MAAM,sBAAsB,CAAA;AAU7B,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAUzE,CAAA"}

package/dist/node/index.mjs

@@ -84,7 +84,7 @@ var createWorker2 = /* @__PURE__ */ __name((connection2) => {
     const amount = hexToBigInt(bridgeIntent.destAmount);
     const srcAddress = getAddress(bridgeIntent.srcAddress);
     const destAddress = getAddress(bridgeIntent.destAddress);
-    const preparedTx = await bridge.getFunction("bridgeFromRemote").populateTransaction(srcAddress, destAddress, amount);
+    const preparedTx = await bridge.getFunction("bridgeFromRemote").populateTransaction(srcAddress, destAddress, amount, 0n);
     await job.log(`[${hash}] built ETH transaction`);
     await job.log(`[${hash}] storing ETH preparedTx`);
     await stateMap.set(hash, {
@@ -175,7 +175,7 @@ var createWorker5 = /* @__PURE__ */ __name((connection2) => {
   new Worker5(queueName5, async (job) => {
     const { gateway, tx, xl1TxStateMap: stateMap } = job.data;
     const hash = await PayloadBuilder4.hash(tx[0]);
-    const viewer = assertEx4(gateway.connectionInstance.viewer, () => `[${hash}] viewer not defined on gateway`);
+    const viewer = assertEx4(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`);
     const state = assertEx4(await stateMap.get(hash), () => `[${hash}] state not found`);
     await job.log(`[${hash}] Checking for XL1 transaction inclusion on chain`);
     const foundTx = await viewer.transactionByHash(hash);
@@ -518,23 +518,22 @@ var getBridgeSettings = /* @__PURE__ */ __name(async (config) => {
 // src/config/getGateway.ts
 import { isDefined as isDefined9 } from "@xylabs/sdk-js";
 import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
-import { buildJsonRpcProviderLocator, HttpRpcTransport, SimpleXyoGatewayRunner, SimpleXyoSigner, XyoConnectionMoniker } from "@xyo-network/xl1-sdk";
+import { buildJsonRpcProviderLocator, HttpRpcTransport, SimpleXyoGatewayRunner, SimpleXyoSigner, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
 var gatewayInstance;
 var getGateway = /* @__PURE__ */ __name(async (config) => {
   if (isDefined9(gatewayInstance)) return gatewayInstance;
   const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge;
   const walletPromise = isDefined9(mnemonic) ? HDWallet2.fromPhrase(mnemonic) : HDWallet2.random();
   const account = await walletPromise;
-  const signer = await SimpleXyoSigner.create({
-    account
-  });
   const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
   const locator = await buildJsonRpcProviderLocator({
     transportFactory
   });
-  const connection2 = await locator.getInstance(XyoConnectionMoniker);
-  gatewayInstance = new SimpleXyoGatewayRunner(connection2, signer);
-  return gatewayInstance;
+  locator.register(SimpleXyoSigner.factory(SimpleXyoSigner.dependencies, {
+    account
+  }));
+  locator.register(SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies));
+  return await locator.getInstance(XyoGatewayRunnerMoniker);
 }, "getGateway");
 
 // src/server/routes/bridge/routeDefinitions/routes/bridgeConfig.ts
@@ -822,7 +821,7 @@ var makeBridgeToRemoteEstimateRoute = /* @__PURE__ */ __name((config) => {
       const [bridgeIntent, transfer] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config);
       const sender = toAddress3(srcAddress);
       const gateway = await getGateway(config);
-      const viewer = assertEx11(gateway.connectionInstance.viewer, () => new Error("Viewer not available on gateway connection"));
+      const viewer = assertEx11(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);
@@ -979,9 +978,9 @@ var getApp = /* @__PURE__ */ __name((node, config) => {
 // src/server/server.ts
 import { assertEx as assertEx16, isDefined as isDefined15, isString } from "@xylabs/sdk-js";
 import { boot } from "@xyo-network/bios";
-import { HDWallet as HDWallet5 } from "@xyo-network/wallet";
+import { HDWallet as HDWallet4 } from "@xyo-network/wallet";
 
-// src/manifest/getLocator.ts
+// src/manifest/getModuleLocator.ts
 import { BaseMongoSdk } from "@xylabs/mongo";
 import { assertEx as assertEx14, isDefined as isDefined13 } from "@xylabs/sdk-js";
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
@@ -993,8 +992,7 @@ 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 { HDWallet as HDWallet3 } from "@xyo-network/wallet";
-import { hasMongoConfig, mapToMapType, SimpleXyoConnection, SimpleXyoGatewayRunner as SimpleXyoGatewayRunner2, SimpleXyoSigner as SimpleXyoSigner2 } from "@xyo-network/xl1-sdk";
+import { hasMongoConfig, mapToMapType, XyoGatewayRunnerMoniker as XyoGatewayRunnerMoniker2 } from "@xyo-network/xl1-sdk";
 
 // src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts
 import { asAddress as asAddress6, asHex as asHex4, assertEx as assertEx12, delay, hexFromBigInt, hexToBigInt as hexToBigInt4, isDefined as isDefined11, isUndefined as isUndefined4 } from "@xylabs/sdk-js";
@@ -1133,9 +1131,7 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
     const nonce = await this.wallet.getNonce();
     const srcAddress = getAddress2(bridgeIntent.srcAddress);
     const destAddress = getAddress2(bridgeIntent.destAddress);
-    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, {
-      nonce
-    });
+    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, nonce);
     const confirmation = await tx.wait();
     const transactionResponse = await confirmation?.getTransaction();
     const destConfirmation = asHex4(transactionResponse?.hash ?? "", true);
@@ -1266,9 +1262,9 @@ var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel2 {
   }
 };
 
-// src/manifest/getLocator.ts
-var getLocator = /* @__PURE__ */ __name(async (context) => {
-  const { config, logger } = context;
+// src/manifest/getModuleLocator.ts
+var getModuleLocator = /* @__PURE__ */ __name(async (context) => {
+  const { config, locator, logger } = context;
   const { otlpEndpoint } = config.telemetry?.otel ?? {};
   const { path: endpoint = "/metrics", port = 9468 } = config.telemetry?.metrics?.scrape ?? {};
   const { traceProvider, meterProvider } = await initTelemetry({
@@ -1284,7 +1280,7 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
   });
   if (isDefined13(logger)) AbstractModule.defaultLogger = logger;
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : void 0;
-  const locator = new ModuleFactoryLocator();
+  const moduleLocator = new ModuleFactoryLocator();
   const mongoConfig = config.storage?.mongo;
   if (hasMongoConfig(mongoConfig)) {
     const { connectionString: dbConnectionString, database: dbName, domain: dbDomain, password: dbPassword, username: dbUserName } = mongoConfig;
@@ -1301,25 +1297,25 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
       statusReporter,
       traceProvider
     };
-    locator.register(MongoDBArchivistV2.factory(params), void 0, true);
+    moduleLocator.register(MongoDBArchivistV2.factory(params), void 0, true);
   }
-  locator.register(MemoryArchivist.factory({
+  moduleLocator.register(MemoryArchivist.factory({
     traceProvider,
     meterProvider,
     statusReporter
   }));
-  locator.register(MemorySentinel.factory({
+  moduleLocator.register(MemorySentinel.factory({
     traceProvider,
     meterProvider,
     statusReporter
   }));
-  locator.register(ViewArchivist.factory({
+  moduleLocator.register(ViewArchivist.factory({
     traceProvider,
     meterProvider,
     statusReporter
   }));
-  const gateway = await getGateway2(config);
-  const viewer = assertEx14(gateway.connectionInstance.viewer, () => "Gateway viewer is not defined");
+  const gateway = await locator.getInstance(XyoGatewayRunnerMoniker2);
+  const viewer = assertEx14(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 = {
@@ -1333,7 +1329,7 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
     traceProvider,
     viewer
   };
-  locator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams));
+  moduleLocator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams));
   const completedEthXl1BridgeTransactions = await getIterableMap(config, "liquidity_bridge_eth_xl1_bridge_completed");
   const provider = await initEvmProvider({
     config
@@ -1351,20 +1347,9 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
     statusReporter,
     traceProvider
   };
-  locator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams));
-  return locator;
-}, "getLocator");
-var getGateway2 = /* @__PURE__ */ __name(async (config) => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge;
-  const walletPromise = isDefined13(mnemonic) ? HDWallet3.fromPhrase(mnemonic) : HDWallet3.random();
-  const account = await walletPromise;
-  const signer = await SimpleXyoSigner2.create({
-    account
-  });
-  const connection2 = await SimpleXyoConnection.create();
-  const gateway = new SimpleXyoGatewayRunner2(connection2, signer);
-  return gateway;
-}, "getGateway");
+  moduleLocator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams));
+  return moduleLocator;
+}, "getModuleLocator");
 var getIterableMap = /* @__PURE__ */ __name(async (config, collection) => {
   const mongoConfig = config.storage?.mongo;
   if (hasMongoConfig(mongoConfig)) {
@@ -1395,6 +1380,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";
 
 // src/manifest/node.json
 var node_default = {
@@ -1532,8 +1518,16 @@ var PublicChildManifests = [
 // src/manifest/getNode.ts
 var getNode = /* @__PURE__ */ __name(async (context) => {
   const { wallet } = context;
-  const locator = await getLocator(context);
-  const wrapper = new ManifestWrapper(NodeManifest, wallet, locator, PublicChildManifests, PrivateChildManifests);
+  const { chainRpcApiUrl: endpoint } = context.config.bridge;
+  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport2(endpoint, schemas), "transportFactory");
+  const locator = await buildJsonRpcProviderLocator2({
+    transportFactory
+  });
+  const moduleLocator = await getModuleLocator({
+    ...context,
+    locator
+  });
+  const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, PublicChildManifests, PrivateChildManifests);
   const [node, ...childNodes] = await wrapper.loadNodes();
   if (childNodes?.length > 0) {
     await Promise.all(childNodes.map((childNode) => node.register(childNode)));
@@ -1548,19 +1542,19 @@ import { assertEx as assertEx15, isDefined as isDefined14 } from "@xylabs/sdk-js
 import { MongoMap as MongoMap2 } from "@xyo-network/chain-protocol";
 import { initEvmProvider as initEvmProvider2 } from "@xyo-network/chain-services";
 import { LiquidityPoolBridge__factory as LiquidityPoolBridge__factory2 } from "@xyo-network/typechain";
-import { HDWallet as HDWallet4 } from "@xyo-network/wallet";
-import { buildJsonRpcProviderLocator as buildJsonRpcProviderLocator2, hasMongoConfig as hasMongoConfig2, HttpRpcTransport as HttpRpcTransport2, mapToMapType as mapToMapType2, SimpleXyoGatewayRunner as SimpleXyoGatewayRunner3, SimpleXyoSigner as SimpleXyoSigner3, XyoConnectionMoniker as XyoConnectionMoniker2 } from "@xyo-network/xl1-sdk";
+import { HDWallet as HDWallet3 } from "@xyo-network/wallet";
+import { hasMongoConfig as hasMongoConfig2, mapToMapType as mapToMapType2 } from "@xyo-network/xl1-sdk";
 import { getAddress as getAddress3, Wallet as Wallet2 } from "ethers";
 var getServices = /* @__PURE__ */ __name(async (context) => {
   const { config } = context;
-  const gateway = await getGateway3(config);
+  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, mnemonic } = config.bridge;
-  const account = isDefined14(mnemonic) ? await HDWallet4.fromPhrase(mnemonic) : await HDWallet4.random();
+  const account = isDefined14(mnemonic) ? await HDWallet3.fromPhrase(mnemonic) : await HDWallet3.random();
   const wallet = new Wallet2(remoteChainWalletPrivateKey, provider);
   const bridge = LiquidityPoolBridge__factory2.connect(getAddress3(remoteBridgeContractAddress), wallet);
   const bridgeOwner = await bridge.owner();
@@ -1575,21 +1569,6 @@ var getServices = /* @__PURE__ */ __name(async (context) => {
     xl1TxStateMap
   };
 }, "getServices");
-var getGateway3 = /* @__PURE__ */ __name(async (config) => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge;
-  const walletPromise = isDefined14(mnemonic) ? HDWallet4.fromPhrase(mnemonic) : HDWallet4.random();
-  const account = await walletPromise;
-  const signer = await SimpleXyoSigner3.create({
-    account
-  });
-  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport2(endpoint, schemas), "transportFactory");
-  const locator = await buildJsonRpcProviderLocator2({
-    transportFactory
-  });
-  const connection2 = await locator.getInstance(XyoConnectionMoniker2);
-  const gateway = new SimpleXyoGatewayRunner3(connection2, signer);
-  return gateway;
-}, "getGateway");
 var getIterableMap2 = /* @__PURE__ */ __name(async (config, collection) => {
   const mongoConfig = config.storage?.mongo;
   if (hasMongoConfig2(mongoConfig)) {
@@ -1632,7 +1611,7 @@ var getSeedPhrase = /* @__PURE__ */ __name(async (bios, config, logger) => {
     if (isString(mnemonic)) {
       seedPhrase = mnemonic;
     } else {
-      seedPhrase = HDWallet5.generateMnemonic();
+      seedPhrase = HDWallet4.generateMnemonic();
       logger?.log("[Bridge] No mnemonic provided, using random mnemonic. This is not recommended for production use.");
       logger?.log(`[Bridge] Mnemonic: ${seedPhrase}`);
     }
@@ -1645,7 +1624,7 @@ var getServer = /* @__PURE__ */ __name(async (context) => {
   const { port, mnemonic } = config.bridge;
   const bios = await boot();
   const seedPhrase = isDefined15(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger);
-  const wallet = await HDWallet5.fromPhrase(seedPhrase);
+  const wallet = await HDWallet4.fromPhrase(seedPhrase);
   const nodeContext = {
     wallet,
     logger,