@xyo-network/boundwitness-validator 5.3.22 → 5.3.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/boundwitness-validator",
-  "version": "5.3.22",
+  "version": "5.3.24",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -30,48 +30,44 @@
   "types": "dist/neutral/index.d.ts",
   "files": [
     "dist",
-    "src",
     "!**/*.bench.*",
     "!**/*.spec.*",
     "!**/*.test.*",
     "README.md"
   ],
   "dependencies": {
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/elliptic": "~5.3.22",
-    "@xyo-network/payload": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "@xyo-network/payload-validator": "~5.3.22"
+    "@xyo-network/boundwitness-model": "~5.3.24",
+    "@xyo-network/payload": "~5.3.24",
+    "@xyo-network/payload-validator": "~5.3.24",
+    "@xyo-network/elliptic": "~5.3.24",
+    "@xyo-network/payload-model": "~5.3.24"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@types/node": "^25.5.0",
-    "@xylabs/sdk-js": "^5.0.91",
-    "@xylabs/ts-scripts-common": "~7.6.8",
-    "@xylabs/ts-scripts-yarn3": "~7.6.8",
-    "@xylabs/tsconfig": "~7.6.8",
-    "@xylabs/vitest-extended": "~5.0.91",
-    "@xyo-network/boundwitness-builder": "~5.3.22",
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/elliptic": "~5.3.22",
-    "@xyo-network/payload": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "@xyo-network/payload-validator": "~5.3.22",
-    "@xyo-network/schema-name-validator": "~5.3.22",
-    "@xyo-network/wallet": "~5.3.22",
-    "@xyo-network/wallet-model": "~5.3.22",
+    "@xylabs/sdk-js": "^5.0.93",
+    "@xylabs/ts-scripts-common": "~7.6.16",
+    "@xylabs/ts-scripts-pnpm": "~7.6.16",
+    "@xylabs/tsconfig": "~7.6.16",
+    "@xylabs/vitest-extended": "~5.0.93",
     "acorn": "^8.16.0",
     "axios": "^1.14.0",
-    "cosmiconfig": "^9.0.1",
-    "esbuild": "^0.27.4",
-    "eslint": "^10.1.0",
+    "esbuild": "^0.28.0",
     "ethers": "^6.16.0",
-    "rollup": "^4.60.1",
     "tslib": "^2.8.1",
     "typescript": "~5.9.3",
     "vite": "^8.0.3",
     "vitest": "~4.1.2",
-    "zod": "^4.3.6"
+    "zod": "^4.3.6",
+    "@xyo-network/boundwitness-model": "~5.3.24",
+    "@xyo-network/elliptic": "~5.3.24",
+    "@xyo-network/payload": "~5.3.24",
+    "@xyo-network/boundwitness-builder": "~5.3.24",
+    "@xyo-network/payload-model": "~5.3.24",
+    "@xyo-network/payload-validator": "~5.3.24",
+    "@xyo-network/wallet": "~5.3.24",
+    "@xyo-network/wallet-model": "~5.3.24",
+    "@xyo-network/schema-name-validator": "~5.3.24"
   },
   "peerDependencies": {
     "@xylabs/sdk-js": "^5",
@@ -82,4 +78,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/Validator.ts

@@ -1,124 +0,0 @@
-import {
-  asAddress, toArrayBuffer,
-  uniq, validateType,
-} from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { BoundWitnessSchema } from '@xyo-network/boundwitness-model'
-import { Elliptic } from '@xyo-network/elliptic'
-import { PayloadBuilder } from '@xyo-network/payload'
-import { PayloadValidator } from '@xyo-network/payload-validator'
-
-const validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {
-  return a.length == b.length ? [] : [new Error(`${message} []`)]
-}
-
-export class BoundWitnessValidator<T extends BoundWitness = BoundWitness> extends PayloadValidator<T> {
-  protected get expectedSchema(): string {
-    return BoundWitnessSchema
-  }
-
-  static async validateSignature(hash: ArrayBufferLike, address: ArrayBufferLike, signature?: ArrayBufferLike): Promise<Error[]> {
-    if (!signature) {
-      return [new Error(`Missing signature [${address}]`)]
-    }
-    if (!(await Elliptic.verify(hash, signature, address))) {
-      return [new Error(`Invalid signature [${address}]`)]
-    }
-    return []
-  }
-
-  addresses(): Error[] {
-    const errors: Error[] = [...this.addressesUniqueness()]
-    // const { addresses } = this.obj
-    // if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))
-    return errors
-  }
-
-  addressesUniqueness(): Error[] {
-    const errors: Error[] = []
-    const { addresses = [] } = this.obj
-    const uniqAddresses = uniq(addresses)
-    if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))
-    return errors
-  }
-
-  previousHashes() {
-    const errors: Error[] = []
-    return errors
-  }
-
-  schema(): Error[] {
-    const errors: Error[] = []
-    if (this.obj.schema !== this.expectedSchema) {
-      errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))
-    }
-    return errors
-  }
-
-  schemas(): Error[] {
-    const errors: Error[] = []
-    const Schemas = this.obj.payload_schemas
-    if (Schemas) {
-      const schemaValidators = Schemas.map((schema: string) => {
-        return PayloadValidator.schemaNameValidatorFactory?.(schema)
-      })
-      for (const validator of schemaValidators) {
-        if (validator) {
-          errors.push(...validator.all())
-        }
-      }
-    }
-    return errors
-  }
-
-  async signatures(): Promise<Error[]> {
-    return [
-      ...validateArraysSameLength(this.obj.$signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),
-      ...(
-        await Promise.all(
-          this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>
-            BoundWitnessValidator.validateSignature(
-              toArrayBuffer(await PayloadBuilder.dataHash(this.payload)),
-              toArrayBuffer(asAddress(address, true)),
-              toArrayBuffer(this.obj.$signatures?.[index] ?? undefined),
-            )) ?? [],
-        )
-      ).flat(),
-    ]
-  }
-
-  override async validate() {
-    return [
-      ...(await this.signatures()),
-      ...this.addresses(),
-      ...this.validateArrayLengths(),
-      ...this.schemas(),
-      ...this.previousHashes(),
-      ...this.schema(),
-      ...(await super.validate()),
-    ]
-  }
-
-  validateArrayLengths(): Error[] {
-    const errors: Error[] = [...this.validatePayloadHashesLength()]
-    return errors
-  }
-
-  validatePayloadHashesLength(): Error[] {
-    const errors: Error[] = [...this.validateArrayLength('payload_hashes', 'payload_schemas')]
-    return errors
-  }
-
-  private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {
-    const errors: Error[] = []
-
-    const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)
-    const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)
-
-    if (array?.length !== compareArray?.length) {
-      errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))
-    }
-
-    return [...arrayErrors, ...compareArrayErrors, ...errors]
-  }
-}

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './lib/index.ts'
-export * from './Validator.ts'

package/src/lib/addresses/addressesContains.ts

@@ -1,14 +0,0 @@
-import type { Address } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContains } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains the addresses
- * @param bw The boundwitness to check
- * @param addresses The address to check for
- * @returns True if the boundwitness contains the addresses
- */
-export const addressesContains = (bw: BoundWitness, address: Address): boolean => {
-  return boundWitnessArrayPropertyContains(bw, 'addresses', address)
-}

package/src/lib/addresses/addressesContainsAll.ts

@@ -1,14 +0,0 @@
-import type { Address } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContainsAll } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains all of the addresses
- * @param bw The boundwitness to check
- * @param addresses The addresses to check for
- * @returns True if the boundwitness contains all of the addresses
- */
-export const addressesContainsAll = (bw: BoundWitness, addresses: Address[]): boolean => {
-  return boundWitnessArrayPropertyContainsAll(bw, 'addresses', addresses)
-}

package/src/lib/addresses/addressesContainsAny.ts

@@ -1,16 +0,0 @@
-import type { Address } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContainsAny } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains any of the addresses. If the addresses array
- * is empty, it will return true. This is to match the behavior or addressesContainsAll
- * which will return true if the addresses array is empty.
- * @param bw The boundwitness to check
- * @param addresses The addresses to check for
- * @returns True if the boundwitness contains any of the addresses
- */
-export const addressesContainsAny = (bw: BoundWitness, addresses: Address[]): boolean => {
-  return boundWitnessArrayPropertyContainsAny(bw, 'addresses', addresses)
-}

package/src/lib/addresses/index.ts

@@ -1,3 +0,0 @@
-export * from './addressesContains.ts'
-export * from './addressesContainsAll.ts'
-export * from './addressesContainsAny.ts'

package/src/lib/index.ts

@@ -1,3 +0,0 @@
-export * from './addresses/index.ts'
-export * from './payloadHashes/index.ts'
-export * from './payloadSchemas/index.ts'

package/src/lib/payloadHashes/index.ts

@@ -1,3 +0,0 @@
-export * from './payloadHashesContains.ts'
-export * from './payloadHashesContainsAll.ts'
-export * from './payloadHashesContainsAny.ts'

package/src/lib/payloadHashes/payloadHashesContains.ts

@@ -1,14 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContains } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains the payload hash
- * @param bw The boundwitness to check
- * @param payloadHash The payload hash to check for
- * @returns True if the boundwitness contains the payload hash
- */
-export const payloadHashesContains = (bw: BoundWitness, payloadHash: Hash): boolean => {
-  return boundWitnessArrayPropertyContains(bw, 'payload_hashes', payloadHash)
-}

package/src/lib/payloadHashes/payloadHashesContainsAll.ts

@@ -1,14 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContainsAll } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains all of the payload hashes
- * @param bw The boundwitness to check
- * @param payloadHashes The payload hashes to check for
- * @returns True if the boundwitness contains all of the payload hashes
- */
-export const payloadHashesContainsAll = (bw: BoundWitness, payloadHashes: Hash[]): boolean => {
-  return boundWitnessArrayPropertyContainsAll(bw, 'payload_hashes', payloadHashes)
-}

package/src/lib/payloadHashes/payloadHashesContainsAny.ts

@@ -1,16 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import { boundWitnessArrayPropertyContainsAny } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains any of the payload hashes. If the payload hashes array
- * is empty, it will return true. This is to match the behavior or payload hashesContainsAll
- * which will return true if the payload hashes array is empty.
- * @param bw The boundwitness to check
- * @param payloadHashes The payload hashes to check for
- * @returns True if the boundwitness contains any of the payload hashes
- */
-export const payloadHashesContainsAny = (bw: BoundWitness, payloadHashes: Hash[]): boolean => {
-  return boundWitnessArrayPropertyContainsAny(bw, 'payload_hashes', payloadHashes)
-}

package/src/lib/payloadSchemas/index.ts

@@ -1,3 +0,0 @@
-export * from './payloadSchemasContains.ts'
-export * from './payloadSchemasContainsAll.ts'
-export * from './payloadSchemasContainsAny.ts'

package/src/lib/payloadSchemas/payloadSchemasContains.ts

@@ -1,14 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import type { Schema } from '@xyo-network/payload-model'
-
-import { boundWitnessArrayPropertyContains } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains the payload schema
- * @param bw The boundwitness to check
- * @param schema The payload schema to check for
- * @returns True if the boundwitness contains the payload schema
- */
-export const payloadSchemasContains = (bw: BoundWitness, schema: Schema): boolean => {
-  return boundWitnessArrayPropertyContains(bw, 'payload_schemas', schema)
-}

package/src/lib/payloadSchemas/payloadSchemasContainsAll.ts

@@ -1,14 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import type { Schema } from '@xyo-network/payload-model'
-
-import { boundWitnessArrayPropertyContainsAll } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains all of the payload schemas
- * @param bw The boundwitness to check
- * @param payloadSchemas The payload schemas to check for
- * @returns True if the boundwitness contains all of the payload schemas
- */
-export const payloadSchemasContainsAll = (bw: BoundWitness, payloadSchemas: Schema[]): boolean => {
-  return boundWitnessArrayPropertyContainsAll(bw, 'payload_schemas', payloadSchemas)
-}

package/src/lib/payloadSchemas/payloadSchemasContainsAny.ts

@@ -1,16 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import type { Schema } from '@xyo-network/payload-model'
-
-import { boundWitnessArrayPropertyContainsAny } from '../util/index.ts'
-
-/**
- * Checks if the boundwitness contains any of the payload schemas. If the payload schemas array
- * is empty, it will return true. This is to match the behavior or payload schemasContainsAll
- * which will return true if the payload schemas array is empty.
- * @param bw The boundwitness to check
- * @param payloadSchemas The payload schemas to check for
- * @returns True if the boundwitness contains any of the payload schemas
- */
-export const payloadSchemasContainsAny = (bw: BoundWitness, payloadSchemas: Schema[]): boolean => {
-  return boundWitnessArrayPropertyContainsAny(bw, 'payload_schemas', payloadSchemas)
-}

package/src/lib/util/BoundWitnessArrayProperty.ts

@@ -1,17 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-/**
- * The properties of a boundwitness that are string-like arrays
- */
-export type BoundWitnessArrayProperty = keyof Pick<BoundWitness,
-  'addresses'
-  // 'error_hashes' |
-  | 'payload_hashes'
-  | 'payload_schemas'
-  // 'previous_hashes'
->
-
-/**
- * The value of the underlying array type for the BoundWitness array property
- */
-export type BoundWitnessArrayPropertyValue<P extends BoundWitnessArrayProperty> = BoundWitness[P] extends (infer T)[] ? T : never

package/src/lib/util/boundWitnessArrayPropertyContains.ts

@@ -1,19 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import type { BoundWitnessArrayProperty, BoundWitnessArrayPropertyValue } from './BoundWitnessArrayProperty.ts'
-
-/**
- * Checks if the boundwitness contains the addresses
- * @param bw The boundwitness
- * @param prop The boundwitness property to check
- * @param value The value to check for in the property
- * @returns True if the boundwitness property contains the value
- */
-export const boundWitnessArrayPropertyContains = <P extends BoundWitnessArrayProperty>(
-  bw: BoundWitness,
-  prop: P,
-  value: BoundWitnessArrayPropertyValue<P>,
-
-): boolean => {
-  return (bw[prop] as BoundWitnessArrayPropertyValue<P>[])?.includes(value)
-}

package/src/lib/util/boundWitnessArrayPropertyContainsAll.ts

@@ -1,18 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import type { BoundWitnessArrayProperty, BoundWitnessArrayPropertyValue } from './BoundWitnessArrayProperty.ts'
-
-/**
- * Checks if the boundwitness property contains all of the values
- * @param bw The boundwitness
- * @param prop The boundwitness property to check
- * @param values The values to check for in the property
- * @returns True if the boundwitness contains all of the values in the property
- */
-export const boundWitnessArrayPropertyContainsAll = <P extends BoundWitnessArrayProperty>(
-  bw: BoundWitness,
-  prop: P,
-  values: BoundWitnessArrayPropertyValue<P>[],
-): boolean => {
-  return values.every(v => (bw[prop] as BoundWitnessArrayPropertyValue<P>[])?.includes(v))
-}

package/src/lib/util/boundWitnessArrayPropertyContainsAny.ts

@@ -1,21 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-
-import type { BoundWitnessArrayProperty, BoundWitnessArrayPropertyValue } from './BoundWitnessArrayProperty.ts'
-
-/**
- * Checks if the boundwitness contains any of the values in the property. If the values array
- * is empty, it will return true. This is to match the behavior or boundWitnessContainsAll
- * which will return true if the values array is empty.
- * @param bw The boundwitness
- * @param prop The boundwitness property to check
- * @param value The values to check for in the property
- * @returns True if the boundwitness contains any of the values in the property
- */
-export const boundWitnessArrayPropertyContainsAny = <P extends BoundWitnessArrayProperty>(
-  bw: BoundWitness,
-  prop: P,
-  values: BoundWitnessArrayPropertyValue<P>[],
-): boolean => {
-  if (values.length === 0) return true
-  return values.some(value => (bw[prop] as BoundWitnessArrayPropertyValue<P>[])?.includes(value))
-}

package/src/lib/util/index.ts

@@ -1,3 +0,0 @@
-export * from './boundWitnessArrayPropertyContains.ts'
-export * from './boundWitnessArrayPropertyContainsAll.ts'
-export * from './boundWitnessArrayPropertyContainsAny.ts'