@xyo-network/chain-bridge 1.20.21 → 1.20.23

package/dist/node/BridgeActor.d.ts

@@ -6,6 +6,8 @@ export type BridgeActorParams = ActorParamsV3<{
 }>;
 export declare class BridgeActor extends ActorV3<BridgeActorParams> {
     protected _gatewayRunner: XyoGatewayRunner;
+    private _balanceMonitor?;
+    private _queueMetrics?;
     private server?;
     protected get gatewayRunner(): XyoGatewayRunner;
     createHandler(): Promise<void>;

package/dist/node/BridgeActor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BridgeActor.d.ts","sourceRoot":"","sources":["../../src/BridgeActor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAEpE,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EACjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,OAAO,EAER,MAAM,sBAAsB,CAAA;AAI7B,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC;IAC5C,MAAM,EAAE,YAAY,CAAA;CACrB,CAAC,CAAA;AAEF,qBACa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACzD,SAAS,CAAC,cAAc,EAAG,gBAAgB,CAAA;IAC3C,OAAO,CAAC,MAAM,CAAC,CAAQ;IAEvB,SAAS,KAAK,aAAa,qBAE1B;IAEc,aAAa;IAKb,YAAY;IAMZ,WAAW;YAKZ,WAAW;IAIzB,OAAO,CAAC,UAAU;CAInB"}
+{"version":3,"file":"BridgeActor.d.ts","sourceRoot":"","sources":["../../src/BridgeActor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAEpE,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EACjB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,OAAO,EAER,MAAM,sBAAsB,CAAA;AAO7B,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC;IAC5C,MAAM,EAAE,YAAY,CAAA;CACrB,CAAC,CAAA;AAEF,qBACa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACzD,SAAS,CAAC,cAAc,EAAG,gBAAgB,CAAA;IAC3C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,aAAa,CAAC,CAAoB;IAC1C,OAAO,CAAC,MAAM,CAAC,CAAQ;IAEvB,SAAS,KAAK,aAAa,qBAE1B;IAEc,aAAa;IAKb,YAAY;IAMZ,WAAW;YASZ,WAAW;IA0BzB,OAAO,CAAC,UAAU;CAInB"}

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

@@ -1 +1 @@
-{"version":3,"file":"getBridgeWalletAccount.d.ts","sourceRoot":"","sources":["../../../src/config/getBridgeWalletAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,gBAAgB,CAAA;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKvD,eAAO,MAAM,sBAAsB,GAAU,QAAQ,WAAW,KAAG,OAAO,CAAC,cAAc,CAiBxF,CAAA;AAED,eAAO,MAAM,sCAAsC,GACjD,kBAAkB,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,GAAG,SAAS,EAC9D,QAAQ,WAAW,KAClB,OAAO,CAAC,OAAO,CAKjB,CAAA"}
+{"version":3,"file":"getBridgeWalletAccount.d.ts","sourceRoot":"","sources":["../../../src/config/getBridgeWalletAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,gBAAgB,CAAA;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAIvD,eAAO,MAAM,sBAAsB,GAAU,QAAQ,WAAW,KAAG,OAAO,CAAC,cAAc,CAMxF,CAAA;AAED,eAAO,MAAM,sCAAsC,GACjD,kBAAkB,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,GAAG,SAAS,EAC9D,QAAQ,WAAW,KAClB,OAAO,CAAC,OAAO,CAKjB,CAAA"}

package/dist/node/config/getTestGateway.d.ts

@@ -1,4 +1,4 @@
-import { type BridgeConfig } from '@xyo-network/chain-orchestration';
+import type { BridgeConfig } from '@xyo-network/chain-orchestration';
 import type { XyoGatewayRunner } from '@xyo-network/xl1-sdk';
 export declare const getTestGateway: (config: BridgeConfig) => Promise<XyoGatewayRunner>;
 //# sourceMappingURL=getTestGateway.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getTestGateway.d.ts","sourceRoot":"","sources":["../../../src/config/getTestGateway.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,KAAK,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAE9F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAK5D,eAAO,MAAM,cAAc,GAAU,QAAQ,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAYnF,CAAA"}
+{"version":3,"file":"getTestGateway.d.ts","sourceRoot":"","sources":["../../../src/config/getTestGateway.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,eAAO,MAAM,cAAc,GAAU,QAAQ,YAAY,KAAG,OAAO,CAAC,gBAAgB,CASnF,CAAA"}

package/dist/node/index.d.ts

@@ -1,2 +1,3 @@
 export * from './BridgeActor.ts';
+export * from './monitoring/index.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA"}

package/dist/node/index.mjs

@@ -6,10 +6,138 @@ import { creatable } from "@xylabs/sdk-js";
 import { asBridgeConfigContext } from "@xyo-network/chain-orchestration";
 import { ActorV3, XyoGatewayRunnerMoniker } from "@xyo-network/xl1-sdk";
 
-// src/server/app.ts
-import { standardErrors } from "@xylabs/express";
-import { sharedMiddleware } from "@xyo-network/chain-orchestration";
-import express from "express";
+// src/monitoring/createBalanceMonitor.ts
+var DEFAULT_INTERVAL_MS = 6e4;
+var WEI_PER_GWEI = 10n ** 9n;
+var TOKEN_DECIMALS = 10n ** 18n;
+function createBalanceMonitor(config) {
+  const { account, bridge, bridgeableToken, gateway, meter, provider, wallet, intervalMs = DEFAULT_INTERVAL_MS } = config;
+  let timer;
+  const ethWalletGasBalance = meter.createGauge("bridge_eth_wallet_gas_balance_gwei", {
+    description: "ETH balance of the bridge runner wallet (in gwei)",
+    unit: "gwei"
+  });
+  const liquidityTokenBalance = meter.createGauge("bridge_eth_liquidity_token_balance", {
+    description: "ERC-20 token balance of the liquidity source (in whole tokens)",
+    unit: "tokens"
+  });
+  const liquidityTokenAllowance = meter.createGauge("bridge_eth_liquidity_token_allowance", {
+    description: "ERC-20 token allowance from liquidity source to bridge contract (in whole tokens)",
+    unit: "tokens"
+  });
+  const xl1AccountBalance = meter.createGauge("bridge_xl1_account_balance", {
+    description: "XL1 native balance of the bridge account (in whole XL1)",
+    unit: "xl1"
+  });
+  const walletAddress = wallet.address;
+  async function poll() {
+    try {
+      const balance = await provider.getBalance(walletAddress);
+      ethWalletGasBalance.record(Number(balance / WEI_PER_GWEI), {
+        address: walletAddress
+      });
+    } catch (err) {
+      console.error("[BalanceMonitor] Failed to read ETH wallet gas balance:", err);
+    }
+    try {
+      const liquiditySourceAddress = await bridge.liquiditySource();
+      const balance = await bridgeableToken.balanceOf(liquiditySourceAddress);
+      liquidityTokenBalance.record(Number(balance / TOKEN_DECIMALS), {
+        address: liquiditySourceAddress
+      });
+    } catch (err) {
+      console.error("[BalanceMonitor] Failed to read liquidity source token balance:", err);
+    }
+    try {
+      const liquiditySourceAddress = await bridge.liquiditySource();
+      const bridgeAddress = await bridge.getAddress();
+      const allowance = await bridgeableToken.allowance(liquiditySourceAddress, bridgeAddress);
+      liquidityTokenAllowance.record(Number(allowance / TOKEN_DECIMALS), {
+        address: liquiditySourceAddress
+      });
+    } catch (err) {
+      console.error("[BalanceMonitor] Failed to read liquidity source token allowance:", err);
+    }
+    try {
+      const viewer = gateway.connection.viewer;
+      if (viewer) {
+        const balance = await viewer.account.balance.accountBalance(account.address);
+        xl1AccountBalance.record(Number(balance / TOKEN_DECIMALS), {
+          address: account.address.toString()
+        });
+      }
+    } catch (err) {
+      console.error("[BalanceMonitor] Failed to read XL1 account balance:", err);
+    }
+  }
+  __name(poll, "poll");
+  return {
+    start() {
+      void poll();
+      timer = setInterval(() => void poll(), intervalMs);
+    },
+    stop() {
+      if (timer) {
+        clearInterval(timer);
+        timer = void 0;
+      }
+    }
+  };
+}
+__name(createBalanceMonitor, "createBalanceMonitor");
+
+// src/monitoring/createQueueMetrics.ts
+var DEFAULT_INTERVAL_MS2 = 3e4;
+function createQueueMetrics(config) {
+  const { meter, queues, intervalMs = DEFAULT_INTERVAL_MS2 } = config;
+  let timer;
+  const waitingGauge = meter.createGauge("bridge_queue_waiting", {
+    description: "Number of waiting jobs in the bridge queue"
+  });
+  const activeGauge = meter.createGauge("bridge_queue_active", {
+    description: "Number of active jobs in the bridge queue"
+  });
+  const completedGauge = meter.createGauge("bridge_queue_completed", {
+    description: "Number of completed jobs in the bridge queue"
+  });
+  const failedGauge = meter.createGauge("bridge_queue_failed", {
+    description: "Number of failed jobs in the bridge queue"
+  });
+  const delayedGauge = meter.createGauge("bridge_queue_delayed", {
+    description: "Number of delayed jobs in the bridge queue"
+  });
+  async function poll() {
+    for (const [name10, queue] of Object.entries(queues)) {
+      try {
+        const counts = await queue.getJobCounts("waiting", "active", "completed", "failed", "delayed");
+        const attrs = {
+          queue_name: name10
+        };
+        waitingGauge.record(counts.waiting ?? 0, attrs);
+        activeGauge.record(counts.active ?? 0, attrs);
+        completedGauge.record(counts.completed ?? 0, attrs);
+        failedGauge.record(counts.failed ?? 0, attrs);
+        delayedGauge.record(counts.delayed ?? 0, attrs);
+      } catch (err) {
+        console.error(`[QueueMetrics] Failed to read job counts for queue ${name10}:`, err);
+      }
+    }
+  }
+  __name(poll, "poll");
+  return {
+    start() {
+      void poll();
+      timer = setInterval(() => void poll(), intervalMs);
+    },
+    stop() {
+      if (timer) {
+        clearInterval(timer);
+        timer = void 0;
+      }
+    }
+  };
+}
+__name(createQueueMetrics, "createQueueMetrics");
 
 // src/queue/connection.ts
 import { isDefined } from "@xylabs/sdk-js";
@@ -96,7 +224,7 @@ import { Worker as Worker2 } from "bullmq";
 import { getAddress } from "ethers";
 
 // src/validation/validateBridgeEstimateExact.ts
-import { hexToBigInt as hexToBigInt4, isUndefined as isUndefined2 } from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt4, isUndefined } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/sdk-js";
 
 // src/config/asChainId.ts
@@ -163,25 +291,13 @@ var getRemoteTokenAddress = /* @__PURE__ */ __name((config) => {
 }, "getRemoteTokenAddress");
 
 // src/config/getBridgeWalletAccount.ts
-import { isDefined as isDefined3, isUndefined } from "@xylabs/sdk-js";
-import { HDWallet } from "@xyo-network/sdk-js";
-import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from "@xyo-network/xl1-sdk";
+import { isDefined as isDefined3 } from "@xylabs/sdk-js";
+import { resolveWalletForActor } from "@xyo-network/chain-orchestration";
 var accountServiceSingleton;
 var getBridgeWalletAccount = /* @__PURE__ */ __name(async (config) => {
   if (accountServiceSingleton) return accountServiceSingleton;
-  let walletPhrase = config.mnemonic;
-  if (isUndefined(walletPhrase)) {
-    console.log("[Bridge] No wallet mnemonic specified!");
-    const randomMnemonic = HDWallet.generateMnemonic();
-    console.log(`[Bridge] Using randomly generated mnemonic:
-    
-${randomMnemonic}
-      
-    `);
-    walletPhrase = randomMnemonic;
-  }
-  const wallet = await generateXyoBaseWalletFromPhrase(walletPhrase);
-  const account = await wallet.derivePath(ADDRESS_INDEX.XYO);
+  const accountPath = typeof config.accountPath === "string" ? config.accountPath : void 0;
+  const account = await resolveWalletForActor(config.name, accountPath);
   accountServiceSingleton = account;
   return accountServiceSingleton;
 }, "getBridgeWalletAccount");
@@ -322,7 +438,7 @@ var validateBridgeEstimateExact = /* @__PURE__ */ __name(async (intent, transfer
   if (hexToBigInt4(srcAmount) < hexToBigInt4(getMinBridgeAmount(config))) return false;
   if (hexToBigInt4(srcAmount) > hexToBigInt4(getMaxBridgeAmount(config))) return false;
   const [calculatedIntent, calculatedTransfer] = await generateBridgeEstimate(srcAddress, srcAmount, destAddress, config);
-  if (isUndefined2(calculatedIntent) || isUndefined2(calculatedTransfer)) return false;
+  if (isUndefined(calculatedIntent) || isUndefined(calculatedTransfer)) return false;
   const { nonce: expectedIntentNonce, ...expectedIntentStatic } = calculatedIntent;
   const { nonce: actualIntentNonce, ...actualIntentStatic } = intent;
   if (await PayloadBuilder3.dataHash(expectedIntentStatic) !== await PayloadBuilder3.dataHash(actualIntentStatic)) return false;
@@ -1091,6 +1207,11 @@ var getTelemetry = /* @__PURE__ */ __name(() => {
   return telemetry;
 }, "getTelemetry");
 
+// src/server/app.ts
+import { standardErrors } from "@xylabs/express";
+import { sharedMiddleware } from "@xyo-network/chain-orchestration";
+import express from "express";
+
 // src/server/addFlowProducer.ts
 var addFlowProducer = /* @__PURE__ */ __name((app, config) => {
   const connection2 = getConnection(config);
@@ -1195,12 +1316,12 @@ import { BridgeDestinationObservationFieldsZod, BridgeDestinationObservationSche
 import { z } from "zod";
 
 // src/server/routes/bridge/routeDefinitions/pathParams/ChainIdPathParam.ts
-import { asHex as asHex2, HexZod, isUndefined as isUndefined3 } from "@xylabs/sdk-js";
+import { asHex as asHex2, HexZod, isUndefined as isUndefined2 } from "@xylabs/sdk-js";
 var getRemoteChainIdZod = /* @__PURE__ */ __name((config) => {
   const remoteChainId = getRemoteChainId(config);
   return HexZod.superRefine((val, ctx) => {
     const chainId = asHex2(val);
-    if (isUndefined3(chainId)) {
+    if (isUndefined2(chainId)) {
       ctx.addIssue("Not a valid chain id");
       return;
     }
@@ -1555,9 +1676,8 @@ var getApp = /* @__PURE__ */ __name((config, gateway) => {
 }, "getApp");
 
 // src/services/getServices.ts
-import { assertEx as assertEx21, isDefined as isDefined14 } from "@xylabs/sdk-js";
-import { initEvmProvider } from "@xyo-network/chain-orchestration";
-import { HDWallet as HDWallet2 } from "@xyo-network/sdk-js";
+import { assertEx as assertEx21 } from "@xylabs/sdk-js";
+import { initEvmProvider, resolveWalletForActor as resolveWalletForActor2 } from "@xyo-network/chain-orchestration";
 import { BridgeableToken__factory, LiquidityPoolBridge__factory } from "@xyo-network/typechain";
 import { getAddress as getAddress2, Wallet } from "ethers";
 
@@ -1599,8 +1719,8 @@ var getServices = /* @__PURE__ */ __name(async (context, gateway) => {
   const ethTxStateMap = await getIterableMap(config, "liquidity_bridge_xl1_to_eth_eth_tx_state");
   const xl1TxStateMap = await getIterableMap(config, "liquidity_bridge_xl1_to_eth_xl1_tx_state");
   const provider = await initEvmProvider(context);
-  const { remoteBridgeContractAddress, remoteChainWalletPrivateKey, remoteTokenAddress, mnemonic } = config;
-  const account = isDefined14(mnemonic) ? await HDWallet2.fromPhrase(mnemonic) : await HDWallet2.random();
+  const { remoteBridgeContractAddress, remoteChainWalletPrivateKey, remoteTokenAddress, accountPath } = config;
+  const account = await resolveWalletForActor2(config.name, accountPath);
   const wallet = new Wallet(remoteChainWalletPrivateKey, provider);
   const bridgeableToken = BridgeableToken__factory.connect(getAddress2(remoteTokenAddress), wallet);
   const bridge = LiquidityPoolBridge__factory.connect(getAddress2(remoteBridgeContractAddress), wallet);
@@ -1636,7 +1756,10 @@ var getServer = /* @__PURE__ */ __name(async (context, gateway) => {
   addWorkers(config, services);
   const server = app.listen(port, hostname, () => logger?.log(`[Bridge] Server listening at http://${hostname}:${port}`));
   server.setTimeout(2e4);
-  return server;
+  return {
+    server,
+    services
+  };
 }, "getServer");
 
 // src/BridgeActor.ts
@@ -1652,6 +1775,8 @@ var BridgeActor = class extends ActorV3 {
     __name(this, "BridgeActor");
   }
   _gatewayRunner;
+  _balanceMonitor;
+  _queueMetrics;
   server;
   get gatewayRunner() {
     return this._gatewayRunner;
@@ -1667,10 +1792,34 @@ var BridgeActor = class extends ActorV3 {
   }
   async stopHandler() {
     await super.stopHandler();
+    this._balanceMonitor?.stop();
+    this._queueMetrics?.stop();
+    this._balanceMonitor = void 0;
+    this._queueMetrics = void 0;
     this.stopServer();
   }
   async startServer() {
-    this.server = await getServer(asBridgeConfigContext(this.context, true), this._gatewayRunner);
+    const context = asBridgeConfigContext(this.context, true);
+    const { server, services } = await getServer(context, this._gatewayRunner);
+    this.server = server;
+    if (this.meter) {
+      this._balanceMonitor = createBalanceMonitor({
+        account: services.account,
+        bridge: services.bridge,
+        bridgeableToken: services.bridgeableToken,
+        gateway: services.gateway,
+        meter: this.meter,
+        provider: services.provider,
+        wallet: services.wallet
+      });
+      this._balanceMonitor.start();
+      const queues = getXl1ToEthQueues(context.config);
+      this._queueMetrics = createQueueMetrics({
+        meter: this.meter,
+        queues
+      });
+      this._queueMetrics.start();
+    }
   }
   stopServer() {
     this.server?.close();
@@ -1681,6 +1830,8 @@ BridgeActor = _ts_decorate([
   creatable()
 ], BridgeActor);
 export {
-  BridgeActor
+  BridgeActor,
+  createBalanceMonitor,
+  createQueueMetrics
 };
 //# sourceMappingURL=index.mjs.map