@xyo-network/xl1-rpc 1.2.3 → 1.2.4

package/src/provider/viewer/NodeXyoViewer.ts

@@ -1,14 +1,11 @@
 import { filterAs } from '@xylabs/array'
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
-import {
-  type Address, asAddress, type Hash,
-} from '@xylabs/hex'
+import { type Address, type Hash } from '@xylabs/hex'
 import { hexToBigInt } from '@xylabs/hex'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { asArchivistInstance } from '@xyo-network/archivist-model'
 import { BoundWitnessSchema, type Signed } from '@xyo-network/boundwitness-model'
-import type { HeadValidationDiviner } from '@xyo-network/chain-modules'
 import {
   analyzeChain, BalanceAnalyzer, findMostRecentBlock, hydrateBlock, hydrateTransaction, isChainSummaryBalances,
 } from '@xyo-network/chain-protocol'
@@ -32,7 +29,6 @@ export class NodeXyoViewer implements XyoViewer {
 
   private _chainId: Address | undefined
   private _finalizedArchivist: ArchivistInstance | undefined
-  private _headValidationDiviner: HeadValidationDiviner | undefined
 
   constructor(node: NodeInstance) {
     this.node = node
@@ -94,11 +90,10 @@ export class NodeXyoViewer implements XyoViewer {
 
   async chainId(): Promise<Address> {
     if (this._chainId) return this._chainId
-    const headValidationDiviner = await this.getHeadValidationDiviner()
-    this._chainId = assertEx(
-      asAddress(headValidationDiviner.params.chainIdentification?.id),
-      () => 'HeadValidationDiviner.params.chainIdentification.id is required and must be an Address',
-    )
+    const finalizedArchivist = await this.getFinalizedArchivist()
+    const block = await findMostRecentBlock(finalizedArchivist)
+    if (!block) throw new Error('Error: Could not find most recent block')
+    this._chainId = block.chain
     return await Promise.resolve(this._chainId)
   }
 
@@ -170,10 +165,4 @@ export class NodeXyoViewer implements XyoViewer {
     this._finalizedArchivist = await this.getArchivist(this.finalizedArchivistPath)
     return this._finalizedArchivist
   }
-
-  protected getHeadValidationDiviner = async () => {
-    if (this._headValidationDiviner) return this._headValidationDiviner
-    this._headValidationDiviner = (await this.getDiviner(this.headValidationDivinerPath)) as HeadValidationDiviner
-    return this._headValidationDiviner
-  }
 }