@xyo-network/xl1-cli 1.19.0 → 1.19.2

package/dist/cli-min.mjs

@@ -87435,7 +87435,7 @@ async function withContextCacheResponse(context, name, key, func, { max = 1e4 }
   if (isDefined(cacheResult)) {
     return cacheResult;
   }
-  const result = timeBudgetLimit > 0 ? await timeBudget(name, context.logger, func, timeBudgetLimit) : await func();
+  const result = timeBudgetLimit > 0 ? timeBudget(name, context.logger, func, timeBudgetLimit) : func();
   await cache.set(key, result);
   return result;
 }
@@ -96760,6 +96760,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
   _tracer;
   _accountBalanceViewer;
   _blockViewer;
+  _chainContractViewer;
   _finalizedPayloadMap;
   _mempoolViewer;
   _networkStakeViewer;
@@ -96776,6 +96777,9 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
   get block() {
     return this._blockViewer;
   }
+  get chainContractViewer() {
+    return this._chainContractViewer;
+  }
   get mempool() {
     return this._mempoolViewer;
   }
@@ -96830,12 +96834,12 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
     return await this.block.blocksByNumber(blockNumber, limit);
   }
   async chainId(blockNumber = "latest") {
-    return await this.spanAsync("chainIdAtBlock", async () => {
-      const block = assertEx(
-        blockNumber === "latest" ? await this.currentBlock() : await this.blockByNumber(blockNumber),
+    return await this.spanAsync("SimpleXyoViewer:chainId", async () => {
+      const chainId = assertEx(
+        blockNumber === "latest" ? await this.chainContractViewer.chainId() : await this.chainContractViewer.chainIdAtBlockNumber(blockNumber),
         () => `Could not find block for chainId at block ${blockNumber}`
       );
-      return block[0].chain;
+      return chainId;
     }, this.context);
   }
   async createHandler() {
@@ -96843,6 +96847,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
     this._finalizedPayloadMap = readPayloadMapFromStore(this.params.finalizedArchivist);
     this._accountBalanceViewer = await this.locator.getInstance(AccountBalanceViewerMoniker);
     this._blockViewer = await this.locator.getInstance(BlockViewerMoniker);
+    this._chainContractViewer = await this.locator.getInstance(ChainContractViewerMoniker);
     this._mempoolViewer = await this.locator.getInstance(MempoolViewerMoniker);
     this._networkStakeViewer = await this.locator.getInstance(NetworkStakeViewerMoniker);
     this._networkStepRewardsByPositionViewer = await this.locator.getInstance(NetworkStakeStepRewardsByPositionViewerMoniker);
@@ -96875,7 +96880,8 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
     throw new Error("Method [networkStakeStepRewardClaimedByAddress] not implemented.");
   }
   async networkStakeStepRewardForPosition(position, range) {
-    return await this.spanAsync("networkStakeStepRewardForPosition", async () => {
+    const cacheKey = `${position}|${range[0]}-${range[1]}`;
+    return await withContextCacheResponse(this.context, "SimpleXyoViewer:networkStakeStepRewardForPosition", cacheKey, async () => {
       const externalRange = await externalBlockRangeFromXL1BlockRange(this.context, this.block, range);
       const positionCount = await this.stake.stakeEvents.positionCount(externalRange);
       if (positionCount === 0) {
@@ -96886,7 +96892,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
       const positionReward = asAttoXL1(rewards.reduce((a, b) => a + b[0], 0n));
       const totalReward = asAttoXL1(rewards.reduce((a, b) => a + b[1], 0n));
       return [positionReward, totalReward];
-    }, this.context);
+    });
   }
   async networkStakeStepRewardForStep(stepContext) {
     return await stepRewardTotal(await this.getStakedChainContext(), stepContext, this.rewardMultipliers);
@@ -96895,7 +96901,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
     const stepIdentityString = toStepIdentityString(stepIdentity);
     const cacheKey = `${stepIdentityString}|${position}`;
     const stakedChainContext = await this.getStakedChainContext();
-    return await withContextCacheResponse(stakedChainContext, "NodeXyoViewer-networkStakeStepRewardForStepForPosition", cacheKey, async () => {
+    return await withContextCacheResponse(stakedChainContext, "SimpleXyoViewer:networkStakeStepRewardForStepForPosition", cacheKey, async () => {
       const range = await externalBlockRangeFromStep(stakedChainContext, this.block, stepIdentity);
       const stake = await this.stakeById(position);
       const numerator = stake.staked === XYO_NETWORK_STAKING_ADDRESS ? await weightedStakeForRangeByPosition(stakedChainContext, this.block, range, XYO_NETWORK_STAKING_ADDRESS, position) : 0n;
@@ -97090,7 +97096,8 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
       },
       store,
       chainId: await this.chainId(),
-      stake
+      stake,
+      timeBudgetLimit: this.context.timeBudgetLimit
     };
   }
   async startHandler() {
@@ -97104,14 +97111,23 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
           asXL1BlockRange([0, currentBlockNumber], { name: "startHandler" })
         );
         const positionCount = await this.stake.stakeEvents.positionCount(externalRange);
-        this.logger?.log(`NodeXyoViewer: Precomputing networkStakeStepRewardForPosition up to position ${positionCount - 1}`);
-        for (let position = 0; position < positionCount; position++) {
-          await this.networkStakeStepRewardForPosition(position, asXL1BlockRange([0, currentBlockNumber], { name: "startHandler" }));
+        this.logger?.log(`SimpleXyoViewer: Precomputing networkStakeStepRewardForPosition up to position ${positionCount - 1}`);
+        const positions = Array.from(
+          { length: positionCount },
+          (_, i) => i
+        );
+        while (positions.length > 0) {
+          const batch = positions.splice(0, 10);
+          this.logger?.log(`SimpleXyoViewer: Precomputing networkStakeStepRewardForPosition for positions ${batch.at(0)} - ${batch.at(-1)}`);
+          await Promise.all(batch.map(async (_, position) => await this.networkStakeStepRewardForPosition(
+            position,
+            asXL1BlockRange([0, currentBlockNumber], { name: "startHandler" })
+          )));
         }
-        this.logger?.log(`NodeXyoViewer: Precomputed networkStakeStepRewardForPosition up to position ${positionCount - 1}`);
+        this.logger?.log(`SimpleXyoViewer: Precomputed networkStakeStepRewardForPosition up to position ${positionCount - 1}`);
       }
     } catch (ex) {
-      this.logger?.error(`NodeXyoViewer: Error during startHandler initialization: ${ex.message}`);
+      this.logger?.error(`SimpleXyoViewer: Error during startHandler initialization: ${ex.message}`);
       this.logger?.error(ex.stack ?? "<No Stack>");
       throw ex;
     }
@@ -298452,6 +298468,7 @@ async function getServer$3(params) {
     config,
     logger,
     statusReporter,
+    timeBudgetLimit: 1e3,
     meterProvider,
     traceProvider,
     singletons: {},
@@ -298571,6 +298588,8 @@ async function getServer$3(params) {
   assertEx(blk, () => "No blocks found after initialization");
   const accountBalanceViewer = await locator.getInstance(AccountBalanceViewerMoniker);
   assertEx(await accountBalanceViewer.start(), () => "Failed to start AccountBalanceViewer");
+  const xyoViewer = await locator.getInstance(XyoViewerMoniker);
+  assertEx(await xyoViewer.start(), () => "Failed to start XyoViewer");
   console.info(`[API] Current block after initialization: #${blk[0].block} (${blk[0]._hash})`);
   const actor = config.mempool.enabled ? void 0 : await ValidatorActor.create({
     id: "validator-mempool-server",
@@ -298669,10 +298688,26 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 __name$4(_ts_decorate, "_ts_decorate");
 var TEN_MINUTES = 10 * 60 * 1e3;
+var toFormattedBlockReference = /* @__PURE__ */ __name$4((blockBoundWitness) => {
+  return `${blockBoundWitness.block} [${toHex(blockBoundWitness._hash, {
+    prefix: true
+  })}]`;
+}, "toFormattedBlockReference");
 var ProducerActor = class _ProducerActor extends Actor {
   static {
     __name$4(this, "ProducerActor");
   }
+  /**
+  * The interval time (in MS) between block production attempts.
+  */
+  static BlockSubmissionCheckInterval = 1500;
+  /**
+  * The threshold time (in MS) for resubmitting the same block number if the head has not changed.
+  */
+  static HeadResubmissionThreshold = _ProducerActor.BlockSubmissionCheckInterval * 30;
+  /**
+  * The window (in blocks) before expiration to attempt redeclaration of producer intent.
+  */
   static RedeclarationWindow = 1e4;
   _lastProducedBlock;
   _lastRedeclarationIntent;
@@ -298685,6 +298720,8 @@ var ProducerActor = class _ProducerActor extends Actor {
   _blockRunner;
   _blockViewer;
   _chainId;
+  _lastHeadChangeTime;
+  _lastHeadHash;
   _mempoolRunner;
   _mempoolViewer;
   _produceBlockMutex = new Mutex$1();
@@ -298795,15 +298832,9 @@ var ProducerActor = class _ProducerActor extends Actor {
   }
   async startHandler() {
     await super.startHandler();
-    this.registerTimer(
-      "BlockProductionTimer",
-      async () => {
-        await this.produceBlock();
-      },
-      2e3,
-      1500
-      /* 500 */
-    );
+    this.registerTimer("BlockProductionTimer", async () => {
+      await this.produceBlock();
+    }, 2e3, _ProducerActor.BlockSubmissionCheckInterval);
     {
       this.registerTimer("ProducerRedeclarationTimer", async () => {
         await this.redeclareIntent();
@@ -298823,24 +298854,44 @@ var ProducerActor = class _ProducerActor extends Actor {
       await this._produceBlockMutex.runExclusive(async () => {
         const head = (await this.blockViewer.currentBlock())[0];
         const headHash = head._hash;
-        if (this._lastProducedBlock && this._lastProducedBlock[0].previous === headHash) {
-          this.logger?.log("Block already produced:", `0x${toHex(this._lastProducedBlock[0].block)}`, this._lastProducedBlock[0].block);
-        } else {
+        const currentTime = Date.now();
+        if (this._lastHeadHash !== headHash) {
+          const lastHeadHashHex = isDefined(this._lastHeadHash) ? `0x${this._lastHeadHash}` : "undefined";
+          const currentHeadHashHex = `0x${headHash}`;
+          this.logger?.log(`Found updated head ${lastHeadHashHex} -> ${currentHeadHashHex}`);
+          this._lastHeadHash = headHash;
+          this._lastHeadChangeTime = currentTime;
+        }
+        const timeSinceHeadChange = isDefined(this._lastHeadChangeTime) ? currentTime - this._lastHeadChangeTime : 0;
+        const shouldSubmit = !this._lastProducedBlock || this._lastProducedBlock[0].previous !== headHash;
+        const shouldResubmit = timeSinceHeadChange > _ProducerActor.HeadResubmissionThreshold;
+        const shouldSubmitBlock = shouldSubmit || shouldResubmit;
+        if (shouldSubmitBlock) {
+          if (shouldResubmit) {
+            this.logger?.log(`Resubmitting block due to stale head. Head ${toFormattedBlockReference(head)} unchanged for ${timeSinceHeadChange}ms`);
+            this._lastHeadChangeTime = currentTime;
+          }
           this._producerActorBlockProductionAttempts?.add(1, this._metricAttributes);
           const nextBlock = await this.blockRunner.next(head);
           if (nextBlock) {
-            const displayBlockNumber = `0x${toHex(nextBlock[0].block)}`;
+            const displayBlockNumber = toFormattedBlockReference(nextBlock[0]);
             this.logger?.log("Produced block:", displayBlockNumber);
             this._producerActorBlocksProduced?.add(1, this._metricAttributes);
             await this.mempoolRunner.submitBlocks([
               nextBlock
             ]);
-            this.logger?.log("Published block:", displayBlockNumber, nextBlock[0].block);
+            this.logger?.log("Published block:", displayBlockNumber);
             this._producerActorBlocksPublished?.add(1, this._metricAttributes);
             this._lastProducedBlock = nextBlock;
           } else {
-            this.logger?.log("No block produced at this time.");
+            this.logger?.log("No block produced for submission.");
+          }
+        } else {
+          let nonSubmissionMessage = "No block submission required at this time";
+          if (isDefined(this._lastProducedBlock)) {
+            nonSubmissionMessage = nonSubmissionMessage + `, already produced: ${toFormattedBlockReference(this._lastProducedBlock[0])}`;
           }
+          this.logger?.log(`${nonSubmissionMessage}.`);
         }
       });
     }, {
@@ -350163,7 +350214,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined("1.18.5") ? "1.18.5" : "unknown";
+var version = isDefined("1.19.1") ? "1.19.1" : "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.0",
+  "version": "1.19.2",
   "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.0",
-    "@xyo-network/xl1-sdk": "~1.20.2",
+    "@xyo-network/xl1-cli-lib": "~1.19.2",
+    "@xyo-network/xl1-sdk": "~1.20.9",
     "async-mutex": "~0.5.0",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.2",