@xyo-network/chain-sdk 4.1.0 → 4.3.0

package/dist/neutral/services.mjs

@@ -12,55 +12,17 @@ var __decorateClass = (decorators, target, key, kind) => {
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/modules/services/BlockReward/EvmBlockRewardViewer.ts
-import {
-  AbstractCreatable,
-  assertEx,
-  creatable,
-  toEthAddress
-} from "@ariestools/sdk";
-import { IXyoChainRewards__factory } from "@xyo-network/typechain";
-import {
-  asAttoXL1,
-  BlockRewardViewerMoniker
-} from "@xyo-network/xl1-sdk";
-var EvmBlockRewardViewer = class extends AbstractCreatable {
-  moniker = EvmBlockRewardViewer.defaultMoniker;
-  _contractAddress;
-  get chainContractViewer() {
-    return assertEx(this.params.chainContractViewer, () => "chainContractViewer is required");
-  }
-  get contractAddress() {
-    return assertEx(this._contractAddress, () => "contractAddress is required");
-  }
-  get provider() {
-    return assertEx(this.params.provider, () => "provider is required");
-  }
-  async allowedRewardForBlock(blockNumber) {
-    const contract = IXyoChainRewards__factory.connect(toEthAddress(this.contractAddress), this.provider);
-    return asAttoXL1(await contract.calcBlockReward(blockNumber));
-  }
-  async createHandler() {
-    await super.createHandler();
-    try {
-      this._contractAddress = await this.chainContractViewer.rewardsContract();
-    } catch (ex) {
-      const error = ex;
-      throw new Error(`Failed to get rewards contract address: ${error.message}`, { cause: ex });
-    }
-  }
-};
-__publicField(EvmBlockRewardViewer, "connectionTypes", ["evm-rpc"]);
-__publicField(EvmBlockRewardViewer, "defaultMoniker", BlockRewardViewerMoniker);
-__publicField(EvmBlockRewardViewer, "monikers", [BlockRewardViewerMoniker]);
-__publicField(EvmBlockRewardViewer, "surface", "node");
-EvmBlockRewardViewer = __decorateClass([
-  creatable()
-], EvmBlockRewardViewer);
+import { EvmBlockRewardViewer } from "@xyo-network/xl1-sdk";
 
 // src/modules/services/ChainValidator/XyoValidator.ts
-import { AbstractCreatableProvider, BlockViewerMoniker } from "@xyo-network/xl1-sdk";
+import {
+  AbstractCreatableProvider,
+  BlockViewerMoniker,
+  creatableProvider
+} from "@xyo-network/xl1-sdk";
+var ValidatorMoniker = "Validator";
 var XyoValidator = class extends AbstractCreatableProvider {
-  moniker = "Validator";
+  moniker = XyoValidator.defaultMoniker;
   _blockViewer;
   // get address() {
   //   return this.account.address
@@ -84,6 +46,7 @@ var XyoValidator = class extends AbstractCreatableProvider {
   //   return assertEx(this.params.blockRewardService, () => 'blockRewardService is required')
   // }
   async createHandler() {
+    await super.createHandler();
     this._blockViewer = await this.locator.getInstance(BlockViewerMoniker);
   }
   validatePendingBlock(_block) {
@@ -96,24 +59,32 @@ var XyoValidator = class extends AbstractCreatableProvider {
     return await Promise.resolve(true);
   }
 };
+__publicField(XyoValidator, "connectionTypes", []);
+__publicField(XyoValidator, "defaultMoniker", ValidatorMoniker);
+__publicField(XyoValidator, "dependencies", [BlockViewerMoniker]);
+__publicField(XyoValidator, "monikers", [ValidatorMoniker]);
+__publicField(XyoValidator, "surface", "node");
+XyoValidator = __decorateClass([
+  creatableProvider()
+], XyoValidator);
 
 // src/modules/services/Election/BaseElectionService.ts
-import { assertEx as assertEx2 } from "@ariestools/sdk";
+import { assertEx } from "@ariestools/sdk";
 import {
   AbstractCreatableProvider as AbstractCreatableProvider2,
-  creatableProvider
+  creatableProvider as creatableProvider2
 } from "@xyo-network/xl1-sdk";
 import { hexToLast4BytesInt, shuffleWithSeed } from "#utils";
 var BaseElectionService = class extends AbstractCreatableProvider2 {
   moniker = BaseElectionService.defaultMoniker;
   get blockViewer() {
-    return assertEx2(this.params.blockViewer, () => "No block viewer");
+    return assertEx(this.params.blockViewer, () => "No block viewer");
   }
   get chainStakeViewer() {
-    return assertEx2(this.params.chainStakeViewer, () => "No chain stake viewer");
+    return assertEx(this.params.chainStakeViewer, () => "No chain stake viewer");
   }
   get stakeIntentService() {
-    return assertEx2(this.params.stakeIntentService, () => "No staked intent service");
+    return assertEx(this.params.stakeIntentService, () => "No staked intent service");
   }
   async getCreatorCommitteeForNextBlock(current) {
     return await this.spanAsync("getCreatorCommitteeForNextBlock", async () => {
@@ -130,11 +101,12 @@ var BaseElectionService = class extends AbstractCreatableProvider2 {
     return creatorArray.slice(0, maxSize);
   }
 };
+__publicField(BaseElectionService, "connectionTypes", []);
 __publicField(BaseElectionService, "defaultMoniker", "Election");
 __publicField(BaseElectionService, "dependencies", []);
 __publicField(BaseElectionService, "monikers", ["Election"]);
 BaseElectionService = __decorateClass([
-  creatableProvider()
+  creatableProvider2()
 ], BaseElectionService);
 
 // src/modules/services/implementation/head/createBootstrapHead.ts
@@ -162,7 +134,7 @@ var createBootstrapHead = async (account, chainId, genesisBlockRewardAmount, gen
 };
 
 // src/modules/services/implementation/processPendingBlocks.ts
-import { assertEx as assertEx3, isDefined } from "@ariestools/sdk";
+import { assertEx as assertEx2, isDefined } from "@ariestools/sdk";
 import { BlockRejectionSchema, isSignedHydratedBlockWithHashMeta } from "@xyo-network/xl1-sdk";
 import { ChainHeadSelector } from "#analyze";
 async function processPendingBlocks({
@@ -190,7 +162,7 @@ async function processPendingBlocks({
   const bestHeadChain = await headSelector.findBestHead();
   if (isDefined(bestHeadChain) && bestHeadChain.length > 0) {
     const oldHeadBlock = currentBlock[0];
-    const newHydratedHeadBlock = assertEx3(bestHeadChain.at(-1), () => "Missing best head block [processPendingBlocks]");
+    const newHydratedHeadBlock = assertEx2(bestHeadChain.at(-1), () => "Missing best head block [processPendingBlocks]");
     const newHeadBlock = newHydratedHeadBlock[0];
     logger?.debug("Validating new HeadBlock head from (block) ", oldHeadBlock?.block, "to", newHeadBlock.block);
     logger?.debug("Validating new HeadBlock head from (hash) ", oldHeadBlock?._hash, "to", newHeadBlock._hash);
@@ -238,7 +210,7 @@ async function processPendingBlocks({
 // src/modules/services/NetworkStakeStepReward/BaseNetworkStakeStepRewardService.ts
 import {
   AbstractCreatableProvider as AbstractCreatableProvider3,
-  creatableProvider as creatableProvider2,
+  creatableProvider as creatableProvider3,
   NetworkStakeStepRewardViewerMoniker
 } from "@xyo-network/xl1-sdk";
 var BaseNetworkStakeStepRewardService = class extends AbstractCreatableProvider3 {
@@ -298,16 +270,18 @@ var BaseNetworkStakeStepRewardService = class extends AbstractCreatableProvider3
     throw new Error("Method [networkStakeStepRewardsForStepLevel] not implemented.");
   }
 };
+__publicField(BaseNetworkStakeStepRewardService, "connectionTypes", []);
 __publicField(BaseNetworkStakeStepRewardService, "defaultMoniker", NetworkStakeStepRewardViewerMoniker);
 __publicField(BaseNetworkStakeStepRewardService, "dependencies", []);
 __publicField(BaseNetworkStakeStepRewardService, "monikers", [NetworkStakeStepRewardViewerMoniker]);
 BaseNetworkStakeStepRewardService = __decorateClass([
-  creatableProvider2()
+  creatableProvider3()
 ], BaseNetworkStakeStepRewardService);
 
 // src/modules/services/simple/block/runner/SimpleBlockRunner.ts
 import {
-  assertEx as assertEx5,
+  asAddress,
+  assertEx as assertEx4,
   hexToBigInt,
   isDefined as isDefined2,
   toAddress as toAddress2
@@ -323,10 +297,11 @@ import {
   AttoXL1,
   BlockNumberSchema,
   BlockRejectionSchema as BlockRejectionSchema2,
-  BlockRewardViewerMoniker as BlockRewardViewerMoniker2,
+  BlockRewardViewerMoniker,
   BlockRunnerMoniker,
   BlockValidationViewerMoniker,
-  creatableProvider as creatableProvider3,
+  connectArchivist,
+  creatableProvider as creatableProvider4,
   createDeclarationIntent as createDeclarationIntent2,
   DeadLetterQueueRunnerMoniker,
   defaultRewardRatio,
@@ -334,6 +309,7 @@ import {
   isSignedHydratedBlockWithHashMeta as isSignedHydratedBlockWithHashMeta2,
   isTransfer,
   MempoolViewerMoniker,
+  REJECTED_TRANSACTIONS_ARCHIVIST_ROLE,
   TimeSyncViewerMoniker,
   TransactionRejectionSchema,
   XYO_STEP_REWARD_ADDRESS
@@ -342,7 +318,7 @@ import { FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerCon
 import { buildNextBlock as buildNextBlock2 } from "#protocol";
 
 // src/modules/services/simple/block/runner/generateTransactionFeeTransfers.ts
-import { assertEx as assertEx4, hexFromBigInt } from "@ariestools/sdk";
+import { assertEx as assertEx3, hexFromBigInt } from "@ariestools/sdk";
 import { PayloadBuilder } from "@xyo-network/sdk";
 import {
   HydratedTransactionWrapper,
@@ -374,7 +350,7 @@ async function generateTransactionFeeTransfers(address, transactions) {
     return payload;
   });
   for (const [from, amount] of Object.entries(txGasCosts)) {
-    const fromPayload = assertEx4(payloads.find((p) => p.from === from), () => "from payload not found");
+    const fromPayload = assertEx3(payloads.find((p) => p.from === from), () => "from payload not found");
     fromPayload.transfers[address] = hexFromBigInt(amount);
   }
   return payloads;
@@ -429,6 +405,12 @@ async function identifyOffendingTransactions(args) {
   return { offendingHashes: [scored[0].tx[0]._hash], reason: "block-balance" };
 }
 
+// src/modules/services/simple/block/runner/producerTuning.ts
+function producerTuningFromConfig(config) {
+  const withSection = config;
+  return withSection.producer ?? withSection;
+}
+
 // src/modules/services/simple/block/runner/SimpleBlockRunner.ts
 var DEFAULT_BLOCK_SIZE = 10;
 var XYO_PRODUCER_REDECLARATION_DURATION = 100;
@@ -490,11 +472,14 @@ var SimpleBlockRunner = class extends AbstractCreatableProvider4 {
     return this._finalizationViewer;
   }
   get heartbeatInterval() {
-    return this.params.heartbeatInterval ?? 36e5;
+    return this.params.heartbeatInterval ?? this.producerTuning.heartbeatInterval ?? 36e5;
   }
   get mempoolViewer() {
     return this._mempoolViewer;
   }
+  get producerTuning() {
+    return producerTuningFromConfig(this.config);
+  }
   // protected get pendingTransactionsService() {
   //   return assertEx(this.params.pendingTransactionsService, () => 'Missing pendingTransactionsService')
   // }
@@ -514,15 +499,19 @@ var SimpleBlockRunner = class extends AbstractCreatableProvider4 {
   //   return assertEx(this.params.validateHydratedBlockState, () => 'validateHydratedBlockState is required')
   // }
   async createHandler() {
-    this._rejectedTransactionsArchivist = this.params.rejectedTransactionsArchivist ?? await MemoryArchivist.create();
-    this._account = assertEx5(this.params.account, () => "Account is required");
+    const boundConnection = this.boundConnection;
+    this._rejectedTransactionsArchivist = this.params.rejectedTransactionsArchivist ?? (boundConnection ? await connectArchivist(boundConnection, { name: REJECTED_TRANSACTIONS_ARCHIVIST_ROLE }) : await MemoryArchivist.create());
+    this._account = assertEx4(
+      this.params.account ?? this.contextSigner,
+      () => "Account is required \u2014 inject params.account or register a context signer"
+    );
     this._address = toAddress2(this.account.address);
     this._accountBalanceViewer = await this.locateAndCreate(AccountBalanceViewerMoniker);
-    this._blockRewardViewer = await this.locateAndCreate(BlockRewardViewerMoniker2);
+    this._blockRewardViewer = await this.locateAndCreate(BlockRewardViewerMoniker);
     this._blockValidationViewer = await this.locator.getInstance(BlockValidationViewerMoniker);
     this._finalizationViewer = await this.locateAndCreate(FinalizationViewerMoniker);
     this._mempoolViewer = await this.locateAndCreate(MempoolViewerMoniker);
-    this._rewardAddress = this.params.rewardAddress;
+    this._rewardAddress = asAddress(this.params.rewardAddress ?? this.producerTuning.rewardAddress ?? this.account.address, true);
     this._timeSyncViewer = await this.locateAndCreate(TimeSyncViewerMoniker);
     this._deadLetterQueueRunner = await this.locator.tryGetInstance(DeadLetterQueueRunnerMoniker);
   }
@@ -531,7 +520,7 @@ var SimpleBlockRunner = class extends AbstractCreatableProvider4 {
   }
   async produceNextBlock(head, force) {
     const result = await this.proposeNextValidBlock(head);
-    return force === true ? assertEx5(result, () => "Failed to produce next block") : result;
+    return force === true ? assertEx4(result, () => "Failed to produce next block") : result;
   }
   async getBlockRewardTransfers(block) {
     this._blockRewardDiviner ??= await FixedPercentageBlockRewardDiviner.create({
@@ -554,7 +543,7 @@ var SimpleBlockRunner = class extends AbstractCreatableProvider4 {
    * @returns chain stake intent for the producer redeclaration, or undefined if no redeclaration is needed
    */
   getProducerRedeclaration(head) {
-    if (this.params.disableIntentRedeclaration === true) return;
+    if ((this.params.disableIntentRedeclaration ?? this.producerTuning.disableIntentRedeclaration) === true) return;
     const currentBlock = head.block;
     if (isDefined2(this._lastRedeclarationBlock)) {
       const lastDeclarationExpiry = this._lastRedeclarationBlock + SimpleBlockRunner.RedeclarationDuration;
@@ -577,7 +566,7 @@ var SimpleBlockRunner = class extends AbstractCreatableProvider4 {
     const shouldValidateBalances = validateBalances ?? this.params.validateBalances ?? true;
     return await this.spanAsync("proposeNextValidBlock", async () => {
       try {
-        const { block: previousBlock } = assertEx5(asBlockBoundWitness(head), () => "Invalid head block");
+        const { block: previousBlock } = assertEx4(asBlockBoundWitness(head), () => "Invalid head block");
         const nextBlock = previousBlock + 1;
         const chainId = await this.finalizationViewer.chainId();
         const pendingTransactionsRaw = await this.mempoolViewer.pendingTransactions({ limit: SimpleBlockRunner.DefaultBlockSize });
@@ -800,7 +789,7 @@ __publicField(SimpleBlockRunner, "connectionTypes", ["lmdb", "mongo", "memory"])
 __publicField(SimpleBlockRunner, "defaultMoniker", BlockRunnerMoniker);
 __publicField(SimpleBlockRunner, "dependencies", [
   AccountBalanceViewerMoniker,
-  BlockRewardViewerMoniker2,
+  BlockRewardViewerMoniker,
   BlockValidationViewerMoniker,
   FinalizationViewerMoniker,
   MempoolViewerMoniker,
@@ -809,7 +798,7 @@ __publicField(SimpleBlockRunner, "dependencies", [
 __publicField(SimpleBlockRunner, "monikers", [BlockRunnerMoniker]);
 __publicField(SimpleBlockRunner, "surface", "node");
 SimpleBlockRunner = __decorateClass([
-  creatableProvider3()
+  creatableProvider4()
 ], SimpleBlockRunner);
 
 // src/modules/services/StepStake/BaseStepStakeService.ts
@@ -832,6 +821,7 @@ export {
   DEFAULT_BLOCK_SIZE,
   EvmBlockRewardViewer,
   SimpleBlockRunner,
+  ValidatorMoniker,
   XYO_PRODUCER_REDECLARATION_DURATION,
   XYO_PRODUCER_REDECLARATION_WINDOW,
   XyoValidator,