@xyo-network/core 2.20.47 → 2.21.2

package/src/BoundWitness/Builder/Builder.ts

@@ -1,9 +1,9 @@
 import { assertEx, Buffer } from '@xylabs/sdk-js'
 
 import { sortFields, XyoHasher } from '../../Hasher'
-import { XyoPayload, XyoPayloadBody } from '../../Payload'
+import { XyoPayload, XyoPayloadWithPartialMeta } from '../../models'
 import { XyoAccount } from '../../Wallet'
-import { XyoBoundWitness } from '../models'
+import { WithXyoBoundWitnessMeta, XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models'
 
 export interface XyoBoundWitnessBuilderConfig {
   /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
@@ -28,7 +28,7 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payloads(payloads: (XyoPayload | null)[]) {
+  public payloads(payloads: (XyoPayloadWithPartialMeta | null)[]) {
     payloads.forEach((payload) => {
       if (payload !== null) {
         this.payload(payload)
@@ -37,7 +37,7 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payload(payload?: XyoPayload) {
+  public payload(payload?: XyoPayloadWithPartialMeta) {
     if (payload) {
       this._payload_schemas.push(payload.schema)
       this._payloads.push(assertEx(sortFields(payload)))
@@ -62,7 +62,7 @@ export class XyoBoundWitnessBuilder {
   }
 
   private inlinePayloads() {
-    return this._payloads.map<XyoPayloadBody>((payload, index) => {
+    return this._payloads.map<XyoPayload>((payload, index) => {
       return {
         ...payload,
         schema: this._payload_schemas[index],
@@ -70,11 +70,11 @@ export class XyoBoundWitnessBuilder {
     })
   }
 
-  public build(): XyoBoundWitness {
+  public build(): XyoBoundWitnessWithMeta {
     const hashableFields = this.hashableFields() as unknown as Record<string, unknown>
     const _hash = new XyoHasher(hashableFields).hash
 
-    const ret = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() } as XyoBoundWitness
+    const ret = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() } as WithXyoBoundWitnessMeta<XyoBoundWitness>
     if (this.config.inlinePayloads) {
       ret._payloads = this.inlinePayloads()
     }

package/src/BoundWitness/Validator/BodyValidator.spec.ts

@@ -4,7 +4,7 @@ import { XyoBoundWitnessBodyValidator } from './BodyValidator'
 
 test('all', () => {
   const validator = new XyoBoundWitnessBodyValidator(testBoundWitness)
-  const errors = validator.all()
+  const errors = validator.validate()
   dumpErrors(errors)
   expect(errors.length).toBe(0)
 })

package/src/BoundWitness/Validator/BodyValidator.ts

@@ -1,23 +1,21 @@
 import uniq from 'lodash/uniq'
 
 import { XyoHasher } from '../../Hasher'
-import { validateType } from '../../lib'
-import { WithStringIndex } from '../../models'
-import { XyoPayload } from '../../Payload'
+import { validateType, XyoValidator } from '../../lib'
+import { XyoPayload } from '../../models'
 import { XyoSchemaNameValidator } from '../../SchemaNameValidator'
-import { XyoBoundWitnessBody } from '../models'
+import { XyoBoundWitness } from '../models'
 
-class XyoBoundWitnessBodyValidator {
-  private body: WithStringIndex<XyoBoundWitnessBody>
+export class XyoBoundWitnessBodyValidator<T extends XyoBoundWitness = XyoBoundWitness> extends XyoValidator<T> {
   private payloads?: XyoPayload[]
-  constructor(body: XyoBoundWitnessBody, payloads?: XyoPayload[]) {
-    this.body = body as WithStringIndex<XyoBoundWitnessBody>
+  constructor(boundWitness: T, payloads?: XyoPayload[]) {
+    super(boundWitness)
     this.payloads = payloads
   }
 
   public addressesUniqueness() {
     const errors: Error[] = []
-    const { addresses } = this.body
+    const { addresses } = this.obj
     const uniqAddresses = uniq(addresses)
     if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))
     return errors
@@ -25,7 +23,7 @@ class XyoBoundWitnessBodyValidator {
 
   public addresses() {
     const errors: Error[] = []
-    const { addresses } = this.body
+    const { addresses } = this.obj
     if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))
     errors.push(...this.addressesUniqueness())
     return errors
@@ -34,8 +32,8 @@ class XyoBoundWitnessBodyValidator {
   private validateArrayLength(fieldName: string, compareArrayName: string) {
     const errors: Error[] = []
 
-    const [array, arrayErrors] = validateType('array', this.body[fieldName] as [], true)
-    const [compareArray, compareArrayErrors] = validateType('array', this.body[compareArrayName] as [], true)
+    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}]`))
@@ -58,10 +56,10 @@ class XyoBoundWitnessBodyValidator {
 
   public payloadHashes() {
     const errors: Error[] = []
-    const passedHashes = this.body.payload_hashes
+    const passedHashes = this.obj.payload_hashes
     this.payloads?.forEach((payload, index) => {
       const calcHash = new XyoHasher(payload).hash
-      const passedHash = passedHashes[index]
+      const passedHash = passedHashes?.[index]
       if (calcHash !== passedHash) {
         errors.push(new Error(`hash mismatch [${calcHash} !== ${passedHash}]`))
       }
@@ -71,12 +69,15 @@ class XyoBoundWitnessBodyValidator {
 
   public payloadSchemas() {
     const errors: Error[] = []
-    const schemaValidators: XyoSchemaNameValidator[] = this.body.payload_schemas.map((schema: string) => {
-      return new XyoSchemaNameValidator(schema)
-    })
-    schemaValidators.forEach((validator) => {
-      errors.push(...validator.all())
-    })
+    const payloadSchemas = this.obj.payload_schemas
+    if (payloadSchemas) {
+      const schemaValidators: XyoSchemaNameValidator[] = payloadSchemas.map((schema: string) => {
+        return new XyoSchemaNameValidator(schema)
+      })
+      schemaValidators.forEach((validator) => {
+        errors.push(...validator.all())
+      })
+    }
     return errors
   }
 
@@ -85,20 +86,18 @@ class XyoBoundWitnessBodyValidator {
     return errors
   }
 
-  public schmea() {
+  public schema() {
     const errors: Error[] = []
     const expectedSchema = 'network.xyo.boundwitness'
-    if (this.body.schema !== expectedSchema) {
-      errors.push(new Error(`invalid schema [${expectedSchema} !== ${this.body.schema}]`))
+    if (this.obj.schema !== expectedSchema) {
+      errors.push(new Error(`invalid schema [${expectedSchema} !== ${this.obj.schema}]`))
     }
     return errors
   }
 
-  public all() {
+  public validate() {
     const errors: Error[] = []
-    errors.push(...this.addresses(), ...this.validateArrayLengths(), ...this.payloadHashes(), ...this.payloadSchemas(), ...this.previousHashes(), ...this.schmea())
+    errors.push(...this.addresses(), ...this.validateArrayLengths(), ...this.payloadHashes(), ...this.payloadSchemas(), ...this.previousHashes(), ...this.schema())
     return errors
   }
 }
-
-export { XyoBoundWitnessBodyValidator }

package/src/BoundWitness/Validator/MetaValidator.spec.ts

@@ -1,53 +1,53 @@
 import { dumpErrors } from '../../lib'
 import { testBoundWitness } from '../../Test'
-import { XyoBoundWitness } from '../models'
+import { XyoBoundWitnessWithMeta } from '../models'
 import { XyoBoundWitnessMetaValidator } from './MetaValidator'
 
 describe('XyoBoundWitnessMetaValidator', () => {
   it('Validates valid Meta', () => {
     const validator = new XyoBoundWitnessMetaValidator(testBoundWitness)
-    const errors = validator.all()
+    const errors = validator.validate()
     dumpErrors(errors)
     expect(errors.length).toBe(0)
   })
   describe('sourceIp', () => {
     it('Validates valid IPv4 Address', () => {
-      const bw: XyoBoundWitness = {
+      const bw: XyoBoundWitnessWithMeta = {
         ...testBoundWitness,
         _source_ip: '127.0.0.1',
       }
       const validator = new XyoBoundWitnessMetaValidator(bw)
-      const errors = validator.all()
+      const errors = validator.validate()
       dumpErrors(errors)
       expect(errors.length).toBe(0)
     })
     it('Validates valid IPv6 Address', () => {
-      const bw: XyoBoundWitness = {
+      const bw: XyoBoundWitnessWithMeta = {
         ...testBoundWitness,
         _source_ip: '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
       }
       const validator = new XyoBoundWitnessMetaValidator(bw)
-      const errors = validator.all()
+      const errors = validator.validate()
       dumpErrors(errors)
       expect(errors.length).toBe(0)
     })
     it('Handles missing Address', () => {
-      const bw: XyoBoundWitness = {
+      const bw: XyoBoundWitnessWithMeta = {
         ...testBoundWitness,
         _source_ip: undefined,
       }
       const validator = new XyoBoundWitnessMetaValidator(bw)
-      const errors = validator.all()
+      const errors = validator.validate()
       dumpErrors(errors)
       expect(errors.length).toBe(0)
     })
     it('Detects invalid Addresses', () => {
-      const bw: XyoBoundWitness = {
+      const bw: XyoBoundWitnessWithMeta = {
         ...testBoundWitness,
         _source_ip: 'notAnIpAddress',
       }
       const validator = new XyoBoundWitnessMetaValidator(bw)
-      const errors = validator.all()
+      const errors = validator.validate()
       dumpErrors(errors)
       expect(errors.length).toBe(0)
     })

package/src/BoundWitness/Validator/MetaValidator.ts

@@ -1,16 +1,12 @@
 import { XyoHasher } from '../../Hasher'
-import { XyoBoundWitness } from '../models'
+import { XyoValidator } from '../../lib'
+import { XyoBoundWitnessMeta } from '../models'
 import { isIP } from './is-ip'
 
 const MIN_ALLOWED_TIMESTAMP = 1609459200000
 const MAX_ALLOWED_TIMESTAMP = 4102444800000
 
-export class XyoBoundWitnessMetaValidator {
-  private bw: XyoBoundWitness
-  constructor(bw: XyoBoundWitness) {
-    this.bw = bw
-  }
-
+export class XyoBoundWitnessMetaValidator<T extends XyoBoundWitnessMeta = XyoBoundWitnessMeta> extends XyoValidator<T> {
   public client() {
     const errors: Error[] = []
     return errors
@@ -19,10 +15,10 @@ export class XyoBoundWitnessMetaValidator {
   public hash() {
     const errors: Error[] = []
 
-    const hasher = new XyoHasher(this.bw)
+    const hasher = new XyoHasher(this.obj)
 
     const bodyHash = hasher.hash
-    if (bodyHash !== this.bw._hash) errors.push(new Error(`Body hash mismatch: [calculated: ${bodyHash}] [found: ${this.bw._hash}] [sortedStringify: ${hasher.stringified}]`))
+    if (bodyHash !== this.obj._hash) errors.push(new Error(`Body hash mismatch: [calculated: ${bodyHash}] [found: ${this.obj._hash}] [sortedStringify: ${hasher.stringified}]`))
     return errors
   }
 
@@ -38,7 +34,7 @@ export class XyoBoundWitnessMetaValidator {
 
   public timestamp() {
     const errors: Error[] = []
-    const { _timestamp } = this.bw
+    const { _timestamp } = this.obj
     if (_timestamp === undefined) errors.push(new Error('Missing _timestamp'))
     else if (_timestamp < MIN_ALLOWED_TIMESTAMP) errors.push(new Error('_timestamp is before year 2021'))
     else if (_timestamp > MAX_ALLOWED_TIMESTAMP) errors.push(new Error('_timestamp is after year 2100'))
@@ -47,7 +43,7 @@ export class XyoBoundWitnessMetaValidator {
 
   public sourceIp() {
     const errors: Error[] = []
-    const { _source_ip } = this.bw
+    const { _source_ip } = this.obj
     if (_source_ip && !isIP(_source_ip)) {
       errors.push(new Error(`_source_ip invalid format [${_source_ip}]`))
     }
@@ -56,12 +52,12 @@ export class XyoBoundWitnessMetaValidator {
 
   public userAgent() {
     const errors: Error[] = []
-    const { _user_agent } = this.bw
+    const { _user_agent } = this.obj
     if (!_user_agent) errors.push(new Error('_user_agent missing'))
     return errors
   }
 
-  public all() {
+  public validate() {
     const errors: Error[] = []
     errors.push(...this.client(), ...this.hash(), ...this.payloads(), ...this.signatures())
     return errors

package/src/BoundWitness/Validator/Validator.spec.ts

@@ -4,7 +4,7 @@ import { XyoBoundWitnessValidator } from './Validator'
 
 test('all', () => {
   const validator = new XyoBoundWitnessValidator(testBoundWitness)
-  const errors = validator.all()
+  const errors = validator.validate()
   dumpErrors(errors)
   expect(errors.length).toBe(0)
 })

package/src/BoundWitness/Validator/Validator.ts

@@ -1,7 +1,8 @@
 import { assertEx } from '@xylabs/sdk-js'
 
+import { XyoValidator } from '../../lib'
 import { XyoAddressValue } from '../../Wallet'
-import { XyoBoundWitness } from '../models'
+import { XyoBoundWitnessWithMeta } from '../models'
 import { XyoBoundWitnessBodyValidator } from './BodyValidator'
 import { XyoBoundWitnessMetaValidator } from './MetaValidator'
 
@@ -19,30 +20,29 @@ const validateSignature = (hash: string, address: string, signature?: string) =>
   return []
 }
 
-class XyoBoundWitnessValidator {
-  private bw: XyoBoundWitness
+class XyoBoundWitnessValidator<T extends XyoBoundWitnessWithMeta = XyoBoundWitnessWithMeta> extends XyoValidator<T> {
   public body: XyoBoundWitnessBodyValidator
   public meta: XyoBoundWitnessMetaValidator
-  constructor(bw: XyoBoundWitness) {
-    this.bw = bw
+  constructor(bw: T) {
+    super(bw)
     this.body = new XyoBoundWitnessBodyValidator(bw, bw._payloads)
     this.meta = new XyoBoundWitnessMetaValidator(bw)
   }
 
   public signatures() {
-    const hash = assertEx(this.bw._hash, 'Missing _hash')
+    const hash = assertEx(this.obj._hash, 'Missing _hash')
     return [
-      ...validateArraysSameLength(this.bw._signatures ?? [], this.bw.addresses, 'Length mismatch: address/_signature'),
-      ...this.bw.addresses.reduce<Error[]>((errors, address, index) => {
-        errors.push(...validateSignature(hash, address, this.bw._signatures?.[index]))
+      ...validateArraysSameLength(this.obj._signatures ?? [], this.obj.addresses, 'Length mismatch: address/_signature'),
+      ...this.obj.addresses.reduce<Error[]>((errors, address, index) => {
+        errors.push(...validateSignature(hash, address, this.obj._signatures?.[index]))
         return errors
       }, []),
     ]
   }
 
-  public all() {
+  public validate() {
     const errors: Error[] = []
-    errors.push(...this.meta.all(), ...this.body.all())
+    errors.push(...this.meta.validate(), ...this.body.validate())
     errors.push(...this.signatures())
     return errors
   }

package/src/BoundWitness/Wrapper/Wrapper.ts

@@ -2,12 +2,11 @@ import pick from 'lodash/pick'
 import { UAParser } from 'ua-parser-js'
 
 import { XyoHasher } from '../../Hasher'
-import { XyoBoundWitness } from '../models'
-import { XyoBoundWitnessValidator } from '../Validator'
+import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models'
 
 const scrubbedFields = ['_archive', '_client', '_hash', '_signatures', '_timestamp', '_user_agent', 'addresses', 'payload_schemas', 'previous_hashes', 'payload_hashes', 'schema']
 
-class XyoBoundWitnessWrapper<T extends XyoBoundWitness> extends XyoHasher<T> {
+export class XyoBoundWitnessWrapper<T extends XyoBoundWitness> extends XyoHasher<T> {
   public readonly bw: T
   constructor(bw: T) {
     super(bw)
@@ -17,18 +16,12 @@ class XyoBoundWitnessWrapper<T extends XyoBoundWitness> extends XyoHasher<T> {
   get scrubbedFields() {
     return pick(this.bw, scrubbedFields)
   }
+}
 
-  private _validator?: XyoBoundWitnessValidator
-  get validator() {
-    this._validator = this._validator ?? new XyoBoundWitnessValidator(this.bw)
-    return this._validator
-  }
-
+export class XyoBoundWitnessWithMetaWrapper<T extends XyoBoundWitnessWithMeta> extends XyoBoundWitnessWrapper<T> {
   private _userAgent?: UAParser
   get userAgent() {
     this._userAgent = this._userAgent ?? new UAParser(this.bw._user_agent)
     return this._userAgent
   }
 }
-
-export { XyoBoundWitnessWrapper }

package/src/BoundWitness/models/Base/XyoBoundWitnessBase.ts

@@ -0,0 +1,10 @@
+import { XyoPayload } from '../../../models'
+
+export type XyoBoundWitnessBase = XyoPayload<{
+  addresses: string[]
+  previous_hash?: string
+  payload_hashes: string[]
+  payload_schemas: string[]
+  previous_hashes: (string | null)[]
+  schema: string
+}>

package/src/BoundWitness/models/{Body/XyoBoundWitnessBodySchema.ts → Base/XyoBoundWitnessBaseSchema.ts}

@@ -1,6 +1,6 @@
 //Should type as JSONSchemaType<XyoBoundWitnessBody> once ajv/eslint issue is fixed
 //https://github.com/microsoft/TypeScript/issues/44851
-const XyoBoundWitnessBodySchema = {
+export const XyoBoundWitnessBaseSchema = {
   $id: 'https://schemas.xyo.network/2.0/boundwitness/body',
   additionalProperties: false,
   properties: {
@@ -13,5 +13,3 @@ const XyoBoundWitnessBodySchema = {
   required: ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes', 'schema'],
   type: 'object',
 }
-
-export { XyoBoundWitnessBodySchema }

package/src/BoundWitness/models/Base/index.ts

@@ -0,0 +1,2 @@
+export * from './XyoBoundWitnessBase'
+export * from './XyoBoundWitnessBaseSchema'

package/src/BoundWitness/models/Meta/XyoBoundWitnessMeta.ts

@@ -1,15 +1,12 @@
-import { XyoPayloadBody } from '../../../Payload'
+import { XyoPayload, XyoPayloadMeta } from '../../../models'
+import { XyoBoundWitness } from '../XyoBoundWitness'
 
-interface XyoBoundWitnessMeta {
-  [key: string]: unknown
-  _client?: string
-  _hash?: string
-  _archive?: string
-  _payloads?: XyoPayloadBody[]
+export type XyoBoundWitnessMeta = XyoPayloadMeta<{
+  _payloads?: XyoPayload[]
   _signatures?: string[]
-  _timestamp?: number
   _source_ip?: string
   _user_agent?: string
-}
+}>
 
-export type { XyoBoundWitnessMeta }
+export type XyoBoundWitnessWithMeta<T = unknown> = T & XyoBoundWitnessMeta & XyoBoundWitness
+export type XyoBoundWitnessWithPartialMeta<T = unknown> = T & Partial<XyoBoundWitnessMeta> & XyoBoundWitness

package/src/BoundWitness/models/WithXyoBoundWitnessMeta.ts

@@ -1,6 +1,6 @@
-import { XyoBoundWitnessBody } from './Body'
 import { XyoBoundWitnessMeta } from './Meta'
+import { XyoBoundWitness } from './XyoBoundWitness'
 
-type WithXyoBoundWitnessMeta<T extends XyoBoundWitnessBody> = T & XyoBoundWitnessMeta
+type WithXyoBoundWitnessMeta<T extends XyoBoundWitness> = T & XyoBoundWitnessMeta
 
 export type { WithXyoBoundWitnessMeta }

package/src/BoundWitness/models/XyoBoundWitness.ts

@@ -1,7 +1,3 @@
-import { XyoPayload } from '../../Payload'
-import { XyoBoundWitnessBody } from './Body'
-import { WithXyoBoundWitnessMeta } from './WithXyoBoundWitnessMeta'
+import { XyoBoundWitnessBase } from './Base'
 
-type XyoBoundWitness = WithXyoBoundWitnessMeta<XyoBoundWitnessBody & XyoPayload>
-
-export type { XyoBoundWitness }
+export type XyoBoundWitness<T extends object = XyoBoundWitnessBase> = T & XyoBoundWitnessBase

package/src/BoundWitness/models/index.ts

@@ -1,4 +1,4 @@
-export * from './Body'
+export * from './Base'
 export * from './Meta'
 export * from './WithXyoBoundWitnessMeta'
 export * from './XyoBoundWitness'

package/src/Hasher/XyoHasher.ts

@@ -1,13 +1,36 @@
-import { XyoAbstractHasher } from './XyoAbstractHasher'
+import shajs from 'sha.js'
 
-export class XyoHasher<T extends Record<string, unknown>> extends XyoAbstractHasher<T> {
-  private readonly memoryObj: T
-  constructor(obj: T) {
-    super()
-    this.memoryObj = obj
+import { StringKeyObject, XyoObject } from '../lib'
+import { removeEmptyFields } from './removeEmptyFields'
+import { deepOmitUnderscoreFields } from './removeFields'
+import { sortFields } from './sortFields'
+
+export class XyoHasher<T extends object = StringKeyObject> extends XyoObject<T> {
+  get hashFields() {
+    return removeEmptyFields(deepOmitUnderscoreFields(this.stringKeyObj))
+  }
+
+  /** @deprecated use stringified instead */
+  public sortedStringify() {
+    return this.stringified
+  }
+
+  public get stringified() {
+    const sortedEntry = sortFields(this.hashFields)
+    return JSON.stringify(sortedEntry)
+  }
+
+  /** @deprecated use hash instead */
+  public sortedHash() {
+    return this.hash
+  }
+
+  public get hash() {
+    return this.sortedHashData().toString('hex')
   }
 
-  protected get obj() {
-    return this.memoryObj
+  private sortedHashData() {
+    const stringObject = this.stringified
+    return shajs('sha256').update(stringObject).digest()
   }
 }

package/src/Hasher/index.ts

@@ -1,5 +1,4 @@
 export * from './removeEmptyFields'
 export * from './removeFields'
 export * from './sortFields'
-export * from './XyoAbstractHasher'
 export * from './XyoHasher'

package/src/Hasher/removeFields.ts

@@ -1,26 +1,34 @@
 // eslint-disable-next-line no-restricted-imports
 import { ValueKeyIteratee } from 'lodash'
-import assign from 'lodash/assign'
 import isObject from 'lodash/isObject'
 import mapValues from 'lodash/mapValues'
+import merge from 'lodash/merge'
 import omitBy from 'lodash/omitBy'
 import pickBy from 'lodash/pickBy'
 
-export const deepBy = <T>(obj: T, predicate: ValueKeyIteratee<T>, func: typeof omitBy | typeof pickBy) => {
+export const deepBy = <T extends object>(obj: T, predicate: ValueKeyIteratee<T>, func: typeof omitBy | typeof pickBy): T => {
   if (Array.isArray(obj)) {
     return obj
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const onlyObjects = pickBy<T>(obj as any, isObject)
-  const processedObjects = mapValues<T>(onlyObjects, (obj: T) => deepBy(obj, predicate, func))
-  const addBackValues = assign(processedObjects, omitBy(obj, isObject))
-  return omitBy(addBackValues, predicate) as T
+
+  //pick the child objects
+  const onlyObjects = pickBy<T>(obj, isObject)
+
+  //pick the child non-objects
+  const nonObjects = pickBy<T>(obj, (value) => !isObject(value))
+
+  const pickedObjects = omitBy(onlyObjects, predicate)
+  const pickedNonObjects = omitBy(nonObjects, predicate)
+
+  const processedObjects = mapValues(pickedObjects, (obj: T) => deepBy(obj, predicate, func))
+
+  return merge(pickedNonObjects, processedObjects) as T
 }
 
-export const deepOmitUnderscoreFields = <T>(obj: T) => {
+export const deepOmitUnderscoreFields = <T extends object>(obj: T) => {
   return deepBy(obj, (_, key) => key.startsWith('_'), omitBy)
 }
 
-export const deepPickUnderscoreFields = <T>(obj: T) => {
+export const deepPickUnderscoreFields = <T extends object>(obj: T) => {
   return deepBy(obj, (_, key) => key.startsWith('_'), pickBy)
 }

package/src/Hasher/sortFields.ts

@@ -1,4 +1,4 @@
-import { typeOf } from '../lib'
+import { StringKeyObject, typeOf } from '../lib'
 
 //if an object, subsort
 const subSort = (value: unknown) => {
@@ -10,15 +10,18 @@ const subSort = (value: unknown) => {
   }
 }
 
-export const sortFields = <T extends Record<string, unknown>>(obj: T) => {
+export const sortFields = <T extends object = object>(obj: T) => {
   if (obj === null) {
     return null
   }
-  const result: Record<string, unknown> = {} as Record<string, unknown>
-  Object.keys(obj)
+
+  const stringyObj = obj as StringKeyObject
+
+  const result: StringKeyObject = {}
+  Object.keys(stringyObj)
     .sort()
     .forEach((key) => {
-      result[key] = subSort(obj[key])
+      result[key] = subSort(stringyObj[key])
     })
   return result as T
 }

package/src/Huri/Huri.spec.ts

@@ -1,6 +1,6 @@
 import { delay } from '@xylabs/sdk-js'
 
-import { XyoPayload } from '../Payload'
+import { XyoPayload } from '../models'
 import { Huri } from './Huri'
 
 const hash = 'fb3606d71dcdd49a0aacc9d234e412684d577803c8a9ed9399a9d3776cc88e24'

package/src/Huri/Huri.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import axios from 'axios'
 
-import { XyoPayload } from '../Payload'
+import { XyoPayload } from '../models'
 import { XyoAddressValue, XyoDataLike } from '../Wallet'
 
 export type XyoObjectCategory = 'block' | 'payload'

package/src/Payload/Builder/Builder.ts

@@ -1,11 +1,12 @@
 import { deepOmitUnderscoreFields, removeEmptyFields, XyoHasher } from '../../Hasher'
-import { XyoPayload } from '../models'
+import { StringKeyObject } from '../../lib'
+import { XyoPayload } from '../../models'
 
 export interface XyoPayloadBuilderOptions {
   schema: string
 }
 
-export class XyoPayloadBuilder<T extends XyoPayload> {
+export class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<StringKeyObject>> {
   private _fields: Partial<T> = {}
   private _previousHash?: string
   private _schema: string

package/src/Payload/Validator/BodyValidator.spec.ts

@@ -4,7 +4,7 @@ import { XyoPayloadBodyValidator } from './BodyValidator'
 
 test('all', () => {
   const validator = new XyoPayloadBodyValidator(testPayload)
-  const errors = validator.all()
+  const errors = validator.validate()
   dumpErrors(errors)
   expect(errors.length).toBe(0)
 })