@xyo-network/xl1-cli 1.19.5 → 1.19.6

package/dist/cli-min.mjs

@@ -20795,23 +20795,29 @@ var uniq = (arr) => {
 };
 
 // src/assertDefinedEx.ts
-function assertDefinedEx(expr, messageOrFunc) {
+function assertDefinedEx(expr, func) {
   if (expr !== void 0) return expr;
-  if (typeof messageOrFunc === "function") {
-    const errorOrMessage = messageOrFunc(expr);
+  if (typeof func === "function") {
+    const errorOrMessage = func(expr);
     throw typeof errorOrMessage === "string" ? new Error(errorOrMessage) : errorOrMessage;
   }
-  throw new Error(messageOrFunc);
+  if (func !== void 0) {
+    throw new Error("Invalid assertEx usage: second argument must be a function or undefined");
+  }
+  throw new Error("Assertion failed: value is undefined");
 }
 
 // src/assertEx.ts
-function assertEx(expr, messageOrFunc) {
+function assertEx(expr, func) {
   if (expr) return expr;
-  if (typeof messageOrFunc === "function") {
-    const errorOrMessage = messageOrFunc(expr);
+  if (typeof func === "function") {
+    const errorOrMessage = func(expr);
     throw typeof errorOrMessage === "string" ? new Error(errorOrMessage) : errorOrMessage;
   }
-  throw new Error(messageOrFunc);
+  if (func !== void 0) {
+    throw new Error("Invalid assertEx usage: second argument must be a function or undefined");
+  }
+  throw new Error("Assertion failed");
 }
 
 /** A special constant with type `never` */
@@ -35312,6 +35318,8 @@ var toHex = (value, config = {}) => {
   const { prefix = false } = config;
   return hexFrom(value, { prefix, ...config });
 };
+
+// src/address/AddressValidationZod.ts
 var AddressValidationZod = string$2().refine((x) => HexZod.safeParse(x)).refine((x) => x.length === ADDRESS_LENGTH, { error: (e) => new Error(`Address must have 40 characters [${e.input}]`) }).transform((v) => v);
 
 // src/address/AddressTransformZod.ts
@@ -35332,20 +35340,6 @@ union$1([string$2(), bigint$1(), number$3()]).transform((value) => {
   }
 }).refine((x) => AddressValidationZod.safeParse(x).data).transform((x) => x);
 
-// src/address/to.ts
-var toAddress = (value, config = {}) => {
-  const { bitLength = 160, prefix = false } = config;
-  return hexFrom(value, {
-    bitLength,
-    prefix,
-    ...config
-  });
-};
-
-// src/address/addressDeprecated.ts
-string$2().regex(AddressRegEx);
-string$2().toLowerCase().regex(AddressRegEx).transform((v) => toAddress(v));
-
 // src/address/is.ts
 var isAddress = (value, config = {}) => {
   const { bitLength = 160, prefix = false } = config;
@@ -35371,6 +35365,16 @@ function asAddress(value, assert) {
     return assertError(void 0, assert, error.message);
   }
 }
+
+// src/address/to.ts
+var toAddress = (value, config = {}) => {
+  const { bitLength = 160, prefix = false } = config;
+  return hexFrom(value, {
+    bitLength,
+    prefix,
+    ...config
+  });
+};
 var EthAddressRegEx = HexRegExMinMaxMixedCaseWithPrefix(20, 20);
 string$2().regex(EthAddressRegEx);
 string$2().regex(EthAddressRegEx).transform((v) => toEthAddress(v));
@@ -89239,15 +89243,20 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       return [isPayloadBundle(p) ? await bundledPayloadToHydratedBlock(p) : void 0, p];
     }));
     return blockBundles.map(([block, bundle3]) => {
-      const result = [block ? block[0].chain === chainId && block[0].block > headNumber && isSignedHydratedBlockWithHashMeta(block) ? block : void 0 : void 0, bundle3];
-      if (result[0] === void 0) {
+      const blockCheckPassed = !!block;
+      const chainIdPassed = blockCheckPassed ? block[0].chain === chainId : false;
+      const blockNumberPassed = blockCheckPassed ? block[0].block > headNumber : false;
+      const typeCheckPassed = blockCheckPassed ? isSignedHydratedBlockWithHashMeta(block) : false;
+      const validationPassed = blockCheckPassed && chainIdPassed && blockNumberPassed && typeCheckPassed;
+      const validatedBlock = validationPassed ? block : void 0;
+      if (!validationPassed) {
         this.logger?.info(`Pruning block bundle ${bundle3._hash} during simpleValidationCheck`);
-        this.logger?.info(`  - chainId match: ${block ? block[0].chain === chainId : "n/a"}`);
-        this.logger?.info(`  - headNumber check: ${block ? block[0].block > headNumber : "n/a"}`);
-        this.logger?.info(`  - isSignedHydratedBlockWithHashMeta: ${block ? isSignedHydratedBlockWithHashMeta(block) : "n/a"}`);
-        this.logger?.info(`  - block value: ${block ? JSON.stringify(block, null, 2) : "n/a"}`);
+        this.logger?.info(`  - chainId match: ${chainIdPassed}`);
+        this.logger?.info(`  - blockNumber check: ${blockNumberPassed}`);
+        this.logger?.info(`  - typeCheck: ${typeCheckPassed}`);
+        this.logger?.info(`  - bundle hash: ${bundle3._hash}`);
       }
-      return result;
+      return [validatedBlock, bundle3];
     });
   }
 };
@@ -343170,10 +343179,15 @@ var ChainStepRewardsClaimSentinel = class extends AbstractSentinel {
       this._claimCheckCounter?.add(1, claimCounterAttributes);
       const stepRewardAddress = completedStepRewardAddress(stepIdentity);
       const balance = await this.viewer.account.balance.accountBalance(stepRewardAddress);
+      this.logger?.info(`Found balance of ${balance} to claim for step ${stepIdentity.step} at block ${stepIdentity.block} in step reward address ${stepRewardAddress}`);
       if (balance > 0n) {
-        this.logger?.info(`Found balance of ${balance} to claim for step ${stepIdentity.step} at block ${stepIdentity.block}`);
         this._claimAttemptsCounter?.add(1, claimCounterAttributes);
         const rewardsByStaker = await this.viewer.networkStakeStepRewardPoolRewards(stepIdentity);
+        const rewardRecipients = Object.keys(rewardsByStaker).length;
+        this.logger?.info(`Found ${rewardRecipients} reward recipients for step ${stepIdentity.step} at block ${stepIdentity.block}`);
+        if (!this.config.claimEmptySteps) {
+          assertEx(rewardRecipients > 0, () => "No reward recipients for step");
+        }
         const addressDistributions = this.calculateAddressDistributions(rewardsByStaker, balance);
         this.logger?.info(`Calculated address distributions for step ${stepIdentity.step} at block ${stepIdentity.block} with ${Object.keys(addressDistributions).length} addresses`);
         const tx = await this.submitRewardDistributionTransaction(stepRewardAddress, addressDistributions, stepIdentity, this.gateway);
@@ -350487,7 +350501,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined("1.19.4") ? "1.19.4" : "unknown";
+var version = isDefined("1.19.5") ? "1.19.5" : "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.5",
+  "version": "1.19.6",
   "description": "XYO Layer One CLI",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -62,11 +62,10 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@xylabs/sdk-js": "~5.0.64",
-    "@xylabs/telemetry": "~5.0.64",
+    "@xylabs/sdk-js": "~5.0.65",
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
     "@xylabs/tsconfig": "~7.3.2",
-    "@xylabs/vitest-extended": "~5.0.64",
+    "@xylabs/vitest-extended": "~5.0.65",
     "@xyo-network/account-model": "~5.3.2",
     "@xyo-network/archivist-lmdb": "~5.3.2",
     "@xyo-network/archivist-memory": "~5.3.2",
@@ -75,7 +74,7 @@
     "@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.5",
+    "@xyo-network/xl1-cli-lib": "~1.19.6",
     "@xyo-network/xl1-sdk": "~1.21.10",
     "async-mutex": "~0.5.0",
     "dotenv": "~17.2.3",