@xyo-network/xl1-cli 1.19.4 → 1.19.5

package/dist/cli-min.mjs

@@ -201982,6 +201982,44 @@ async function createChain(signer, stakingTokenAddress, initialBlockProducer, re
   ];
 }
 __name$e(createChain, "createChain");
+var EthHashRegEx = HexRegExMinMaxMixedCaseWithPrefix(32, 32);
+var EthHashZod = string$2().regex(EthHashRegEx, {
+  message: "Invalid address format"
+});
+var EvmStakeAddedEventNameZod = literal$2("StakeAdded");
+var EvmStakeRemovedEventNameZod = literal$2("StakeRemoved");
+var EvmStakeWithdrawnEventNameZod = literal$2("StakeWithdrawn");
+var EvmStakeEventNameZod = union$1([
+  EvmStakeAddedEventNameZod,
+  EvmStakeRemovedEventNameZod,
+  EvmStakeWithdrawnEventNameZod
+]);
+var EvmStakeEventArgsZod = tuple([
+  EthAddressZod,
+  EthAddressZod,
+  bigint$1(),
+  bigint$1()
+]);
+var EvmStakeEventZod = object$4({
+  address: EthAddressZod,
+  args: EvmStakeEventArgsZod,
+  blockHash: EthHashZod,
+  blockNumber: number$3(),
+  eventName: EvmStakeEventNameZod,
+  transactionHash: EthHashZod,
+  transactionIndex: number$3()
+});
+EvmStakeEventZod.extend({
+  eventName: EvmStakeAddedEventNameZod
+});
+EvmStakeEventZod.extend({
+  eventName: EvmStakeRemovedEventNameZod
+});
+EvmStakeEventZod.extend({
+  eventName: EvmStakeWithdrawnEventNameZod
+});
+
+// src/drivers/EvmStakeEventsViewer.ts
 function _ts_decorate$5(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);
@@ -201989,6 +202027,170 @@ function _ts_decorate$5(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name$e(_ts_decorate$5, "_ts_decorate");
+var EvmStakeEventsViewer = class _EvmStakeEventsViewer extends AbstractCreatableProvider {
+  static {
+    __name$e(this, "EvmStakeEventsViewer");
+  }
+  static defaultMoniker = StakeEventsViewerMoniker;
+  static dependencies = [];
+  static monikers = [
+    StakeEventsViewerMoniker
+  ];
+  moniker = _EvmStakeEventsViewer.defaultMoniker;
+  eventCache = /* @__PURE__ */ new Map();
+  get contract() {
+    return assertEx(this.params.contract, () => new Error("Contract not defined"));
+  }
+  get deploymentBlock() {
+    return this.params.deploymentBlock ?? 0;
+  }
+  async positionCount(range) {
+    const events = await this.stakeEvents(range);
+    const positionIds = events.map((e) => e.args.id);
+    return Math.max(-1, ...positionIds) + 1;
+  }
+  stakeEvents(range = [
+    0,
+    "latest"
+  ], filter) {
+    const allEvents = [
+      ...this.eventCache.values()
+    ];
+    const result = allEvents.filter((e) => {
+      if (range[1] !== "latest" && e.time > range[1]) {
+        return false;
+      }
+      if (e.time < range[0]) {
+        return false;
+      }
+      if (isDefined(filter?.name) && e.name !== filter.name) {
+        return false;
+      }
+      if (isDefined(filter?.args?.id) && e.args.id !== filter.args.id) {
+        return false;
+      }
+      if (isDefined(filter?.args?.staked) && e.args.staked !== filter.args.staked) {
+        return false;
+      }
+      if (isDefined(filter?.args?.staker) && e.args.staker !== filter.args.staker) {
+        return false;
+      }
+      return true;
+    });
+    return result;
+  }
+  onEventHandler(staked, staker, id, amount, event, throwOnInvalid = false) {
+    const validatedEventResult = EvmStakeEventZod.safeParse(event);
+    if (validatedEventResult.error) {
+      this.logger?.warn(`Received invalid stake event [${event.eventName}/${event.blockNumber}], ignoring...`);
+      this.logger?.warn(` - ${validatedEventResult.error.message}`);
+      if (throwOnInvalid) {
+        throw new Error(`Invalid stake event: ${validatedEventResult.error.message}`);
+      }
+      return;
+    }
+    const validatedEvent = validatedEventResult.data;
+    const { eventName, blockNumber } = validatedEvent;
+    this.logger?.log(`Processing ${eventName} event for stake ID ${id} at block ${blockNumber}`);
+    const cacheKey = `${Number(id)}|${eventName}|${staker}`;
+    const existingStakeEvent = this.eventCache.get(cacheKey);
+    const stakeEvent = {
+      name: eventName,
+      args: {
+        id: Number(id),
+        staked: toAddress(staked),
+        staker: toAddress(staker),
+        amount: asAttoXL1(amount)
+      },
+      time: blockNumber
+    };
+    if (isDefined(existingStakeEvent)) {
+      this.logger?.warn(`Received ${eventName} event for stake ID ${id} that is already cached, updating cache...`);
+      this.logger?.warn("1");
+      this.logger?.warn("Previous event", existingStakeEvent);
+      this.logger?.warn("2");
+      this.logger?.warn("New event", stakeEvent);
+      this.logger?.warn("3");
+    }
+    this.eventCache.set(cacheKey, stakeEvent);
+    return stakeEvent;
+  }
+  async startHandler() {
+    try {
+      const currentEthBlock = assertEx(await this.contract.runner?.provider?.getBlockNumber(), () => new Error("Failed to egt currentEthBlock"));
+      await this.contract.on(this.contract.getEvent("StakeAdded"), (staked, staker, id, amount, event) => {
+        this.onEventHandler(staked, staker, id, amount, event);
+      });
+      await this.contract.on(this.contract.getEvent("StakeRemoved"), (staked, staker, id, amount, event) => {
+        this.onEventHandler(staked, staker, id, amount, event);
+      });
+      await this.contract.on(this.contract.getEvent("StakeWithdrawn"), (staked, staker, id, amount, event) => {
+        this.onEventHandler(staked, staker, id, amount, event);
+      });
+      await this.loadHistoricalEvents(currentEthBlock);
+    } catch (error) {
+      this.logger?.error("EthereumChainStakeEvents failed to start:", error);
+      throw error;
+    }
+  }
+  async loadHistoricalEvents(currentEthBlock) {
+    const allStakeEvents = (await Promise.all([
+      this.stakeEventsNative([
+        this.deploymentBlock,
+        currentEthBlock
+      ], {
+        name: "StakeAdded"
+      }),
+      this.stakeEventsNative([
+        this.deploymentBlock,
+        currentEthBlock
+      ], {
+        name: "StakeRemoved"
+      }),
+      this.stakeEventsNative([
+        this.deploymentBlock,
+        currentEthBlock
+      ], {
+        name: "StakeWithdrawn"
+      })
+    ])).flat().toSorted((a, b) => a.time - b.time);
+    console.warn(`Caching ${allStakeEvents.length} stake events from chain starting at block ${this.deploymentBlock}`);
+    for (const event of allStakeEvents) {
+      this.eventCache.set(`${Number(event.args.id)}|${event.name}|${event.args.staker}`, event);
+    }
+  }
+  async stakeEventsNative(range = [
+    0,
+    "latest"
+  ], filter) {
+    const name = filter?.name;
+    if (isDefined(name)) {
+      const stakedFilter = filter?.args?.staked;
+      const stakerFilter = filter?.args?.staker;
+      const stakedFilterEth = isDefined(stakedFilter) ? toEthAddress(stakedFilter) : void 0;
+      const stakerFilterEth = isDefined(stakerFilter) ? toEthAddress(stakerFilter) : void 0;
+      let ethEvents = [];
+      const ethFilter = this.contract.filters[name](stakedFilterEth, stakerFilterEth);
+      ethEvents = await this.contract.queryFilter(ethFilter, range[0], range[1]);
+      return ethEvents.map((e) => {
+        assertEx(e.eventName === name, () => `Event name mismatch expected '${name}' but got '${e.eventName}'`);
+        return this.onEventHandler(e.args.staked, e.args.by, e.args.id, e.args.amount, e, true);
+      }).filter(exists$2);
+    } else {
+      throw new Error("Only filtered stake events (by name) are supported");
+    }
+  }
+};
+EvmStakeEventsViewer = _ts_decorate$5([
+  creatableProvider()
+], EvmStakeEventsViewer);
+function _ts_decorate2$3(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$e(_ts_decorate2$3, "_ts_decorate");
 var ethStakeToStake = /* @__PURE__ */ __name$e((ethStake) => {
   const stake = {
     id: Number(ethStake.id),
@@ -202001,16 +202203,16 @@ var ethStakeToStake = /* @__PURE__ */ __name$e((ethStake) => {
   };
   return stake;
 }, "ethStakeToStake");
-var EthereumChainStakeViewer = class _EthereumChainStakeViewer extends AbstractCreatableProvider {
+var EvmStakeViewer = class _EvmStakeViewer extends AbstractCreatableProvider {
   static {
-    __name$e(this, "EthereumChainStakeViewer");
+    __name$e(this, "EvmStakeViewer");
   }
   static defaultMoniker = StakeViewerMoniker;
   static dependencies = [];
   static monikers = [
     StakeViewerMoniker
   ];
-  moniker = _EthereumChainStakeViewer.defaultMoniker;
+  moniker = _EvmStakeViewer.defaultMoniker;
   _callMutex = new Mutex$1();
   _deploymentBlock = 0;
   _stakeCache = /* @__PURE__ */ new Map();
@@ -202211,174 +202413,9 @@ var EthereumChainStakeViewer = class _EthereumChainStakeViewer extends AbstractC
     }
   }
 };
-EthereumChainStakeViewer = _ts_decorate$5([
-  creatableProvider()
-], EthereumChainStakeViewer);
-function _ts_decorate2$3(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$e(_ts_decorate2$3, "_ts_decorate");
-var isStakeLogEventName = /* @__PURE__ */ __name$e((name) => {
-  return isString$1(name) && [
-    "StakeAdded",
-    "StakeRemoved",
-    "StakeWithdrawn"
-  ].includes(name);
-}, "isStakeLogEventName");
-var EthereumChainStakeEventsViewer = class _EthereumChainStakeEventsViewer extends AbstractCreatableProvider {
-  static {
-    __name$e(this, "EthereumChainStakeEventsViewer");
-  }
-  static defaultMoniker = StakeEventsViewerMoniker;
-  static dependencies = [];
-  static monikers = [
-    StakeEventsViewerMoniker
-  ];
-  moniker = _EthereumChainStakeEventsViewer.defaultMoniker;
-  eventCache = /* @__PURE__ */ new Map();
-  get contract() {
-    return assertEx(this.params.contract, () => new Error("Contract not defined"));
-  }
-  get deploymentBlock() {
-    return this.params.deploymentBlock ?? 0;
-  }
-  async positionCount(range) {
-    const events = await this.stakeEvents(range);
-    const positionIds = events.map((e) => e.args.id);
-    return Math.max(-1, ...positionIds) + 1;
-  }
-  stakeEvents(range = [
-    0,
-    "latest"
-  ], filter) {
-    const allEvents = [
-      ...this.eventCache.values()
-    ];
-    const result = allEvents.filter((e) => {
-      if (range[1] !== "latest" && e.time > range[1]) {
-        return false;
-      }
-      if (e.time < range[0]) {
-        return false;
-      }
-      if (isDefined(filter?.name) && e.name !== filter.name) {
-        return false;
-      }
-      if (isDefined(filter?.args?.id) && e.args.id !== filter.args.id) {
-        return false;
-      }
-      if (isDefined(filter?.args?.staked) && e.args.staked !== filter.args.staked) {
-        return false;
-      }
-      if (isDefined(filter?.args?.staker) && e.args.staker !== filter.args.staker) {
-        return false;
-      }
-      return true;
-    });
-    return result;
-  }
-  onEventHandler(staked, staker, id, amount, { eventName, blockNumber }) {
-    if (blockNumber === void 0) {
-      this.logger?.warn(`Received ${eventName} event with ${blockNumber} blockNumber, ignoring...`);
-      return;
-    }
-    if (!isStakeLogEventName(eventName)) {
-      this.logger?.warn(`Received event with unsupported name '${eventName}'`);
-      return;
-    }
-    this.logger?.log(`Processing ${eventName} event for stake ID ${id} at block ${blockNumber}`);
-    const cacheKey = `${Number(id)}|${eventName}|${staker}`;
-    const existingStakeEvent = this.eventCache.get(cacheKey);
-    const stakeEvent = {
-      name: eventName,
-      args: {
-        id: Number(id),
-        staked: toAddress(staked),
-        staker: toAddress(staker),
-        amount: asAttoXL1(amount)
-      },
-      time: blockNumber
-    };
-    if (isDefined(existingStakeEvent)) {
-      this.logger?.warn(`Received ${eventName} event for stake ID ${id} that is already cached, updating cache...`);
-      this.logger?.warn("1");
-      this.logger?.warn("Previous event", existingStakeEvent);
-      this.logger?.warn("2");
-      this.logger?.warn("New event", stakeEvent);
-      this.logger?.warn("3");
-    }
-    this.eventCache.set(cacheKey, stakeEvent);
-    return stakeEvent;
-  }
-  async startHandler() {
-    try {
-      const currentEthBlock = assertEx(await this.contract.runner?.provider?.getBlockNumber(), () => new Error("Failed to egt currentEthBlock"));
-      await this.contract.on(this.contract.getEvent("StakeAdded"), (staked, staker, id, amount, event) => {
-        this.onEventHandler(staked, staker, id, amount, event);
-      });
-      await this.contract.on(this.contract.getEvent("StakeRemoved"), (staked, staker, id, amount, event) => {
-        this.onEventHandler(staked, staker, id, amount, event);
-      });
-      await this.contract.on(this.contract.getEvent("StakeWithdrawn"), (staked, staker, id, amount, event) => {
-        this.onEventHandler(staked, staker, id, amount, event);
-      });
-      const allStakeEvents = (await Promise.all([
-        this.stakeEventsNative([
-          this.deploymentBlock,
-          currentEthBlock
-        ], {
-          name: "StakeAdded"
-        }),
-        this.stakeEventsNative([
-          this.deploymentBlock,
-          currentEthBlock
-        ], {
-          name: "StakeRemoved"
-        }),
-        this.stakeEventsNative([
-          this.deploymentBlock,
-          currentEthBlock
-        ], {
-          name: "StakeWithdrawn"
-        })
-      ])).flat().toSorted((a, b) => a.time - b.time);
-      console.warn(`Caching ${allStakeEvents.length} stake events from chain starting at block ${this.deploymentBlock}`);
-      for (const event of allStakeEvents) {
-        this.eventCache.set(`${Number(event.args.id)}|${event.name}|${event.args.staker}`, event);
-      }
-    } catch (error) {
-      this.logger?.error("EthereumChainStakeEvents failed to start:", error);
-      throw error;
-    }
-  }
-  async stakeEventsNative(range = [
-    0,
-    "latest"
-  ], filter) {
-    const name = filter?.name;
-    if (isDefined(name)) {
-      const stakedFilter = filter?.args?.staked;
-      const stakerFilter = filter?.args?.staker;
-      const stakedFilterEth = isDefined(stakedFilter) ? toEthAddress(stakedFilter) : void 0;
-      const stakerFilterEth = isDefined(stakerFilter) ? toEthAddress(stakerFilter) : void 0;
-      let ethEvents = [];
-      const ethFilter = this.contract.filters[name](stakedFilterEth, stakerFilterEth);
-      ethEvents = await this.contract.queryFilter(ethFilter, range[0], range[1]);
-      return ethEvents.map((e) => {
-        assertEx(e.eventName === name, () => `Event name mismatch expected '${name}' but got '${e.eventName}'`);
-        return this.onEventHandler(e.args.staked, e.args.by, e.args.id, e.args.amount, e);
-      }).filter(exists$2);
-    } else {
-      throw new Error("Only filtered stake events (by name) are supported");
-    }
-  }
-};
-EthereumChainStakeEventsViewer = _ts_decorate2$3([
+EvmStakeViewer = _ts_decorate2$3([
   creatableProvider()
-], EthereumChainStakeEventsViewer);
+], EvmStakeViewer);
 var AbstractEvmProvider = class extends AbstractCreatableProvider {
   static {
     __name$e(this, "AbstractEvmProvider");
@@ -297899,19 +297936,19 @@ async function initEvmChainStakeViewer(context, config, logger) {
   });
   const contractAddress = assertEx(config.chain.id, () => "Missing config.evm.chainId");
   const contract = IStakedXyoChain__factory.connect(toEthAddress(contractAddress), provider2);
-  const stakeEventsViewer = await EthereumChainStakeEventsViewer.create({
+  const stakeEventsViewer = await EvmStakeEventsViewer.create({
     contract,
     logger,
     context
   });
-  assertEx(await stakeEventsViewer.start(), () => "Failed to start EthereumChainStakeEvents reader");
-  const stakeChainViewer = await EthereumChainStakeViewer.create({
+  assertEx(await stakeEventsViewer.start(), () => "Failed to start EvmStakeEvents reader");
+  const stakeChainViewer = await EvmStakeViewer.create({
     contract,
     stakeEventsViewer,
     logger,
     context
   });
-  assertEx(await stakeChainViewer.start(), () => "Failed to start EthereumChainStake viewer");
+  assertEx(await stakeChainViewer.start(), () => "Failed to start EvmStake viewer");
   return stakeChainViewer;
 }
 __name$6(initEvmChainStakeViewer, "initEvmChainStakeViewer");
@@ -298770,12 +298807,12 @@ async function getServer$3(params) {
     });
     const contractAddress = assertEx(config.chain.id, () => "Missing config.chain.chainId");
     const contract = IStakedXyoChain__factory.connect(toEthAddress(contractAddress), provider);
-    locator.register(EthereumChainStakeEventsViewer.factory(EthereumChainStakeEventsViewer.dependencies, {
+    locator.register(EvmStakeEventsViewer.factory(EvmStakeEventsViewer.dependencies, {
       contract
     }));
-    const stakeEventsViewer = await locator.getInstance(EthereumChainStakeEventsViewer.defaultMoniker);
-    assertEx(await stakeEventsViewer.start(), () => "Failed to start EthereumChainStakeEventsViewer");
-    locator.register(EthereumChainStakeViewer.factory(EthereumChainStakeViewer.dependencies, {
+    const stakeEventsViewer = await locator.getInstance(EvmStakeEventsViewer.defaultMoniker);
+    assertEx(await stakeEventsViewer.start(), () => "Failed to start EvmStakeEventsViewer");
+    locator.register(EvmStakeViewer.factory(EvmStakeViewer.dependencies, {
       contract,
       stakeEventsViewer
     }));
@@ -350450,7 +350487,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined("1.19.3") ? "1.19.3" : "unknown";
+var version = isDefined("1.19.4") ? "1.19.4" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name(async (configuration2) => {
   const logger = initLogger(configuration2);
   const orchestrator = await Orchestrator.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/xl1-cli",
-  "version": "1.19.4",
+  "version": "1.19.5",
   "description": "XYO Layer One CLI",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -75,8 +75,8 @@
     "@xyo-network/payload-model": "~5.3.2",
     "@xyo-network/wallet": "~5.3.2",
     "@xyo-network/wallet-model": "~5.3.2",
-    "@xyo-network/xl1-cli-lib": "~1.19.4",
-    "@xyo-network/xl1-sdk": "~1.21.9",
+    "@xyo-network/xl1-cli-lib": "~1.19.5",
+    "@xyo-network/xl1-sdk": "~1.21.10",
     "async-mutex": "~0.5.0",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.2",