@xyo-network/diviner 2.53.1 → 2.53.3

package/src/AddressChain/MemoryDiviner.ts

@@ -1,11 +1,11 @@
 import { assertEx } from '@xylabs/assert'
 import { ArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
+import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { DivinerParams } from '@xyo-network/diviner-model'
 import { AnyConfigSchema } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 import { AbstractDiviner } from '../AbstractDiviner'
 import { AddressChainDivinerConfig, AddressChainDivinerConfigSchema } from './Config'
@@ -26,8 +26,8 @@ export class MemoryAddressChainDiviner<TParams extends MemoryAddressChainDiviner
     return assertEx(this.config.address, 'Missing address')
   }
 
-  async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
-    const result: XyoPayload[] = []
+  async divine(payloads?: Payload[]): Promise<Payload[]> {
+    const result: Payload[] = []
     assertEx(!payloads?.length, 'MemoryAddressChainDiviner.divine does not allow payloads to be sent')
     const archivists =
       (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map(
@@ -35,7 +35,7 @@ export class MemoryAddressChainDiviner<TParams extends MemoryAddressChainDiviner
       ) ?? []
     let currentHash: string | null = assertEx(this.config.startHash, 'Missing startHash')
     while (currentHash && result.length < (this.config.maxResults ?? 1000)) {
-      const bwPayload: XyoBoundWitness | undefined = await this.archivistFindHash(archivists, currentHash)
+      const bwPayload: BoundWitness | undefined = await this.archivistFindHash(archivists, currentHash)
       const bw: BoundWitnessWrapper | undefined = BoundWitnessWrapper.parse(bwPayload)
       if (bw) {
         result.push(bw)
@@ -45,10 +45,10 @@ export class MemoryAddressChainDiviner<TParams extends MemoryAddressChainDiviner
     return result
   }
 
-  private async archivistFindHash(archivists: ArchivistWrapper[], hash: string): Promise<XyoBoundWitness | undefined> {
+  private async archivistFindHash(archivists: ArchivistWrapper[], hash: string): Promise<BoundWitness | undefined> {
     let index = 0
     if (archivists[index]) {
-      const result = (await archivists[index].get([hash])).pop() as XyoBoundWitness
+      const result = (await archivists[index].get([hash])).pop() as BoundWitness
       if (result) {
         return result
       }

package/src/AddressHistory/Diviner.ts

@@ -1,5 +1,5 @@
 import { XyoQuery } from '@xyo-network/module-model'
-import { PayloadFindFilter, XyoPayload } from '@xyo-network/payload-model'
+import { Payload, PayloadFindFilter } from '@xyo-network/payload-model'
 
 import { AbstractDiviner } from '../AbstractDiviner'
 
@@ -9,10 +9,10 @@ export const AddressHistorySchema: AddressHistorySchema = 'network.xyo.diviner.a
 export type AddressHistoryQuerySchema = 'network.xyo.diviner.address.history.query'
 export const AddressHistoryQuerySchema: AddressHistoryQuerySchema = 'network.xyo.diviner.address.history.query'
 
-export type AddressHistoryPayload = XyoPayload<{ schema: AddressHistorySchema }>
-export const isAddressHistoryPayload = (x?: XyoPayload | null): x is AddressHistoryPayload => x?.schema === AddressHistorySchema
+export type AddressHistoryPayload = Payload<{ schema: AddressHistorySchema }>
+export const isAddressHistoryPayload = (x?: Payload | null): x is AddressHistoryPayload => x?.schema === AddressHistorySchema
 
 export type AddressHistoryQueryPayload = XyoQuery<{ schema: AddressHistoryQuerySchema } & PayloadFindFilter>
-export const isAddressHistoryQueryPayload = (x?: XyoPayload | null): x is AddressHistoryQueryPayload => x?.schema === AddressHistoryQuerySchema
+export const isAddressHistoryQueryPayload = (x?: Payload | null): x is AddressHistoryQueryPayload => x?.schema === AddressHistoryQuerySchema
 
 export type AddressHistoryDiviner = AbstractDiviner

package/src/AddressHistory/MemoryDiviner.ts

@@ -1,11 +1,11 @@
 import { assertEx } from '@xylabs/assert'
 import { ArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness-model'
+import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { DivinerParams } from '@xyo-network/diviner-model'
 import { AnyConfigSchema } from '@xyo-network/module-model'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { AbstractDiviner } from '../AbstractDiviner'
@@ -27,7 +27,7 @@ export class MemoryAddressHistoryDiviner<TParams extends MemoryAddressHistoryDiv
     return assertEx(this.config.address, 'Missing address')
   }
 
-  async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
+  async divine(payloads?: Payload[]): Promise<Payload[]> {
     assertEx(!payloads?.length, 'MemoryAddressHistoryDiviner.divine does not allow payloads to be sent')
     const archivists =
       (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map(
@@ -38,7 +38,7 @@ export class MemoryAddressHistoryDiviner<TParams extends MemoryAddressHistoryDiv
       await Promise.all(
         archivists.map(async (archivist) => {
           const all = await archivist.all()
-          return all.filter((payload) => payload.schema === XyoBoundWitnessSchema) as XyoBoundWitness[]
+          return all.filter((payload) => payload.schema === BoundWitnessSchema) as BoundWitness[]
         }),
       )
     ).flat()
@@ -73,7 +73,7 @@ export class MemoryAddressHistoryDiviner<TParams extends MemoryAddressHistoryDiv
   }
 
   //build object with hashes as keys and wrappers as values
-  private buildWrapperRecords(lists: XyoBoundWitness[]) {
+  private buildWrapperRecords(lists: BoundWitness[]) {
     return lists
       .filter((bw) => bw.addresses.includes(this.queryAddress))
       .reduce<Record<string, BoundWitnessWrapper>>((bwRecords, bw) => {

package/src/AddressSpace/AddressSpaceDiviner.ts

@@ -1,5 +1,5 @@
 import { XyoQuery } from '@xyo-network/module-model'
-import { PayloadFindFilter, XyoPayload } from '@xyo-network/payload-model'
+import { Payload, PayloadFindFilter } from '@xyo-network/payload-model'
 
 import { AbstractDiviner } from '../AbstractDiviner'
 
@@ -9,10 +9,10 @@ export const AddressSpaceSchema: AddressSpaceSchema = 'network.xyo.diviner.addre
 export type AddressSpaceQuerySchema = 'network.xyo.diviner.address.space.query'
 export const AddressSpaceQuerySchema: AddressSpaceQuerySchema = 'network.xyo.diviner.address.space.query'
 
-export type AddressSpacePayload = XyoPayload<{ schema: AddressSpaceSchema }>
-export const isAddressSpacePayload = (x?: XyoPayload | null): x is AddressSpacePayload => x?.schema === AddressSpaceSchema
+export type AddressSpacePayload = Payload<{ schema: AddressSpaceSchema }>
+export const isAddressSpacePayload = (x?: Payload | null): x is AddressSpacePayload => x?.schema === AddressSpaceSchema
 
 export type AddressSpaceQueryPayload = XyoQuery<{ schema: AddressSpaceQuerySchema } & PayloadFindFilter>
-export const isAddressSpaceQueryPayload = (x?: XyoPayload | null): x is AddressSpaceQueryPayload => x?.schema === AddressSpaceQuerySchema
+export const isAddressSpaceQueryPayload = (x?: Payload | null): x is AddressSpaceQueryPayload => x?.schema === AddressSpaceQuerySchema
 
 export type AddressSpaceDiviner = AbstractDiviner

package/src/AddressSpace/MemoryAddressSpaceDiviner.ts

@@ -2,11 +2,11 @@ import { assertEx } from '@xylabs/assert'
 import { AddressSchema } from '@xyo-network/address-payload-plugin'
 import { ArchivistGetQuerySchema, ArchivistModule } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness-model'
+import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'
 import { AnyConfigSchema } from '@xyo-network/module'
-import { XyoPayloadBuilder } from '@xyo-network/payload-builder'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { Payload } from '@xyo-network/payload-model'
 
 import { AbstractDiviner } from '../AbstractDiviner'
 import { AddressSpaceDiviner, AddressSpaceSchema } from './AddressSpaceDiviner'
@@ -33,7 +33,7 @@ export class MemoryAddressSpaceDiviner<TParams extends MemoryAddressSpaceDiviner
 {
   static override configSchema = MemoryAddressSpaceDivinerConfigSchema
 
-  async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
+  async divine(payloads?: Payload[]): Promise<Payload[]> {
     assertEx(!payloads?.length, 'MemoryAddressSpaceDiviner.divine does not allow payloads to be sent')
     const archivists = await this.archivists()
     assertEx(archivists.length > 0, 'Did not find any archivists')
@@ -41,7 +41,7 @@ export class MemoryAddressSpaceDiviner<TParams extends MemoryAddressSpaceDiviner
       await Promise.all(
         archivists.map(async (archivist) => {
           const all = await archivist.all?.()
-          return (all?.filter((payload) => payload.schema === XyoBoundWitnessSchema) as XyoBoundWitness[]) ?? []
+          return (all?.filter((payload) => payload.schema === BoundWitnessSchema) as BoundWitness[]) ?? []
         }),
       )
     ).flat()
@@ -51,7 +51,7 @@ export class MemoryAddressSpaceDiviner<TParams extends MemoryAddressSpaceDiviner
         .flat()
         .map((address) => address.toLowerCase()),
     )
-    return [...addresses].map((address) => new XyoPayloadBuilder({ schema: AddressSchema }).fields({ address }).build())
+    return [...addresses].map((address) => new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build())
   }
 
   private async archivists(): Promise<ArchivistModule[]> {

package/src/IdentityDiviner.ts

@@ -3,7 +3,7 @@ import { ArchivistParams } from '@xyo-network/archivist'
 import { DivinerConfig } from '@xyo-network/diviner-model'
 import { creatableModule } from '@xyo-network/module'
 import { AnyConfigSchema } from '@xyo-network/module-model'
-import { XyoPayloads } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { AbstractDiviner } from './AbstractDiviner'
@@ -14,7 +14,7 @@ export type IdentityDivinerParams<TConfig extends AnyConfigSchema<DivinerConfig>
 export class IdentityDiviner<TParams extends IdentityDivinerParams = IdentityDivinerParams> extends AbstractDiviner<TParams> {
   static override targetSchema = 'network.xyo.test'
 
-  override divine(payloads?: XyoPayloads): Promisable<XyoPayloads> {
+  override divine(payloads?: Payload[]): Promisable<Payload[]> {
     return assertEx(payloads, 'IdentityDiviner requires passed payload')
   }
 }

package/src/Payload/Archivist/Config.ts

@@ -1,10 +1,10 @@
 import { DivinerConfig } from '@xyo-network/diviner-model'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 export type XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config'
 export const XyoArchivistPayloadDivinerConfigSchema: XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config'
 
-export type XyoArchivistPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = DivinerConfig<
+export type XyoArchivistPayloadDivinerConfig<T extends Payload = Payload> = DivinerConfig<
   T & {
     archivist?: string
     schema: XyoArchivistPayloadDivinerConfigSchema

package/src/Payload/Archivist/Diviner.ts

@@ -4,7 +4,7 @@ import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
 import { DivinerParams } from '@xyo-network/diviner-model'
 import { Huri } from '@xyo-network/huri'
 import { AnyConfigSchema } from '@xyo-network/module-model'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner'
@@ -18,7 +18,7 @@ export type ArchivistPayloadDivinerParams<
 export class ArchivistPayloadDiviner<TParams extends ArchivistPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
   static override configSchema: XyoArchivistPayloadDivinerConfigSchema
 
-  async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
+  async divine(payloads?: Payload[]): Promise<Payload[]> {
     const huriPayloads = assertEx(
       payloads?.filter((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriSchema),
       `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`,

package/src/Payload/Huri/Config.ts

@@ -1,11 +1,11 @@
 import { DivinerConfig } from '@xyo-network/diviner-model'
 import { HuriOptions } from '@xyo-network/huri'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 export type XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config'
 export const XyoHuriPayloadDivinerConfigSchema: XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config'
 
-export type XyoHuriPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = DivinerConfig<
+export type XyoHuriPayloadDivinerConfig<T extends Payload = Payload> = DivinerConfig<
   T & {
     options?: HuriOptions
     schema: XyoHuriPayloadDivinerConfigSchema

package/src/Payload/Huri/Diviner.ts

@@ -3,7 +3,7 @@ import { fulfilled } from '@xylabs/promise'
 import { DivinerParams } from '@xyo-network/diviner-model'
 import { Huri } from '@xyo-network/huri'
 import { AnyConfigSchema } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import compact from 'lodash/compact'
 
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner'
@@ -20,7 +20,7 @@ export class HuriPayloadDiviner<TParams extends HuriPayloadDivinerParams = HuriP
     return this.config?.options
   }
 
-  override async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
+  override async divine(payloads?: Payload[]): Promise<Payload[]> {
     const huriPayloads = assertEx(
       payloads?.filter((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriSchema),
       `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`,

package/src/Payload/XyoHuriPayload.ts

@@ -1,9 +1,9 @@
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 export type XyoHuriSchema = 'network.xyo.huri'
 export const XyoHuriSchema: XyoHuriSchema = 'network.xyo.huri'
 
-export type XyoHuriPayload = XyoPayload<{
+export type XyoHuriPayload = Payload<{
   huri: string[]
   schema: 'network.xyo.huri'
   tokens?: string[]