@xyo-network/xl1-cli-lib 1.14.0 → 1.14.2

package/dist/node/index.mjs

@@ -166,7 +166,7 @@ var BalanceActor = class _BalanceActor extends Actor {
     super("BalanceActor", "Balance", params);
   }
   get balanceService() {
-    return assertEx(this.params.balanceService, () => "balanceService not set");
+    return assertEx(this.params.balance, () => "balanceService not set");
   }
   get chainIterator() {
     return assertEx(this.params.chainIterator, () => "chainIterator not set");
@@ -266,7 +266,7 @@ var ProducerActor = class _ProducerActor extends Actor {
     return assertEx3(this.params.account, () => "account not set");
   }
   get balanceService() {
-    return assertEx3(this.params.balanceService, () => "balanceService not set");
+    return assertEx3(this.params.balance, () => "balanceService not set");
   }
   get chainIterator() {
     return assertEx3(this.params.chainIterator, () => "chainIterator not set");
@@ -284,7 +284,7 @@ var ProducerActor = class _ProducerActor extends Actor {
     return assertEx3(this.params.producer, () => "producer not set");
   }
   get stakeIntentService() {
-    return assertEx3(this.params.stakeIntentService, () => "stakeIntentService not set");
+    return assertEx3(this.params.stakeIntent, () => "stakeIntentService not set");
   }
   static create(params) {
     return new _ProducerActor(params);
@@ -413,7 +413,7 @@ var ValidatorActor = class _ValidatorActor extends Actor {
     return assertEx4(this.params.account, () => "account not set");
   }
   get balanceService() {
-    return assertEx4(this.params.balanceService, () => "balanceService not set");
+    return assertEx4(this.params.balance, () => "balanceService not set");
   }
   get chainIterator() {
     return assertEx4(this.params.chainIterator, () => "chainIterator not set");
@@ -428,7 +428,7 @@ var ValidatorActor = class _ValidatorActor extends Actor {
     return assertEx4(this.params.pendingBundledTransactionsArchivistWrite, () => "pendingBundledTransactionsArchivistWrite not set");
   }
   get stakeIntentService() {
-    return assertEx4(this.params.stakeIntentService, () => "stakeIntentService not set");
+    return assertEx4(this.params.stakeIntent, () => "stakeIntentService not set");
   }
   // protected get validator() {
   //   return assertEx(this.params.validator, () => 'validator not set')
@@ -529,8 +529,8 @@ var initHealthEndpoints = /* @__PURE__ */ __name((params) => {
 // src/orchestration/initServices.ts
 import { assertEx as assertEx17 } from "@xylabs/assert";
 import { asAddress as asAddress2 } from "@xylabs/hex";
-import { isDefined as isDefined10 } from "@xylabs/typeof";
-import { balanceSummaryRepositoryFromMap, initTelemetry, startupSpanAsync as startupSpanAsync7, validateHydratedBlockState } from "@xyo-network/chain-sdk";
+import { isDefined as isDefined11 } from "@xylabs/typeof";
+import { balanceSummaryRepositoryFromMap, BaseTimeSyncService, initTelemetry, startupSpanAsync as startupSpanAsync7, validateHydratedBlockState } from "@xyo-network/chain-sdk";
 
 // src/orchestration/archivists/ChainFinalized/archivist.ts
 import { initArchivistSync, startupSpanAsync } from "@xyo-network/chain-sdk";
@@ -1091,8 +1091,9 @@ var init = /* @__PURE__ */ __name((params) => {
 
 // src/orchestration/services/implementation/head.ts
 import { delay } from "@xylabs/delay";
-import { ZERO_ADDRESS as ZERO_ADDRESS2 } from "@xylabs/hex";
-import { createGenesisBlock, findMostRecentBlock as findMostRecentBlock2 } from "@xyo-network/chain-sdk";
+import { asHash, hexFromBigInt, ZERO_ADDRESS as ZERO_ADDRESS2 } from "@xylabs/hex";
+import { isDefined as isDefined10 } from "@xylabs/typeof";
+import { buildBlock, createGenesisBlock, findMostRecentBlock as findMostRecentBlock2, isBlockBoundWitnessWithHashStorageMeta } from "@xyo-network/chain-sdk";
 import { flattenHydratedBlock as flattenHydratedBlock2 } from "@xyo-network/xl1-protocol-sdk";
 var headSingleton;
 var createBootstrapHead = /* @__PURE__ */ __name(async (chainSubmissionsArchivistWrite, chainArchivist, account) => {
@@ -1108,11 +1109,57 @@ var createBootstrapHead = /* @__PURE__ */ __name(async (chainSubmissionsArchivis
   }
   return bw;
 }, "createBootstrapHead");
+var createForkedHead = /* @__PURE__ */ __name(async (chainSubmissionsArchivistWrite, chainArchivist, account, forkBlock, chainId) => {
+  const { _hash: previousBlockHash, block: previousBlockNumber, step_hashes: previousStepHashes, protocol } = forkBlock;
+  const forkBlockReward = 0n;
+  const forkBlockRewardAddress = account.address;
+  const options = {
+    blockPayloads: [],
+    chainId,
+    previousBlockHash,
+    previousBlockNumber,
+    previousStepHashes,
+    signers: [
+      account
+    ],
+    txs: [],
+    protocol,
+    reward: forkBlockReward,
+    rewardAddress: forkBlockRewardAddress
+  };
+  const block = await buildBlock(options);
+  const [bw] = block;
+  await chainSubmissionsArchivistWrite.insert(flattenHydratedBlock2(block));
+  while (true) {
+    const result = await chainArchivist.get([
+      bw._hash
+    ]);
+    if (result.length > 0) break;
+    await delay(1e3);
+  }
+  return bw;
+}, "createForkedHead");
 var initHead = /* @__PURE__ */ __name(async (params) => {
-  const { account, chainArchivist, chainSubmissionsArchivistWrite } = params;
+  const { account, chainArchivist, chainSubmissionsArchivistWrite, chainService } = params;
   if (headSingleton) return headSingleton;
   let head = await findMostRecentBlock2(chainArchivist);
-  if (!head) head = await createBootstrapHead(chainSubmissionsArchivistWrite, chainArchivist, account);
+  if (!head) {
+    head = await createBootstrapHead(chainSubmissionsArchivistWrite, chainArchivist, account);
+  } else if (head.chain !== chainService.chainId) {
+    const forkedAtBigInt = await chainService.forkedAtHash();
+    const forkedAtHex = hexFromBigInt(forkedAtBigInt);
+    const forkedAtHash = asHash(forkedAtHex);
+    if (isDefined10(forkedAtHash)) {
+      const [forkBlock] = await chainArchivist.get([
+        forkedAtHash
+      ]);
+      const forkedChainId = await chainService.forkedChainId();
+      const forkedAtBlockNumber = Number(await chainService.forkedAtBlockNumber());
+      if (isBlockBoundWitnessWithHashStorageMeta(forkBlock) && forkBlock.chain === forkedChainId && forkBlock.block === forkedAtBlockNumber) {
+        head = await createForkedHead(chainSubmissionsArchivistWrite, chainArchivist, account, forkBlock, chainService.chainId);
+      }
+    }
+  }
   headSingleton = head;
   return headSingleton;
 }, "initHead");
@@ -1290,7 +1337,7 @@ var RuntimeStatusMonitor = class extends LoggerStatusReporter {
 
 // src/orchestration/initServices.ts
 var isStartable = /* @__PURE__ */ __name((value) => {
-  return isDefined10(value.start) && typeof value.start === "function";
+  return isDefined11(value.start) && typeof value.start === "function";
 }, "isStartable");
 var initServices = /* @__PURE__ */ __name(async (context) => {
   const { config: config3, logger } = context;
@@ -1354,7 +1401,8 @@ var initServices = /* @__PURE__ */ __name(async (context) => {
     ...initParams,
     account,
     chainArchivist,
-    chainSubmissionsArchivistWrite
+    chainSubmissionsArchivistWrite,
+    chainService
   }));
   const [pendingTransactionsService, rewardService, chainIterator, balanceService] = await Promise.all([
     startupSpanAsync7("PendingTransactions", () => initPendingTransactions({
@@ -1411,7 +1459,11 @@ var initServices = /* @__PURE__ */ __name(async (context) => {
     validateHydratedBlockState,
     ...initParams
   };
-  const rewardAddress = isDefined10(config3.producer.rewardAddress) ? assertEx17(asAddress2(config3.producer.rewardAddress), () => "Invalid block reward address provided") : account.address;
+  const time = await BaseTimeSyncService.create({
+    chainArchivist,
+    chainIterator
+  });
+  const rewardAddress = isDefined11(config3.producer.rewardAddress) ? assertEx17(asAddress2(config3.producer.rewardAddress), () => "Invalid block reward address provided") : account.address;
   const producerParams = {
     ...validatorParams,
     name: "Producer",
@@ -1421,24 +1473,25 @@ var initServices = /* @__PURE__ */ __name(async (context) => {
     pendingTransactionsService,
     rejectedTransactionsArchivist,
     rewardAddress,
+    time,
     ...initParams
   };
   const producer = await startupSpanAsync7("Producer", () => initBlockProducer(producerParams));
   const result = {
     account,
-    balanceService,
+    balance: balanceService,
     chainArchivist,
     chainContractViewer,
     chainIterator,
     chainStaker,
     chainStakeViewer,
     chainSubmissionsArchivistWrite,
-    electionService,
+    election: electionService,
     pendingBundledTransactionsArchivistWrite,
-    pendingTransactionsService,
+    pendingTransactions: pendingTransactionsService,
     producer,
-    rewardService,
-    stakeIntentService
+    reward: rewardService,
+    stakeIntent: stakeIntentService
   };
   logger?.log("All services created. Starting...");
   const startableServices = [
@@ -1451,7 +1504,7 @@ var initServices = /* @__PURE__ */ __name(async (context) => {
 
 // src/runCLI.ts
 import { deepMerge } from "@xylabs/object";
-import { isDefined as isDefined13 } from "@xylabs/typeof";
+import { isDefined as isDefined14 } from "@xylabs/typeof";
 import { ConfigZod } from "@xyo-network/xl1-protocol-sdk";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -1511,16 +1564,16 @@ var XL1LogoColorizedAscii = `\x1B[38;2;128;128;128m\xA0\xA0\xA0\xA0\xA0\xA0\xA0\
 // src/initLogger.ts
 import { Base as Base2 } from "@xylabs/base";
 import { ConsoleLogger, LogLevel, SilentLogger } from "@xylabs/logger";
-import { isDefined as isDefined11 } from "@xylabs/typeof";
+import { isDefined as isDefined12 } from "@xylabs/typeof";
 var initLogger = /* @__PURE__ */ __name((config3) => {
   let logger;
   if (config3.silent) {
     logger = new SilentLogger();
   } else {
     let level;
-    if (isDefined11(config3.logLevel)) {
+    if (isDefined12(config3.logLevel)) {
       const parsed = LogLevel[config3.logLevel.toLowerCase()];
-      if (isDefined11(parsed)) level = parsed;
+      if (isDefined12(parsed)) level = parsed;
     }
     logger = new ConsoleLogger(level);
   }
@@ -1546,7 +1599,7 @@ var optionsFromGlobalZodRegistry = /* @__PURE__ */ __name(() => {
 }, "optionsFromGlobalZodRegistry");
 
 // src/tryParseConfig.ts
-import { isDefined as isDefined12, isNull } from "@xylabs/typeof";
+import { isDefined as isDefined13, isNull } from "@xylabs/typeof";
 import { cosmiconfigSync } from "cosmiconfig";
 var configName = "xyo";
 var configSection = "xl1";
@@ -1555,7 +1608,7 @@ var tryParseConfig = /* @__PURE__ */ __name(() => {
   const result = explorer.search();
   if (!isNull(result)) {
     const section = result?.config?.[configSection];
-    if (isDefined12(section) && typeof section === "object") {
+    if (isDefined13(section) && typeof section === "object") {
       return section;
     }
   }
@@ -1585,7 +1638,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var config;
-var version = isDefined13("1.13.0") ? "1.13.0" : "unknown";
+var version = isDefined14("1.14.1") ? "1.14.1" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name((config3) => {
   const logger = initLogger(config3);
   const orchestrator = new Orchestrator(logger);