@xyo-network/diviner 2.51.9 → 2.52.0-rc.2

package/dist/types/Payload/Huri/Diviner.d.ts

@@ -1,12 +1,13 @@
-import { ModuleParams } from '@xyo-network/module';
+import { DivinerParams } from '@xyo-network/diviner-model';
+import { AnyConfigSchema } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
-import { DivinerParams } from '../../AbstractDiviner';
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner';
 import { XyoHuriPayloadDivinerConfig, XyoHuriPayloadDivinerConfigSchema } from './Config';
-export declare class HuriPayloadDiviner extends AbstractPayloadDiviner<DivinerParams<XyoHuriPayloadDivinerConfig>> {
+export type HuriPayloadDivinerParams<TConfig extends AnyConfigSchema<XyoHuriPayloadDivinerConfig> = AnyConfigSchema<XyoHuriPayloadDivinerConfig>> = DivinerParams<TConfig>;
+export declare class HuriPayloadDiviner<TParams extends HuriPayloadDivinerParams = HuriPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
     static configSchema: XyoHuriPayloadDivinerConfigSchema;
     protected get options(): import("@xyo-network/huri").HuriOptions | undefined;
-    static create(params?: Partial<ModuleParams<XyoHuriPayloadDivinerConfig>>): Promise<HuriPayloadDiviner>;
+    static create<TParams extends HuriPayloadDivinerParams>(params?: HuriPayloadDivinerParams): Promise<HuriPayloadDiviner<TParams>>;
     divine(payloads?: XyoPayload[]): Promise<XyoPayload[]>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/types/Payload/Huri/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,2BAA2B,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAEzF,qBAAa,kBAAmB,SAAQ,sBAAsB,CAAC,aAAa,CAAC,2BAA2B,CAAC,CAAC;IACxG,OAAgB,YAAY,EAAE,iCAAiC,CAAA;IAE/D,SAAS,KAAK,OAAO,wDAEpB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIvG,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAYtE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,2BAA2B,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAEzF,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,eAAe,CAAC,2BAA2B,CAAC,GAAG,eAAe,CAAC,2BAA2B,CAAC,IAC9I,aAAa,CAAC,OAAO,CAAC,CAAA;AAExB,qBAAa,kBAAkB,CAAC,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,CAAE,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IAC1I,OAAgB,YAAY,EAAE,iCAAiC,CAAA;IAE/D,SAAS,KAAK,OAAO,wDAEpB;WAEqB,MAAM,CAAC,OAAO,SAAS,wBAAwB,EAAE,MAAM,CAAC,EAAE,wBAAwB;IAIzF,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAYtE"}

package/package.json

@@ -12,22 +12,21 @@
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
     "@xylabs/promise": "^2.7.4",
-    "@xyo-network/account": "^2.51.9",
-    "@xyo-network/address-payload-plugin": "^2.51.9",
-    "@xyo-network/archivist": "^2.51.9",
-    "@xyo-network/archivist-wrapper": "^2.51.9",
-    "@xyo-network/boundwitness-model": "^2.51.9",
-    "@xyo-network/boundwitness-wrapper": "^2.51.9",
-    "@xyo-network/core": "^2.51.9",
-    "@xyo-network/diviner-model": "^2.51.9",
-    "@xyo-network/diviner-wrapper": "^2.51.9",
-    "@xyo-network/huri": "^2.51.9",
-    "@xyo-network/module": "^2.51.9",
-    "@xyo-network/module-model": "^2.51.9",
-    "@xyo-network/payload-builder": "^2.51.9",
-    "@xyo-network/payload-model": "^2.51.9",
-    "@xyo-network/payload-wrapper": "^2.51.9",
-    "@xyo-network/promise": "^2.51.9",
+    "@xyo-network/account": "^2.52.0-rc.2",
+    "@xyo-network/address-payload-plugin": "^2.52.0-rc.2",
+    "@xyo-network/archivist": "^2.52.0-rc.2",
+    "@xyo-network/archivist-wrapper": "^2.52.0-rc.2",
+    "@xyo-network/boundwitness-model": "^2.52.0-rc.2",
+    "@xyo-network/boundwitness-wrapper": "^2.52.0-rc.2",
+    "@xyo-network/diviner-model": "^2.52.0-rc.2",
+    "@xyo-network/diviner-wrapper": "^2.52.0-rc.2",
+    "@xyo-network/huri": "^2.52.0-rc.2",
+    "@xyo-network/module": "^2.52.0-rc.2",
+    "@xyo-network/module-model": "^2.52.0-rc.2",
+    "@xyo-network/payload-builder": "^2.52.0-rc.2",
+    "@xyo-network/payload-model": "^2.52.0-rc.2",
+    "@xyo-network/payload-wrapper": "^2.52.0-rc.2",
+    "@xyo-network/promise": "^2.52.0-rc.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -69,5 +68,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.51.9"
+  "version": "2.52.0-rc.2",
+  "stableVersion": "2.51.9"
 }

package/src/AbstractDiviner.ts

@@ -1,11 +1,10 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
-import { AnyObject } from '@xyo-network/core'
-import { DivinerConfig, DivinerModule, XyoDivinerDivineQuerySchema, XyoDivinerQuery } from '@xyo-network/diviner-model'
+import { DivinerModule, DivinerParams, XyoDivinerConfigSchema, XyoDivinerDivineQuerySchema, XyoDivinerQuery } from '@xyo-network/diviner-model'
 import {
   AbstractModule,
+  creatableModule,
   ModuleConfig,
-  ModuleParams,
   ModuleQueryResult,
   QueryBoundWitnessWrapper,
   XyoErrorBuilder,
@@ -15,28 +14,20 @@ import { XyoPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable } from '@xyo-network/promise'
 
-export type DivinerParams<TConfig extends DivinerConfig = DivinerConfig, TAdditional extends AnyObject | undefined = undefined> = ModuleParams<
-  TConfig,
-  TAdditional
->
-
+@creatableModule()
 export abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams>
   extends AbstractModule<TParams>
-  implements DivinerModule<TParams['config']>
+  implements DivinerModule<TParams>
 {
-  static override configSchema: string
+  static override configSchema: string = XyoDivinerConfigSchema
   static targetSchema: string
 
   override get queries(): string[] {
     return [XyoDivinerDivineQuerySchema, ...super.queries]
   }
 
-  get targetSchema() {
-    return this.config?.targetSchema
-  }
-
-  static override async create(params?: Partial<ModuleParams<DivinerConfig>>): Promise<AbstractDiviner> {
-    return (await super.create(params)) as AbstractDiviner
+  static override async create<TParams extends DivinerParams = DivinerParams>(params?: TParams) {
+    return (await super.create(params)) as DivinerModule
   }
 
   override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(

package/src/AddressChain/Config.ts

@@ -1,4 +1,3 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
 import { DivinerConfig } from '@xyo-network/diviner-model'
 
 import { AddressChainSchema } from './Diviner'
@@ -6,12 +5,9 @@ import { AddressChainSchema } from './Diviner'
 export type AddressChainDivinerConfigSchema = `${AddressChainSchema}.config`
 export const AddressChainDivinerConfigSchema: AddressChainDivinerConfigSchema = `${AddressChainSchema}.config`
 
-export type AddressChainDivinerConfig = DivinerConfig<
-  XyoBoundWitness,
-  {
-    address: string
-    maxResults?: number
-    schema: AddressChainDivinerConfigSchema
-    startHash: string
-  }
->
+export type AddressChainDivinerConfig = DivinerConfig<{
+  address?: string
+  maxResults?: number
+  schema: AddressChainDivinerConfigSchema
+  startHash?: string
+}>

package/src/AddressChain/MemoryDiviner.ts

@@ -3,34 +3,47 @@ import { ArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
 import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { ModuleParams } from '@xyo-network/module'
+import { DivinerParams } from '@xyo-network/diviner-model'
+import { AnyConfigSchema } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 
-import { AbstractDiviner, DivinerParams } from '../AbstractDiviner'
+import { AbstractDiviner } from '../AbstractDiviner'
 import { AddressChainDivinerConfig, AddressChainDivinerConfigSchema } from './Config'
 import { AddressChainDiviner } from './Diviner'
 
 // This diviner returns the most recent boundwitness signed by the address that can be found
 // if multiple broken chains are found, all the heads are returned
 
-export class MemoryAddressChainDiviner extends AbstractDiviner<DivinerParams<AddressChainDivinerConfig>> implements AddressChainDiviner {
+export type MemoryAddressChainDivinerParams = DivinerParams<AnyConfigSchema<AddressChainDivinerConfig>>
+
+export class MemoryAddressChainDiviner<TParams extends MemoryAddressChainDivinerParams>
+  extends AbstractDiviner<TParams>
+  implements AddressChainDiviner
+{
   static override configSchema = AddressChainDivinerConfigSchema
 
-  static override async create(params?: Partial<ModuleParams<AddressChainDivinerConfig>>): Promise<MemoryAddressChainDiviner> {
-    return (await super.create(params)) as MemoryAddressChainDiviner
+  get queryAddress() {
+    return assertEx(this.config.address, 'Missing address')
+  }
+
+  static override async create<TParams extends MemoryAddressChainDivinerParams>(params?: TParams) {
+    return (await super.create(params)) as MemoryAddressChainDiviner<TParams>
   }
 
   async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
     const result: XyoPayload[] = []
     assertEx(!payloads?.length, 'MemoryAddressChainDiviner.divine does not allow payloads to be sent')
-    const archivists = (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map((archivist) => new ArchivistWrapper(archivist)) ?? []
-    let currentHash: string | null = this.config.startHash
+    const archivists =
+      (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map(
+        (archivist) => new ArchivistWrapper({ account: this.account, module: archivist }),
+      ) ?? []
+    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 bw: BoundWitnessWrapper | undefined = BoundWitnessWrapper.parse(bwPayload)
       if (bw) {
         result.push(bw)
-        currentHash = bw.prev(this.config.address)
+        currentHash = bw.prev(this.queryAddress)
       }
     }
     return result

package/src/AddressHistory/Config.ts

@@ -1,4 +1,3 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
 import { DivinerConfig } from '@xyo-network/diviner-model'
 
 import { AddressHistorySchema } from './Diviner'
@@ -6,10 +5,7 @@ import { AddressHistorySchema } from './Diviner'
 export type AddressHistoryDivinerConfigSchema = `${AddressHistorySchema}.config`
 export const AddressHistoryDivinerConfigSchema: AddressHistoryDivinerConfigSchema = `${AddressHistorySchema}.config`
 
-export type AddressHistoryDivinerConfig = DivinerConfig<
-  XyoBoundWitness,
-  {
-    address: string
-    schema: AddressHistoryDivinerConfigSchema
-  }
->
+export type AddressHistoryDivinerConfig = DivinerConfig<{
+  address?: string
+  schema: AddressHistoryDivinerConfigSchema
+}>

package/src/AddressHistory/MemoryDiviner.ts

@@ -3,27 +3,40 @@ import { ArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
 import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { ModuleParams } from '@xyo-network/module'
+import { DivinerParams } from '@xyo-network/diviner-model'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-import { AbstractDiviner, DivinerParams } from '../AbstractDiviner'
+import { AbstractDiviner } from '../AbstractDiviner'
 import { AddressHistoryDivinerConfig, AddressHistoryDivinerConfigSchema } from './Config'
 import { AddressHistoryDiviner } from './Diviner'
 
 // This diviner returns the most recent boundwitness signed by the address that can be found
 // if multiple broken chains are found, all the heads are returned
 
-export class MemoryAddressHistoryDiviner extends AbstractDiviner<DivinerParams<AddressHistoryDivinerConfig>> implements AddressHistoryDiviner {
-  static override configSchema = AddressHistoryDivinerConfigSchema
+export type MemoryAddressHistoryDivinerParams = DivinerParams<AnyConfigSchema<AddressHistoryDivinerConfig>>
 
-  static override async create(params?: Partial<ModuleParams<AddressHistoryDivinerConfig>>): Promise<MemoryAddressHistoryDiviner> {
-    return (await super.create(params)) as MemoryAddressHistoryDiviner
+export class MemoryAddressHistoryDiviner<TParams extends MemoryAddressHistoryDivinerParams>
+  extends AbstractDiviner<TParams>
+  implements AddressHistoryDiviner
+{
+  static override configSchema: string = AddressHistoryDivinerConfigSchema
+
+  get queryAddress() {
+    return assertEx(this.config.address, 'Missing address')
+  }
+
+  static override async create<TParams extends MemoryAddressHistoryDivinerParams>(params?: TParams) {
+    return (await super.create(params)) as MemoryAddressHistoryDiviner<TParams>
   }
 
   async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
     assertEx(!payloads?.length, 'MemoryAddressHistoryDiviner.divine does not allow payloads to be sent')
-    const archivists = (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map((archivist) => new ArchivistWrapper(archivist)) ?? []
+    const archivists =
+      (await this.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map(
+        (archivist) => new ArchivistWrapper({ account: this.account, module: archivist }),
+      ) ?? []
     assertEx(archivists.length > 0, 'Did not find any archivists')
     const bwLists = (
       await Promise.all(
@@ -36,7 +49,7 @@ export class MemoryAddressHistoryDiviner extends AbstractDiviner<DivinerParams<A
 
     const bwRecords = this.buildWrapperRecords(bwLists)
 
-    const chains = Object.values(this.buildAddressChains(this.config.address, bwRecords))
+    const chains = Object.values(this.buildAddressChains(this.queryAddress, bwRecords))
 
     //return the heads of each chain (get the last bw on each chain)
     return chains.map((chain) => assertEx(PayloadWrapper.unwrap(chain.shift())))
@@ -66,7 +79,7 @@ export class MemoryAddressHistoryDiviner extends AbstractDiviner<DivinerParams<A
   //build object with hashes as keys and wrappers as values
   private buildWrapperRecords(lists: XyoBoundWitness[]) {
     return lists
-      .filter((bw) => bw.addresses.includes(this.config.address))
+      .filter((bw) => bw.addresses.includes(this.queryAddress))
       .reduce<Record<string, BoundWitnessWrapper>>((bwRecords, bw) => {
         const wrapper = new BoundWitnessWrapper(bw)
         bwRecords[wrapper.hash] = wrapper

package/src/AddressSpace/MemoryAddressSpaceDiviner.ts

@@ -3,34 +3,38 @@ 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 { DivinerConfig } from '@xyo-network/diviner-model'
-import { ModuleParams } from '@xyo-network/module'
+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 { AbstractDiviner, DivinerParams } from '../AbstractDiviner'
+import { AbstractDiviner } from '../AbstractDiviner'
 import { AddressSpaceDiviner, AddressSpaceSchema } from './AddressSpaceDiviner'
 
 export type MemoryAddressSpaceDivinerConfigSchema = `${AddressSpaceSchema}.memory.config`
 export const MemoryAddressSpaceDivinerConfigSchema: MemoryAddressSpaceDivinerConfigSchema = `${AddressSpaceSchema}.memory.config`
 
-export type MemoryAddressSpaceDivinerConfig = DivinerConfig<
-  XyoBoundWitness,
-  {
-    address: string
-    archivists?: string[]
-    schema: MemoryAddressSpaceDivinerConfigSchema
-  }
->
+export type MemoryAddressSpaceDivinerConfig = DivinerConfig<{
+  address?: string
+  archivists?: string[]
+  schema: MemoryAddressSpaceDivinerConfigSchema
+}>
+
+export type MemoryAddressSpaceDivinerParams<
+  TConfig extends AnyConfigSchema<MemoryAddressSpaceDivinerConfig> = AnyConfigSchema<MemoryAddressSpaceDivinerConfig>,
+> = DivinerParams<TConfig>
 
 /**
  * This Diviner returns the list of all addresses encountered for the reachable archivists
  */
-export class MemoryAddressSpaceDiviner extends AbstractDiviner<DivinerParams<MemoryAddressSpaceDivinerConfig>> implements AddressSpaceDiviner {
+export class MemoryAddressSpaceDiviner<TParams extends MemoryAddressSpaceDivinerParams>
+  extends AbstractDiviner<TParams>
+  implements AddressSpaceDiviner
+{
   static override configSchema = MemoryAddressSpaceDivinerConfigSchema
 
-  static override async create(params?: Partial<ModuleParams<MemoryAddressSpaceDivinerConfig>>): Promise<MemoryAddressSpaceDiviner> {
-    return (await super.create(params)) as MemoryAddressSpaceDiviner
+  static override async create<TParams extends MemoryAddressSpaceDivinerParams>(params?: TParams) {
+    return (await super.create(params)) as MemoryAddressSpaceDiviner<TParams>
   }
 
   async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
@@ -59,7 +63,9 @@ export class MemoryAddressSpaceDiviner extends AbstractDiviner<DivinerParams<Mem
       return await this.resolve<ArchivistModule>({ address: this.config.archivists })
     } else {
       //get all reachable archivists
-      return (await this.resolve<ArchivistModule>({ query: [[ArchivistGetQuerySchema]] })).map((archivist) => new ArchivistWrapper(archivist))
+      return (await this.resolve<ArchivistModule>({ query: [[ArchivistGetQuerySchema]] })).map(
+        (archivist) => new ArchivistWrapper({ account: this.account, module: archivist }),
+      )
     }
   }
 }

package/src/IdentityDiviner.ts

@@ -1,16 +1,20 @@
-import { DivinerConfig, XyoDivinerConfigSchema } from '@xyo-network/diviner-model'
-import { ModuleParams } from '@xyo-network/module'
+import { ArchivistParams } from '@xyo-network/archivist'
+import { DivinerConfig, DivinerModule } 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 { Promisable } from '@xyo-network/promise'
 
 import { AbstractDiviner } from './AbstractDiviner'
 
-export class IdentityDiviner extends AbstractDiviner {
-  static override configSchema = XyoDivinerConfigSchema
+export type IdentityDivinerParams<TConfig extends AnyConfigSchema<DivinerConfig> = AnyConfigSchema<DivinerConfig>> = ArchivistParams<TConfig>
+
+@creatableModule()
+export class IdentityDiviner<TParams extends IdentityDivinerParams> extends AbstractDiviner<TParams> {
   static override targetSchema = 'network.xyo.test'
 
-  static override async create(params?: ModuleParams<DivinerConfig>) {
-    return (await super.create(params)) as IdentityDiviner
+  static override async create<TParams extends IdentityDivinerParams>(params?: TParams) {
+    return (await super.create(params)) as DivinerModule
   }
 
   override divine(payloads: XyoPayloads): Promisable<XyoPayloads> {

package/src/Payload/AbstractPayloadDiviner.ts

@@ -1,3 +1,5 @@
-import { AbstractDiviner, DivinerParams } from '../AbstractDiviner'
+import { DivinerParams } from '@xyo-network/diviner-model'
+
+import { AbstractDiviner } from '../AbstractDiviner'
 
 export abstract class AbstractPayloadDiviner<P extends DivinerParams = DivinerParams> extends AbstractDiviner<P> {}

package/src/Payload/Archivist/Config.ts

@@ -5,7 +5,6 @@ export type XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payloa
 export const XyoArchivistPayloadDivinerConfigSchema: XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config'
 
 export type XyoArchivistPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = DivinerConfig<
-  XyoPayload,
   T & {
     archivist?: string
     schema: XyoArchivistPayloadDivinerConfigSchema

package/src/Payload/Archivist/Diviner.ts

@@ -1,21 +1,25 @@
 import { assertEx } from '@xylabs/assert'
 import { ArchivistGetQuery, ArchivistGetQuerySchema, ArchivistModule } from '@xyo-network/archivist'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
+import { DivinerParams } from '@xyo-network/diviner-model'
 import { Huri } from '@xyo-network/huri'
-import { ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-import { DivinerParams } from '../../AbstractDiviner'
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner'
 import { XyoHuriPayload, XyoHuriSchema } from '../XyoHuriPayload'
 import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config'
 
-export class ArchivistPayloadDiviner extends AbstractPayloadDiviner<DivinerParams<XyoArchivistPayloadDivinerConfig>> {
+export type ArchivistPayloadDivinerParams<
+  TConfig extends AnyConfigSchema<XyoArchivistPayloadDivinerConfig> = AnyConfigSchema<XyoArchivistPayloadDivinerConfig>,
+> = DivinerParams<TConfig>
+
+export class ArchivistPayloadDiviner<TParams extends ArchivistPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
   static override configSchema: XyoArchivistPayloadDivinerConfigSchema
 
-  static override async create(params?: ModuleParams<XyoArchivistPayloadDivinerConfig>): Promise<ArchivistPayloadDiviner> {
-    return (await super.create(params)) as ArchivistPayloadDiviner
+  static override async create<TParams extends ArchivistPayloadDivinerParams>(params?: TParams) {
+    return (await super.create(params)) as ArchivistPayloadDiviner<TParams>
   }
 
   async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
@@ -40,7 +44,7 @@ export class ArchivistPayloadDiviner extends AbstractPayloadDiviner<DivinerParam
         ? ((await this.resolve({ address: [configArchivistAddress] })) as unknown as ArchivistModule[]).shift() ?? null
         : null
       if (resolvedArchivist) {
-        return resolvedArchivist ? new ArchivistWrapper(resolvedArchivist) : null
+        return resolvedArchivist ? new ArchivistWrapper({ account: this.account, module: resolvedArchivist }) : null
       }
     }
     return null

package/src/Payload/Huri/Config.ts

@@ -6,7 +6,6 @@ export type XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.hur
 export const XyoHuriPayloadDivinerConfigSchema: XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config'
 
 export type XyoHuriPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = DivinerConfig<
-  XyoPayload,
   T & {
     options?: HuriOptions
     schema: XyoHuriPayloadDivinerConfigSchema

package/src/Payload/Huri/Diviner.ts

@@ -1,24 +1,27 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
+import { DivinerParams } from '@xyo-network/diviner-model'
 import { Huri } from '@xyo-network/huri'
-import { ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 import compact from 'lodash/compact'
 
-import { DivinerParams } from '../../AbstractDiviner'
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner'
 import { XyoHuriPayload, XyoHuriSchema } from '../XyoHuriPayload'
 import { XyoHuriPayloadDivinerConfig, XyoHuriPayloadDivinerConfigSchema } from './Config'
 
-export class HuriPayloadDiviner extends AbstractPayloadDiviner<DivinerParams<XyoHuriPayloadDivinerConfig>> {
+export type HuriPayloadDivinerParams<TConfig extends AnyConfigSchema<XyoHuriPayloadDivinerConfig> = AnyConfigSchema<XyoHuriPayloadDivinerConfig>> =
+  DivinerParams<TConfig>
+
+export class HuriPayloadDiviner<TParams extends HuriPayloadDivinerParams = HuriPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
   static override configSchema: XyoHuriPayloadDivinerConfigSchema
 
   protected get options() {
     return this.config?.options
   }
 
-  static override async create(params?: Partial<ModuleParams<XyoHuriPayloadDivinerConfig>>): Promise<HuriPayloadDiviner> {
-    return (await super.create(params)) as HuriPayloadDiviner
+  static override async create<TParams extends HuriPayloadDivinerParams>(params?: HuriPayloadDivinerParams) {
+    return (await super.create(params)) as HuriPayloadDiviner<TParams>
   }
 
   override async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {