@xyo-network/sentinel 2.75.13 → 2.75.15

package/package.json

@@ -10,33 +10,36 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.12.14",
-    "@xylabs/lodash": "^2.12.14",
-    "@xylabs/promise": "^2.12.14",
-    "@xyo-network/archivist": "~2.75.13",
-    "@xyo-network/boundwitness-builder": "~2.75.13",
-    "@xyo-network/boundwitness-model": "~2.75.13",
-    "@xyo-network/core": "~2.75.13",
-    "@xyo-network/error": "~2.75.13",
-    "@xyo-network/module": "~2.75.13",
-    "@xyo-network/payload-model": "~2.75.13",
-    "@xyo-network/payload-wrapper": "~2.75.13",
-    "@xyo-network/sentinel-model": "~2.75.13",
-    "@xyo-network/witness": "~2.75.13"
+    "@xylabs/assert": "^2.12.22",
+    "@xylabs/lodash": "^2.12.22",
+    "@xylabs/promise": "^2.12.22",
+    "@xyo-network/archivist": "~2.75.15",
+    "@xyo-network/boundwitness-builder": "~2.75.15",
+    "@xyo-network/boundwitness-model": "~2.75.15",
+    "@xyo-network/core": "~2.75.15",
+    "@xyo-network/error": "~2.75.15",
+    "@xyo-network/module-abstract": "~2.75.15",
+    "@xyo-network/module-model": "~2.75.15",
+    "@xyo-network/module-wrapper": "~2.75.15",
+    "@xyo-network/payload-model": "~2.75.15",
+    "@xyo-network/payload-wrapper": "~2.75.15",
+    "@xyo-network/sentinel-model": "~2.75.15",
+    "@xyo-network/witness-model": "~2.75.15"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@xylabs/delay": "^2.12.14",
+    "@xylabs/delay": "^2.12.22",
     "@xylabs/ts-scripts-yarn3": "^3.0.88",
     "@xylabs/tsconfig": "^3.0.88",
-    "@xyo-network/account": "~2.75.13",
-    "@xyo-network/boundwitness-validator": "~2.75.13",
-    "@xyo-network/boundwitness-wrapper": "~2.75.13",
-    "@xyo-network/id-payload-plugin": "~2.75.13",
-    "@xyo-network/id-plugin": "~2.75.13",
-    "@xyo-network/node-memory": "~2.75.13",
-    "@xyo-network/node-system-info-plugin": "~2.75.13",
-    "@xyo-network/witnesses": "~2.75.13",
+    "@xyo-network/abstract-witness": "~2.75.15",
+    "@xyo-network/account": "~2.75.15",
+    "@xyo-network/boundwitness-validator": "~2.75.15",
+    "@xyo-network/boundwitness-wrapper": "~2.75.15",
+    "@xyo-network/id-payload-plugin": "~2.75.15",
+    "@xyo-network/id-plugin": "~2.75.15",
+    "@xyo-network/node-memory": "~2.75.15",
+    "@xyo-network/node-system-info-plugin": "~2.75.15",
+    "@xyo-network/witnesses": "~2.75.15",
     "typescript": "^5.2.2"
   },
   "docs": "dist/docs.json",
@@ -81,5 +84,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.75.13"
+  "version": "2.75.15"
 }

package/src/AbstractSentinel.ts

@@ -1,9 +1,9 @@
 import { assertEx } from '@xylabs/assert'
 import { uniq } from '@xylabs/lodash'
-import { AbstractArchivingModule, asArchivistInstance } from '@xyo-network/archivist'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness, isBoundWitness, notBoundWitness } from '@xyo-network/boundwitness-model'
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module'
+import { AbstractModuleInstance } from '@xyo-network/module-abstract'
+import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import {
   CustomSentinelInstance,
@@ -13,13 +13,13 @@ import {
   SentinelQueryBase,
   SentinelReportQuerySchema,
 } from '@xyo-network/sentinel-model'
-import { isWitnessInstance, WitnessInstance } from '@xyo-network/witness'
+import { isWitnessInstance, WitnessInstance } from '@xyo-network/witness-model'
 
 export abstract class AbstractSentinel<
     TParams extends SentinelParams = SentinelParams,
     TEventData extends SentinelModuleEventData<SentinelInstance<TParams>> = SentinelModuleEventData<SentinelInstance<TParams>>,
   >
-  extends AbstractArchivingModule<TParams, TEventData>
+  extends AbstractModuleInstance<TParams, TEventData>
   implements CustomSentinelInstance<TParams, TEventData>
 {
   history: BoundWitness[] = []
@@ -34,49 +34,15 @@ export abstract class AbstractSentinel<
     }
   }
 
-  addArchivist(address: string[]) {
-    this.config.archivists = uniq([...address, ...(this.config.archivists ?? [])])
-  }
-
   addWitness(address: string[]) {
     this.config.witnesses = uniq([...address, ...(this.config.witnesses ?? [])])
   }
 
-  async archivists() {
-    this.logger?.debug(`archivists:config:archivist: ${this.config?.archivists?.length}`)
-    const namesOrAddresses = this.config?.archivists
-      ? Array.isArray(this.config.archivists)
-        ? this.config?.archivists
-        : [this.config.archivists]
-      : undefined
-    this.logger?.debug(`archivist:namesOrAddresses: ${namesOrAddresses?.length}`)
-    const result = [
-      ...(await this.resolve(namesOrAddresses ? { address: namesOrAddresses } : undefined)),
-      ...(await this.resolve(namesOrAddresses ? { name: namesOrAddresses } : undefined)),
-    ].map((module) => assertEx(asArchivistInstance(module), 'Tried to resolve a non-archivist as an archivist'))
-
-    if (namesOrAddresses && namesOrAddresses.length !== result.length) {
-      this.logger?.warn(`Not all archivists found [Requested: ${namesOrAddresses.length}, Found: ${result.length}]`)
-    }
-
-    this.logger?.debug(`archivists:result: ${result?.length}`)
-
-    return result
-  }
-
-  removeArchivist(address: string[]) {
-    this.config.archivists = (this.config.archivists ?? []).filter((archivist) => !address.includes(archivist))
-  }
-
-  removeWitness(address: string[]) {
-    this.config.witnesses = (this.config.witnesses ?? []).filter((witness) => !address.includes(witness))
-  }
-
   async report(inPayloads?: Payload[]): Promise<Payload[]> {
     this._noOverride('report')
     await this.emit('reportStart', { inPayloads, module: this })
     const payloads = await this.reportHandler(inPayloads)
-    this.logger?.debug(`report:payloads: ${JSON.stringify(payloads, null, 2)}`)
+    //this.logger?.debug(`report:payloads: ${JSON.stringify(payloads, null, 2)}`)
     const outPayloads = payloads.filter(notBoundWitness)
     const boundwitnesses = payloads.filter(isBoundWitness)
     const boundwitness = boundwitnesses.find((bw) => bw.addresses.includes(this.address))

package/src/MemorySentinel.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled, rejected } from '@xylabs/promise'
 import { handleError } from '@xyo-network/error'
-import { AnyConfigSchema } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import {
   SentinelConfig,
@@ -11,7 +11,7 @@ import {
   SentinelParams,
   SentinelReportQuerySchema,
 } from '@xyo-network/sentinel-model'
-import { WitnessInstance } from '@xyo-network/witness'
+import { WitnessInstance } from '@xyo-network/witness-model'
 
 import { AbstractSentinel } from './AbstractSentinel'
 
@@ -30,7 +30,7 @@ export class MemorySentinel<
     const resultPayloads: Payload[] = []
 
     try {
-      const [generatedPayloads, generatedErrors] = await this.generateResults(allWitnesses, payloads)
+      const [generatedPayloads, generatedErrors] = await this.generateResults(allWitnesses)
       const combinedPayloads = [...generatedPayloads, ...payloads]
       resultPayloads.push(...combinedPayloads)
       errors.push(...generatedErrors)

package/src/Wrapper.ts

@@ -1,5 +1,5 @@
 import { ArchivistInstance } from '@xyo-network/archivist'
-import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'
 import { Payload } from '@xyo-network/payload-model'
 import {
   isSentinelInstance,
@@ -9,7 +9,7 @@ import {
   SentinelReportQuery,
   SentinelReportQuerySchema,
 } from '@xyo-network/sentinel-model'
-import { WitnessInstance } from '@xyo-network/witness'
+import { WitnessInstance } from '@xyo-network/witness-model'
 
 constructableModuleWrapper()
 export class SentinelWrapper<TModule extends SentinelModule = SentinelModule>