@xyo-network/chain-services 1.19.13 → 1.19.15

package/src/PendingTransactions/hydratedTransactionToPayloadBundle.ts

@@ -1,7 +1,7 @@
 import type { Hash } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
 import { PayloadBundleSchema } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-sdk'
 import { flattenHydratedTransaction } from '@xyo-network/xl1-sdk'
 

package/src/index.ts

@@ -6,5 +6,4 @@ export * from './model/index.ts'
 export * from './NetworkStakeStepReward/index.ts'
 export * from './PendingTransactions/index.ts'
 export * from './simple/index.ts'
-export * from './StakeIntent/index.ts'
 export * from './StepStake/index.ts'

package/src/simple/block/runner/SimpleBlockRunner.ts

@@ -8,8 +8,8 @@ import {
   BlockRewardDiviner, FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerConfigSchema,
 } from '@xyo-network/chain-modules'
 import { buildNextBlock } from '@xyo-network/chain-protocol'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { WithHashMeta } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   AbstractCreatableProvider, AccountBalanceViewer, AccountBalanceViewerMoniker, AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness,
   BlockNumberPayload, BlockNumberSchema, BlockRewardViewer, BlockRewardViewerMoniker, BlockRunner, BlockRunnerMoniker, BlockValidationViewer,
@@ -39,6 +39,8 @@ export const XYO_PRODUCER_REDECLARATION_WINDOW = 500
 
 export interface SimpleBlockRunnerParams extends CreatableProviderParams {
   account: AccountInstance
+  disableIntentRedeclaration?: boolean
+  heartbeatInterval?: number
   rejectedTransactionsArchivist?: ArchivistInstance
   rewardAddress: Address
   validateHydratedBlockState?: HydratedBlockStateValidationFunction
@@ -121,9 +123,9 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     return this._chainId
   }
 
-  // protected get electionService() {
-  //   return assertEx(this.params.electionService, () => 'electionService is required')
-  // }
+  protected get heartbeatInterval() {
+    return this.params.heartbeatInterval ?? 3_600_000
+  }
 
   protected get mempoolRunner() {
     return this._mempoolRunner!
@@ -167,7 +169,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     this._chainId = this.context.config.chain.id
     this._mempoolRunner = await this.locateAndCreate<MempoolRunner>(MempoolRunnerMoniker)
     this._mempoolViewer = await this.locateAndCreate<MempoolViewer>(MempoolViewerMoniker)
-    this._rewardAddress = this.params.rewardAddress ?? this.context.config.actors.producer.rewardAddress
+    this._rewardAddress = this.params.rewardAddress
     this._timeSyncViewer = await this.locateAndCreate<TimeSyncViewer>(TimeSyncViewerMoniker)
   }
 
@@ -222,7 +224,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   protected getProducerRedeclaration(head: WithHashMeta<BlockBoundWitness>): Promisable<ChainStakeIntent | undefined> {
     // TODO: Do not redeclare on every block
     // Decide if we should redeclare intent
-    if (this.params.context.config.actors?.producer?.disableIntentRedeclaration) return
+    if (this.params.disableIntentRedeclaration) return
     // Decide if we need to redeclare intent
     // const ranges = await this.stakeIntentService.getDeclaredCandidateRanges(this.address, 'producer')
     // TODO: This doesn't handle the case where the producer had declared a range for the future
@@ -350,11 +352,8 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
    */
   private heartbeatRequired(head: WithHashMeta<BlockBoundWitness>): boolean {
     const epoch = head.$epoch
-    if (isDefined(epoch)) {
-      const { heartbeatInterval } = assertEx(this.params.context.config.actors?.producer)
-      if (Date.now() - epoch > heartbeatInterval) {
-        return true
-      }
+    if (isDefined(epoch) && Date.now() - epoch > this.heartbeatInterval) {
+      return true
     }
     return false
   }

package/src/simple/block/runner/generateTransactionFeeTransfers.ts

@@ -1,6 +1,6 @@
 import { type Address, hexFromBigInt } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   SignedHydratedTransaction,
   Transfer,

package/dist/neutral/StakeIntent/XyoStakeIntentService.d.ts

@@ -1,47 +0,0 @@
-import { Address, Hash } from '@xylabs/sdk-js';
-import { ArchivistInstance } from '@xyo-network/archivist-model';
-import { IntervalMap } from '@xyo-network/chain-utils';
-import { Payload } from '@xyo-network/payload-model';
-import { AbstractCreatableProvider, BlockViewer, ChainStakeViewer, StakeIntentService } from '@xyo-network/xl1-sdk';
-import { type Intent } from '@xyo-network/xl1-sdk';
-import { Mutex } from 'async-mutex';
-import { LRUCache } from 'lru-cache';
-import { BaseServiceParams } from '../model/index.ts';
-export interface XyoStakeIntentServiceParams extends BaseServiceParams {
-    blockViewer: BlockViewer;
-    chainArchivist: ArchivistInstance;
-    chainStakeViewer: ChainStakeViewer;
-    stakeIntentStateArchivist: ArchivistInstance;
-}
-export declare class XyoStakeIntentService extends AbstractCreatableProvider<XyoStakeIntentServiceParams> implements StakeIntentService {
-    static readonly defaultMoniker = "StakeIntent";
-    static readonly dependencies: never[];
-    static readonly monikers: string[];
-    moniker: string;
-    protected _lastIndexedBlockHash: Hash | undefined;
-    protected _producers: IntervalMap<Address>;
-    protected _stakeCache: LRUCache<Lowercase<string> & {
-        readonly __hex: true;
-    } & {
-        readonly __address: true;
-    }, bigint, unknown>;
-    protected _updateMutex: Mutex;
-    private _blockViewer?;
-    private _chainStakeViewer?;
-    protected get blockViewer(): BlockViewer<"BlockViewer">;
-    protected get chainArchivist(): ArchivistInstance<import("@xyo-network/archivist-model").ArchivistParams<import("@xyo-network/module-model").AnyConfigSchema<import("@xyo-network/archivist-model").ArchivistConfig>>, import("@xyo-network/archivist-model").ArchivistModuleEventData, Payload>;
-    protected get chainStakeViewer(): ChainStakeViewer;
-    protected get stakeIntentStateArchivist(): ArchivistInstance<import("@xyo-network/archivist-model").ArchivistParams<import("@xyo-network/module-model").AnyConfigSchema<import("@xyo-network/archivist-model").ArchivistConfig>>, import("@xyo-network/archivist-model").ArchivistModuleEventData, Payload>;
-    static paramsHandler(params: Partial<XyoStakeIntentServiceParams>): Promise<XyoStakeIntentServiceParams>;
-    createHandler(): Promise<void>;
-    getDeclaredCandidateRanges(address: Address, intent: Intent): Promise<Readonly<Readonly<[number, number]>[]>>;
-    getDeclaredCandidatesForBlock(block: number, intent: Intent): Promise<Address[]>;
-    getRequiredMinimumStakeForIntent(intent: Intent): bigint;
-    isStakedForBlock(block: number, intent: Intent, address: Address): Promise<boolean>;
-    startHandler(): Promise<void>;
-    private filterToValidStake;
-    private persistState;
-    private recoverState;
-    private updateIndex;
-}
-//# sourceMappingURL=XyoStakeIntentService.d.ts.map

package/dist/neutral/StakeIntent/XyoStakeIntentService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoStakeIntentService.d.ts","sourceRoot":"","sources":["../../../src/StakeIntent/XyoStakeIntentService.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAAiC,IAAI,EAE7C,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,iBAAiB,EAAwB,MAAM,8BAA8B,CAAA;AAKtF,OAAO,EAEc,WAAW,EAE/B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,OAAO,EAAmB,MAAM,4BAA4B,CAAA;AACrE,OAAO,EACL,yBAAyB,EAEzB,WAAW,EAEiD,gBAAgB,EAK5E,kBAAkB,EAEnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACwE,KAAK,MAAM,EACzF,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,iBAAiB,CAAA;IACjC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,yBAAyB,EAAE,iBAAiB,CAAA;CAC7C;AAWD,qBACa,qBAAsB,SAAQ,yBAAyB,CAAC,2BAA2B,CAAE,YAAW,kBAAkB;IAC7H,MAAM,CAAC,QAAQ,CAAC,cAAc,iBAAgB;IAC9C,MAAM,CAAC,QAAQ,CAAC,YAAY,UAAK;IACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,WAAyC;IACjE,OAAO,SAAgB;IAEvB,SAAS,CAAC,qBAAqB,EAAE,IAAI,GAAG,SAAS,CAAY;IAS7D,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAoB;IAC9D,SAAS,CAAC,WAAW;;;;wBAAkE;IACvF,SAAS,CAAC,YAAY,QAAc;IAEpC,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAE5C,SAAS,KAAK,WAAW,+BAExB;IAED,SAAS,KAAK,cAAc,qQAE3B;IAED,SAAS,KAAK,gBAAgB,qBAE7B;IAED,SAAS,KAAK,yBAAyB,qQAEtC;WAEqB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,2BAA2B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAQxG,aAAa;IAQtB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAO7G,6BAA6B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAWtF,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IASlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1E,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,kBAAkB;YAkClB,YAAY;YAQZ,YAAY;YAiCZ,WAAW;CAuC1B"}

package/dist/neutral/StakeIntent/index.d.ts

@@ -1,3 +0,0 @@
-export * from './lib/index.ts';
-export * from './XyoStakeIntentService.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/StakeIntent/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/StakeIntent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,4BAA4B,CAAA"}

package/dist/neutral/StakeIntent/lib/getBlockSignedStakeDeclarations.d.ts

@@ -1,4 +0,0 @@
-import type { ArchivistInstance } from '@xyo-network/archivist-model';
-import type { BlockBoundWitness, ChainStakeIntent, Intent } from '@xyo-network/xl1-sdk';
-export declare const getBlockSignedStakeDeclarations: (block: BlockBoundWitness, archivist: ArchivistInstance, intent: Intent) => Promise<ChainStakeIntent[]>;
-//# sourceMappingURL=getBlockSignedStakeDeclarations.d.ts.map

package/dist/neutral/StakeIntent/lib/getBlockSignedStakeDeclarations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBlockSignedStakeDeclarations.d.ts","sourceRoot":"","sources":["../../../../src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAKrE,OAAO,KAAK,EACV,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAC5C,MAAM,sBAAsB,CAAA;AAG7B,eAAO,MAAM,+BAA+B,GAAU,OAAO,iBAAiB,EAAE,WAAW,iBAAiB,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,EAAE,CAyBxJ,CAAA"}

package/dist/neutral/StakeIntent/lib/index.d.ts

@@ -1,2 +0,0 @@
-export * from './getBlockSignedStakeDeclarations.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/StakeIntent/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/StakeIntent/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAA"}

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -1,259 +0,0 @@
-import {
-  Address, asAddress, assertEx, filterAs, Hash,
-  isUndefined,
-} from '@xylabs/sdk-js'
-import { ArchivistInstance, ArchivistNextOptions } from '@xyo-network/archivist-model'
-import {
-  analyzeChain, ChainStakeIntentAnalyzer,
-  isChainSummaryStakeIntent,
-} from '@xyo-network/chain-analyze'
-import {
-  DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS,
-  findFirstMatching, IntervalMap,
-  SerializedIntervalMap,
-} from '@xyo-network/chain-utils'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import {
-  AbstractCreatableProvider,
-  asChainIndexingServiceStateWithStorageMeta,
-  BlockViewer,
-  BlockViewerMoniker,
-  ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
-  ChainStakeViewerMoniker,
-  creatableProvider,
-  isChainIndexingServiceState,
-  readPayloadMapFromStore,
-  StakeIntentService,
-  timeBudget,
-} from '@xyo-network/xl1-sdk'
-import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
-} from '@xyo-network/xl1-sdk'
-import { Mutex } from 'async-mutex'
-import { LRUCache } from 'lru-cache'
-
-import { BaseServiceParams } from '../model/index.ts'
-
-export interface XyoStakeIntentServiceParams extends BaseServiceParams {
-  blockViewer: BlockViewer
-  chainArchivist: ArchivistInstance
-  chainStakeViewer: ChainStakeViewer
-  stakeIntentStateArchivist: ArchivistInstance
-}
-
-/**
- * The number of blocks to periodically persist state
- */
-// const STATE_PERSISTENCE_INTERVAL = 60n
-
-const ACTIVE_STAKE_TTL = 1000 * 60 * 60 * 2 // 2 hours in milliseconds
-const NO_ACTIVE_STAKE_TTL = 1000 * 2 // 2 seconds in milliseconds
-const STAKE_CACHE_MAX_ENTRIES = 10_000
-
-@creatableProvider()
-export class XyoStakeIntentService extends AbstractCreatableProvider<XyoStakeIntentServiceParams> implements StakeIntentService {
-  static readonly defaultMoniker = 'StakeIntent'
-  static readonly dependencies = []
-  static readonly monikers = [XyoStakeIntentService.defaultMoniker]
-  moniker = 'StakeIntent'
-  // TODO: Use hash instead of block number to handle chain reorgs
-  protected _lastIndexedBlockHash: Hash | undefined = undefined
-  // TODO: Interval tree per declaration (bank, validator, etc.)
-
-  // Ideally move to DataIntervalTree to handle declared
-  // ranges as it enables range queries in O(min(n, k * log n)) time,
-  // where k is the number of intervals in the output list time
-  // Currently using set based because it's simpler, equivalent
-  // in performance for small sets, and (most importantly) easily
-  // persisted so we can recover state on restart.
-  protected _producers: IntervalMap<Address> = new IntervalMap()
-  protected _stakeCache = new LRUCache<Address, bigint>({ max: STAKE_CACHE_MAX_ENTRIES })
-  protected _updateMutex = new Mutex()
-
-  private _blockViewer?: BlockViewer
-  private _chainStakeViewer?: ChainStakeViewer
-
-  protected get blockViewer() {
-    return this._blockViewer!
-  }
-
-  protected get chainArchivist() {
-    return assertEx(this.params.chainArchivist!, () => 'chainArchivist not set')
-  }
-
-  protected get chainStakeViewer() {
-    return this._chainStakeViewer!
-  }
-
-  protected get stakeIntentStateArchivist() {
-    return assertEx(this.params.stakeIntentStateArchivist!, () => 'stakeIntentStateArchivist not set')
-  }
-
-  static override async paramsHandler(params: Partial<XyoStakeIntentServiceParams>): Promise<XyoStakeIntentServiceParams> {
-    return {
-      ...await super.paramsHandler(params),
-      chainArchivist: assertEx(params?.chainArchivist, () => 'chainArchivist is required'),
-      stakeIntentStateArchivist: assertEx(params?.stakeIntentStateArchivist, () => 'stakeIntentStateArchivist is required'),
-    } as XyoStakeIntentServiceParams
-  }
-
-  override async createHandler() {
-    this._blockViewer = await this.locator.getInstance(BlockViewerMoniker)
-    this._chainStakeViewer = await this.locator.getInstance(ChainStakeViewerMoniker)
-    const head = await this.blockViewer.currentBlock()
-    if (isUndefined(head)) return
-    await this.recoverState(head[0]._hash)
-  }
-
-  async getDeclaredCandidateRanges(address: Address, intent: Intent): Promise<Readonly<Readonly<[number, number]>[]>> {
-    await Promise.resolve()
-    assertEx(intent === 'producer', () => `Support not yet added for intent ${intent}`)
-    const results = this._producers.get(address)
-    return results ?? []
-  }
-
-  async getDeclaredCandidatesForBlock(block: number, intent: Intent): Promise<Address[]> {
-    return await this.spanAsync('getDeclaredCandidatesForBlock', async () => {
-      assertEx(intent === 'producer', () => `Support not yet added for intent ${intent}`)
-      const results = this._producers.findAllContaining(block)
-      const candidates = [...results]
-      const requiredMinimumStake = this.getRequiredMinimumStakeForIntent(intent)
-      const validCandidates = await this.filterToValidStake(candidates, this.chainStakeViewer, requiredMinimumStake)
-      return validCandidates
-    }, this.context)
-  }
-
-  getRequiredMinimumStakeForIntent(intent: Intent): bigint {
-    switch (intent) {
-      case 'producer': {
-        const { minStake } = this.params.context.config.actors.producer
-        return BigInt(minStake)
-      }
-    }
-  }
-
-  async isStakedForBlock(block: number, intent: Intent, address: Address): Promise<boolean> {
-    const candidates = await this.getDeclaredCandidatesForBlock(block, intent)
-    return candidates.includes(address)
-  }
-
-  override async startHandler(): Promise<void> {
-    await this.updateIndex(true)
-  }
-
-  private async filterToValidStake(
-    candidates: Address[],
-    chainStakeViewer: ChainStakeViewer,
-    requiredMinimumStake: bigint,
-  ): Promise<Address[]> {
-    type CandidateStake = { candidate: Address; stake: bigint }
-
-    // Find the stake for each candidate
-    const candidatesWithStake: CandidateStake[] = await Promise.all(
-      candidates.map(async (candidate) => {
-        // Check if the stake is already cached
-        const stake = this._stakeCache.get(candidate)
-        if (stake === undefined) {
-          // Fetch from chainStakeViewer if not cached
-          const activeStake = await chainStakeViewer.activeByStaked(candidate)
-          if (activeStake > 0n) {
-            // Store result in cache
-            this._stakeCache.set(candidate, activeStake, { ttl: ACTIVE_STAKE_TTL })
-          } else {
-            this._stakeCache.set(candidate, activeStake, { ttl: NO_ACTIVE_STAKE_TTL })
-          }
-          return { candidate, stake: activeStake }
-        } else {
-          return { candidate, stake }
-        }
-      }),
-    )
-
-    // Filter out candidates whose stake is greater than or equal to the required minimum
-    return candidatesWithStake
-      .filter(({ stake }) => stake >= requiredMinimumStake)
-      .map(({ candidate }) => candidate)
-  }
-
-  private async persistState(current: Hash): Promise<void> {
-    const state = this._producers.serialize()
-    const payload = new PayloadBuilder<ChainIndexingServiceState<SerializedIntervalMap>>({ schema: ChainIndexingServiceStateSchema })
-      .fields({ endBlockHash: current, state })
-      .build()
-    await this.stakeIntentStateArchivist.insert([payload])
-  }
-
-  private async recoverState(current: Hash): Promise<void> {
-    return await timeBudget('XyoStakeIntentService.recoverState', console, async () => {
-      const currentBlock = assertEx(asBlockBoundWitness((await this.chainArchivist.get([current]))?.[0]), () => `Block ${current} not found`)
-      const currentBlockNum = currentBlock.block
-      // Find last state before current head (in case of rollback, we indexed past it on an uncle chain, etc.)
-      const opts: ArchivistNextOptions = { ...DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS }
-      while (true) {
-        const predicate = (p: WithStorageMeta<Payload>) => {
-          const state = asChainIndexingServiceStateWithStorageMeta(p)
-          return state ? true : false
-        }
-        const state = await findFirstMatching(this.stakeIntentStateArchivist, predicate, opts)
-        if (isChainIndexingServiceState<SerializedIntervalMap>(state)) {
-          const indexed = (await this.chainArchivist.get([state.endBlockHash]))?.[0]
-          const indexedBlock = asBlockBoundWitnessWithStorageMeta(indexed)
-          if (indexedBlock) {
-            const indexedBlockNum = indexedBlock.block
-            if (indexedBlockNum <= currentBlockNum) {
-              const data = state.state as SerializedIntervalMap
-              this._producers = new IntervalMap(data)
-              this._lastIndexedBlockHash = indexedBlock._hash
-              break
-            }
-          }
-        } else {
-        // No state found, start from genesis
-          break
-        }
-        opts.open = true
-      }
-    }, 2000, true)
-  }
-
-  private async updateIndex(displayProgress = false): Promise<void> {
-    if (this._updateMutex.isLocked()) {
-      return
-    }
-    await this._updateMutex.runExclusive(async () => {
-      return await this.spanAsync('updateIndex', async () => {
-        const currentHead = (await this.blockViewer.currentBlock())[0]
-        if (isUndefined(currentHead)) return
-        const currentHeadHash = currentHead._hash
-        const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.chainArchivist)
-        const result = await analyzeChain(
-          { ...this.context, chainMap },
-          [new ChainStakeIntentAnalyzer('producer')],
-          currentHeadHash,
-          this._lastIndexedBlockHash,
-        )
-        const signedDeclarations = filterAs(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent)
-        if (currentHead.block === undefined) return
-        const currentHeadBlockNum = currentHead.block
-        if (displayProgress) this.logger?.log(`Updating index through 0x${currentHeadBlockNum}`)
-        for (const signedDeclaration of signedDeclarations) {
-          const { exp, nbf } = signedDeclaration
-          const start = nbf
-          const stop = exp
-          const address = asAddress(signedDeclaration?.from)
-          if (start !== undefined && stop !== undefined && address !== undefined) {
-            this._producers.insert(address, start, stop)
-          }
-        }
-        /*
-      if (index % STATE_PERSISTENCE_INTERVAL === 0n) {
-        if (displayProgress) this.logger?.info(`Persisting state at block ${index}`)
-        await this.persistState(await PayloadBuilder.hash(block))
-      }
-        */
-        this._lastIndexedBlockHash = currentHeadHash
-      }, this.context)
-    })
-  }
-}

package/src/StakeIntent/index.ts

@@ -1,2 +0,0 @@
-export * from './lib/index.ts'
-export * from './XyoStakeIntentService.ts'

package/src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts

@@ -1,47 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import { exists, filterAs } from '@xylabs/sdk-js'
-import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { isBoundWitness } from '@xyo-network/boundwitness-model'
-import { payloadSchemasContains } from '@xyo-network/boundwitness-validator'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import type {
-  BlockBoundWitness, ChainStakeIntent, Intent,
-} from '@xyo-network/xl1-sdk'
-import { asChainStakeIntent, ChainStakeIntentSchema } from '@xyo-network/xl1-sdk'
-
-export const getBlockSignedStakeDeclarations = async (block: BlockBoundWitness, archivist: ArchivistInstance, intent: Intent): Promise<ChainStakeIntent[]> => {
-  // Get payloads in block
-  const blockData = await archivist.get(block.payload_hashes)
-  // Filter Payloads in block to BoundWitnesses
-  const bwsFromBlock = blockData.filter(x => isBoundWitness(x))
-  // Filter to BoundWitnesses with StakeIntent payloads
-  const bwsFromBlockWithDeclarations = bwsFromBlock.filter(bw => payloadSchemasContains(bw, ChainStakeIntentSchema))
-  // Filter to only valid signed BWs
-  const validBlockBwsWithDeclarations = await filterToValidSignedBoundWitnesses(bwsFromBlockWithDeclarations)
-  return (await Promise.all(validBlockBwsWithDeclarations.map(async (bw) => {
-    // Get staked intent hashes from signed declarations
-    const stakeIntentHashes = validBlockBwsWithDeclarations
-      .flatMap(mapBoundWitnessToStakeIntentHashes)
-      .filter(exists)
-    // Get staked intent payloads
-    const payloads = await archivist.get(stakeIntentHashes)
-    // Filter payloads to staked intents
-    const stakeIntents = filterAs(payloads, asChainStakeIntent)
-      // that are producers
-      .filter(p => p.intent === intent)
-      // where the issuer of the intent is also the signer of this BW
-      .filter(p => bw.addresses.includes(p.from))
-
-    return stakeIntents
-  }))).flat()
-}
-
-const filterToValidSignedBoundWitnesses = async (bws: BoundWitness[]): Promise<BoundWitness[]> => {
-  const validBwIndexes = await Promise.all(bws.map(bw => BoundWitnessWrapper.parse(bw).getValid()))
-  return bws.filter((_, index) => validBwIndexes[index])
-}
-
-const mapBoundWitnessToStakeIntentHashes = (bw: BoundWitness): (Hash | undefined)[] => {
-  return bw.payload_schemas.map((schema, index) => schema === ChainStakeIntentSchema ? bw.payload_hashes[index] : undefined)
-}

package/src/StakeIntent/lib/index.ts

@@ -1 +0,0 @@
-export * from './getBlockSignedStakeDeclarations.ts'