@xyo-network/chain-services 1.8.3 → 1.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.8.3",
+  "version": "1.9.0",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -37,36 +37,36 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@xylabs/array": "^4.15.0",
-    "@xylabs/assert": "^4.15.0",
-    "@xylabs/axios": "^4.15.0",
-    "@xylabs/creatable": "^4.15.0",
-    "@xylabs/decimal-precision": "^4.15.0",
-    "@xylabs/events": "^4.15.0",
-    "@xylabs/exists": "^4.15.0",
-    "@xylabs/forget": "^4.15.0",
-    "@xylabs/hex": "^4.15.0",
-    "@xylabs/promise": "^4.15.0",
-    "@xylabs/telemetry": "^4.15.0",
-    "@xylabs/typeof": "^4.15.0",
-    "@xyo-network/account-model": "^4.3.0",
-    "@xyo-network/archivist-memory": "^4.3.0",
-    "@xyo-network/archivist-model": "^4.3.0",
-    "@xyo-network/boundwitness-model": "^4.3.0",
-    "@xyo-network/boundwitness-validator": "^4.3.0",
-    "@xyo-network/boundwitness-wrapper": "^4.3.0",
-    "@xyo-network/chain-analyze": "^1.8.3",
-    "@xyo-network/chain-ethereum": "^1.8.3",
-    "@xyo-network/chain-modules": "^1.8.3",
-    "@xyo-network/chain-protocol": "^1.8.3",
-    "@xyo-network/chain-utils": "^1.8.3",
-    "@xyo-network/payload-builder": "^4.3.0",
-    "@xyo-network/payload-model": "^4.3.0",
+    "@xylabs/array": "^5.0.0",
+    "@xylabs/assert": "^5.0.0",
+    "@xylabs/axios": "^5.0.0",
+    "@xylabs/creatable": "^5.0.0",
+    "@xylabs/decimal-precision": "^5.0.0",
+    "@xylabs/events": "^5.0.0",
+    "@xylabs/exists": "^5.0.0",
+    "@xylabs/forget": "^5.0.0",
+    "@xylabs/hex": "^5.0.0",
+    "@xylabs/promise": "^5.0.0",
+    "@xylabs/telemetry": "^5.0.0",
+    "@xylabs/typeof": "^5.0.0",
+    "@xyo-network/account-model": "^5.0.0",
+    "@xyo-network/archivist-memory": "^5.0.0",
+    "@xyo-network/archivist-model": "^5.0.0",
+    "@xyo-network/boundwitness-model": "^5.0.0",
+    "@xyo-network/boundwitness-validator": "^5.0.0",
+    "@xyo-network/boundwitness-wrapper": "^5.0.0",
+    "@xyo-network/chain-analyze": "^1.9.0",
+    "@xyo-network/chain-modules": "^1.9.0",
+    "@xyo-network/chain-protocol": "^1.9.0",
+    "@xyo-network/chain-utils": "^1.9.0",
+    "@xyo-network/hash": "^5.0.0",
+    "@xyo-network/payload-builder": "^5.0.0",
+    "@xyo-network/payload-model": "^5.0.0",
     "@xyo-network/typechain": "^3.5.4",
-    "@xyo-network/xl1-protocol": "^1.7.33",
-    "@xyo-network/xl1-protocol-sdk": "^1.8.3",
-    "@xyo-network/xl1-validation": "^1.8.3",
-    "@xyo-network/xl1-wrappers": "^1.8.3",
+    "@xyo-network/xl1-protocol": "^1.8.0",
+    "@xyo-network/xl1-protocol-sdk": "^1.9.0",
+    "@xyo-network/xl1-validation": "^1.9.0",
+    "@xyo-network/xl1-wrappers": "^1.9.0",
     "async-mutex": "^0.5.0",
     "axios": "^1.11.0",
     "ethers": "6.15.0",
@@ -74,14 +74,14 @@
   },
   "devDependencies": {
     "@types/node": "^24.1.0",
-    "@xylabs/delay": "^4.15.0",
-    "@xylabs/ts-scripts-yarn3": "^7.0.1",
-    "@xylabs/tsconfig": "^7.0.1",
-    "@xylabs/vitest-extended": "^4.15.0",
-    "@xyo-network/account": "^4.3.0",
-    "@xyo-network/account-model": "^4.3.0",
-    "@xyo-network/chain-validation": "^1.8.3",
-    "@xyo-network/wallet": "^4.3.0",
+    "@xylabs/delay": "^5.0.0",
+    "@xylabs/ts-scripts-yarn3": "^7.0.2",
+    "@xylabs/tsconfig": "^7.0.2",
+    "@xylabs/vitest-extended": "^5.0.0",
+    "@xyo-network/account": "^5.0.0",
+    "@xyo-network/account-model": "^5.0.0",
+    "@xyo-network/chain-validation": "^1.9.0",
+    "@xyo-network/wallet": "^5.0.0",
     "knip": "^5.62.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",

package/src/BlockReward/EvmBlockRewardService.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { creatable } from '@xylabs/creatable'
+import { toEthAddress } from '@xylabs/hex'
 import { AccountInstance } from '@xyo-network/account-model'
-import { toEthAddress } from '@xyo-network/chain-ethereum'
 import { XyoChainRewards__factory as XyoChainRewardsFactory } from '@xyo-network/typechain'
 import { BlockRewardService, ChainService } from '@xyo-network/xl1-protocol'
 import { Provider } from 'ethers/providers'

package/src/ChainService/Evm/Evm.ts

@@ -1,7 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import type { Address } from '@xylabs/hex'
-import { toAddress } from '@xylabs/hex'
-import { toEthAddress } from '@xyo-network/chain-ethereum'
+import { toAddress, toEthAddress } from '@xylabs/hex'
 import type { StakedXyoChain } from '@xyo-network/typechain'
 import { StakedXyoChain__factory as StakedXyoChainFactory } from '@xyo-network/typechain'
 import type { ChainService } from '@xyo-network/xl1-protocol'

package/src/DataLake/AbstractXyoDataLake.ts

@@ -0,0 +1,38 @@
+import type { Hash } from '@xylabs/hex'
+import { ObjectHasher } from '@xyo-network/hash'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import type { Payload } from '@xyo-network/payload-model'
+import { isAnyPayload } from '@xyo-network/payload-model'
+import {
+  type DataLakeData,
+  isHashPayload,
+  type XyoDataLakeProvider,
+} from '@xyo-network/xl1-protocol'
+
+export abstract class AbstractXyoDataLake implements XyoDataLakeProvider {
+  async fetch(hashes: Hash[], maxDepth: number = 10): Promise<DataLakeData[]> {
+    const results: DataLakeData[] = await this.get(hashes)
+    if (maxDepth > 0) {
+      const hashPayloads = results.filter(isHashPayload)
+      const otherPayloads = results.filter(item => !isHashPayload(item))
+      const found = await this.fetch(hashPayloads.map(item => item.hash), maxDepth - 1)
+      const foundHashes = await Promise.all(found.map(async item => isAnyPayload(item) ? await PayloadBuilder.hash(item) : ObjectHasher.hashBytes(item)))
+      const notFound = hashPayloads.filter(item => !foundHashes.includes(item.hash))
+      return [...otherPayloads, ...found, ...notFound]
+    }
+    return results
+  }
+
+  async trace(hash: Hash): Promise<[DataLakeData | undefined, Payload[]]> {
+    const [result] = await this.get([hash])
+    if (isHashPayload(result)) {
+      const [payload, route] = await this.trace(result.hash)
+      return [payload, [result, ...route]]
+    }
+    return [result, []]
+  }
+
+  abstract add(items: DataLakeData[]): Promise<DataLakeData[]>
+
+  abstract get(hashes: Hash[]): Promise<DataLakeData[]>
+}

package/src/DataLake/ArchivistXyoDataLake.ts

@@ -0,0 +1,26 @@
+import { assertEx } from '@xylabs/assert'
+import type { Hash } from '@xylabs/hex'
+import type { ReadWriteArchivist } from '@xyo-network/archivist-model'
+import { isAnyPayload } from '@xyo-network/payload-model'
+import { type DataLakeData } from '@xyo-network/xl1-protocol'
+
+import { AbstractXyoDataLake } from './AbstractXyoDataLake.ts'
+
+export class ArchivistXyoDataLake extends AbstractXyoDataLake {
+  private _archivist: ReadWriteArchivist
+
+  constructor(archivist: ReadWriteArchivist) {
+    super()
+    this._archivist = archivist
+  }
+
+  async add(items: DataLakeData[]): Promise<DataLakeData[]> {
+    const payloads = items.filter(isAnyPayload)
+    assertEx(payloads.length === items.length, () => 'Some items are not payloads')
+    return await this._archivist.insert(payloads)
+  }
+
+  async get(hashes: Hash[]): Promise<DataLakeData[]> {
+    return await this._archivist.get(hashes)
+  }
+}

package/src/{XyoDataLake.ts → DataLake/HttpXyoDataLake.ts}

@@ -5,18 +5,19 @@ import type { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import { isArrayBuffer, isDefined } from '@xylabs/typeof'
 import { isAnyPayload, type Payload } from '@xyo-network/payload-model'
-import {
-  type DataLakeData, isHashPayload, type XyoDataLakeProvider,
-} from '@xyo-network/xl1-protocol'
+import { type DataLakeData, isHashPayload } from '@xyo-network/xl1-protocol'
 import { Axios } from 'axios'
 
-export class XyoDataLake implements XyoDataLakeProvider {
+import { AbstractXyoDataLake } from './AbstractXyoDataLake.ts'
+
+export class HttpXyoDataLake extends AbstractXyoDataLake {
   private _axiosGet: Axios
   private _axiosInsertBlob: Axios
   private _axiosInsertJson: AxiosJson
   private _endpoint: string
 
   constructor(endpoint: string) {
+    super()
     this._endpoint = endpoint
     this._axiosInsertJson = new AxiosJson({ baseURL: endpoint })
     this._axiosInsertBlob = new Axios({ baseURL: endpoint, headers: { 'Content-Type': 'application/octet-stream', 'Accept': 'application/octet-stream' } })
@@ -49,27 +50,12 @@ export class XyoDataLake implements XyoDataLakeProvider {
     return results
   }
 
-  async fetch(hashes: Hash[], maxDepth?: number): Promise<DataLakeData[]> {
-    return (await Promise.all(hashes.map(async (hash) => {
-      return await this.fetchOne(hash, maxDepth)
-    }))).filter(exists)
-  }
-
   async get(hashes: Hash[]): Promise<DataLakeData[]> {
     return (await Promise.all(hashes.map(async (hash) => {
       return await this.getOne(hash)
     }))).filter(exists)
   }
 
-  async trace(hash: Hash): Promise<[DataLakeData | undefined, Payload[]]> {
-    const result = await this.getOne(hash)
-    if (isHashPayload(result)) {
-      const [payload, route] = await this.trace(result.hash)
-      return [payload, [result, ...route]]
-    }
-    return [result, []]
-  }
-
   protected async addArrayBuffer(item: ArrayBuffer): Promise<ArrayBuffer | undefined> {
     const result = await this._axiosInsertBlob.post('/insert', item)
     if (result.status < 200 || result.status >= 300) {

package/src/DataLake/index.ts

@@ -0,0 +1,3 @@
+export * from './AbstractXyoDataLake.ts'
+export * from './ArchivistXyoDataLake.ts'
+export * from './HttpXyoDataLake.ts'

package/src/index.ts

@@ -5,8 +5,8 @@ export * from './BlockReward/index.ts'
 export * from './ChainBlockNumberIteration/index.ts'
 export * from './ChainService/index.ts'
 export * from './ChainValidator/index.ts'
+export * from './DataLake/index.ts'
 export * from './Election/index.ts'
 export * from './model/index.ts'
 export * from './PendingTransactions/index.ts'
 export * from './StakeIntent/index.ts'
-export * from './XyoDataLake.ts'

package/dist/neutral/XyoDataLake.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoDataLake.d.ts","sourceRoot":"","sources":["../../src/XyoDataLake.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EACL,KAAK,YAAY,EAAiB,KAAK,mBAAmB,EAC3D,MAAM,2BAA2B,CAAA;AAGlC,qBAAa,WAAY,YAAW,mBAAmB;IACrD,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,gBAAgB,CAAO;IAC/B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,SAAS,CAAQ;gBAEb,QAAQ,EAAE,MAAM;IAO5B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAsBnD,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAMjE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAM5C,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,YAAY,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;cASvD,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;cAYnE,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAYvD,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,GAAE,MAAgC,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWnH,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAAC,YAAY,GAAG,SAAS,CAAC;CAWnE"}