@xyo-network/diviner-address-space-memory 2.57.5 → 2.58.0

package/package.json

@@ -10,19 +10,19 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.7.6",
-    "@xyo-network/abstract-diviner": "^2.57.5",
-    "@xyo-network/address-payload-plugin": "^2.57.5",
-    "@xyo-network/archivist": "^2.57.5",
-    "@xyo-network/boundwitness-model": "^2.57.5",
-    "@xyo-network/diviner-address-space-abstract": "^2.57.5",
-    "@xyo-network/diviner-address-space-model": "^2.57.5",
-    "@xyo-network/payload-builder": "^2.57.5",
-    "@xyo-network/payload-model": "^2.57.5"
+    "@xylabs/assert": "^2.8.1",
+    "@xyo-network/abstract-diviner": "^2.58.0",
+    "@xyo-network/address-payload-plugin": "^2.58.0",
+    "@xyo-network/archivist": "^2.58.0",
+    "@xyo-network/boundwitness-model": "^2.58.0",
+    "@xyo-network/diviner-address-space-abstract": "^2.58.0",
+    "@xyo-network/diviner-address-space-model": "^2.58.0",
+    "@xyo-network/payload-builder": "^2.58.0",
+    "@xyo-network/payload-model": "^2.58.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.17.12",
-    "@xylabs/tsconfig": "^2.17.12",
+    "@xylabs/ts-scripts-yarn3": "^2.17.13",
+    "@xylabs/tsconfig": "^2.17.13",
     "typescript": "^5.0.4"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -58,5 +58,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.57.5"
+  "version": "2.58.0"
 }

package/src/MemoryAddressSpaceDiviner.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { AddressSchema } from '@xyo-network/address-payload-plugin'
-import { ArchivistGetQuerySchema, ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist'
+import { ArchivistWrapper } from '@xyo-network/archivist'
 import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { AddressSpaceDiviner } from '@xyo-network/diviner-address-space-abstract'
 import { AddressSpaceDivinerConfigSchema, AddressSpaceDivinerParams } from '@xyo-network/diviner-address-space-model'
@@ -19,16 +19,10 @@ export class MemoryAddressSpaceDiviner<TParams extends AddressSpaceDivinerParams
 
   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')
-    const bwLists = (
-      await Promise.all(
-        archivists.map(async (archivist) => {
-          const all = await archivist.all?.()
-          return (all?.filter((payload) => payload.schema === BoundWitnessSchema) as BoundWitness[]) ?? []
-        }),
-      )
-    ).flat()
+    const archivistMod = assertEx(await this.readArchivist(), 'Unable to resolve archivist')
+    const archivist = ArchivistWrapper.wrap(archivistMod, this.account)
+    const all = await archivist.all?.()
+    const bwLists = (all?.filter((payload) => payload.schema === BoundWitnessSchema) as BoundWitness[]) ?? []
     const addresses = new Set<string>(
       bwLists
         .map((bw) => bw.addresses)
@@ -37,15 +31,4 @@ export class MemoryAddressSpaceDiviner<TParams extends AddressSpaceDivinerParams
     )
     return [...addresses].map((address) => new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build())
   }
-
-  protected async archivists(): Promise<ArchivistModule[]> {
-    if (this.config.archivists) {
-      return await this.resolve<ArchivistModule>({ address: this.config.archivists })
-    } else {
-      //get all reachable archivists
-      return (await this.resolve<ArchivistModule>({ query: [[ArchivistGetQuerySchema]] })).map((archivist) =>
-        ArchivistWrapper.wrap(archivist, this.account),
-      )
-    }
-  }
 }