@xyo-network/boundwitness 2.24.0 → 2.24.3

package/dist/esm/Validator/Validator.d.ts

@@ -6,8 +6,10 @@ declare class XyoBoundWitnessValidator<T extends XyoBoundWitnessWithPartialMeta
     body: XyoBoundWitnessBodyValidator;
     meta: XyoBoundWitnessMetaValidator;
     constructor(bw: T);
+    get hash(): string;
     signatures(): Error[];
     validate(): Error[];
+    static validateSignature(hash: string, address: string, signature?: string): Error[];
 }
 export { XyoBoundWitnessValidator };
 //# sourceMappingURL=Validator.d.ts.map

package/dist/esm/Validator/Validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAC1D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAgB9D,cAAM,wBAAwB,CAAC,CAAC,SAAS,8BAA8B,GAAG,8BAA8B,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC5H,IAAI,EAAE,4BAA4B,CAAA;IAClC,IAAI,EAAE,4BAA4B,CAAA;gBAC7B,EAAE,EAAE,CAAC;IAMV,UAAU;IAWV,QAAQ;CAMhB;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAA"}
+{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAA;AAC1D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAM9D,cAAM,wBAAwB,CAAC,CAAC,SAAS,8BAA8B,GAAG,8BAA8B,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC5H,IAAI,EAAE,4BAA4B,CAAA;IAClC,IAAI,EAAE,4BAA4B,CAAA;gBAC7B,EAAE,EAAE,CAAC;IAMjB,IAAW,IAAI,WAEd;IAEM,UAAU;IAUV,QAAQ;IAIf,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAS3E;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAA"}

package/dist/esm/Validator/Validator.js

@@ -1,20 +1,10 @@
-import { assertEx } from '@xylabs/sdk-js';
 import { XyoAddressValue } from '@xyo-network/account';
-import { XyoValidatorBase } from '@xyo-network/core';
+import { XyoHasher, XyoValidatorBase } from '@xyo-network/core';
 import { XyoBoundWitnessBodyValidator } from './BodyValidator';
 import { XyoBoundWitnessMetaValidator } from './MetaValidator';
 const validateArraysSameLength = (a, b, message = 'Array length mismatch') => {
     return a.length != b.length ? [Error(`${message} []`)] : [];
 };
-const validateSignature = (hash, address, signature) => {
-    if (!signature) {
-        return [Error(`Missing signature [${address}]`)];
-    }
-    if (!new XyoAddressValue(address).verify(hash, signature)) {
-        return [Error(`Invalid signature [${address}] [${signature}]`)];
-    }
-    return [];
-};
 class XyoBoundWitnessValidator extends XyoValidatorBase {
     body;
     meta;
@@ -23,21 +13,29 @@ class XyoBoundWitnessValidator extends XyoValidatorBase {
         this.body = new XyoBoundWitnessBodyValidator(bw, bw._payloads);
         this.meta = new XyoBoundWitnessMetaValidator(bw);
     }
+    get hash() {
+        return new XyoHasher(this.obj).hash;
+    }
     signatures() {
-        const hash = assertEx(this.obj._hash, 'Missing _hash');
         return [
             ...validateArraysSameLength(this.obj._signatures ?? [], this.obj.addresses, 'Length mismatch: address/_signature'),
             ...this.obj.addresses.reduce((errors, address, index) => {
-                errors.push(...validateSignature(hash, address, this.obj._signatures?.[index]));
+                errors.push(...XyoBoundWitnessValidator.validateSignature(this.hash, address, this.obj._signatures?.[index]));
                 return errors;
             }, []),
         ];
     }
     validate() {
-        const errors = [];
-        errors.push(...this.meta.validate(), ...this.body.validate());
-        errors.push(...this.signatures());
-        return errors;
+        return [...this.body.validate(), ...this.signatures()];
+    }
+    static validateSignature(hash, address, signature) {
+        if (!signature) {
+            return [Error(`Missing signature [${address}]`)];
+        }
+        if (!new XyoAddressValue(address).verify(hash, signature)) {
+            return [Error(`Invalid signature [${address}] [${signature}]`)];
+        }
+        return [];
     }
 }
 export { XyoBoundWitnessValidator };

package/dist/esm/Validator/Validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAGpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAE9D,MAAM,wBAAwB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,OAAO,GAAG,uBAAuB,EAAE,EAAE;IACjG,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC9E,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,CAAC,CAAC,CAAA;KACjD;IACD,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;QACzD,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,MAAM,SAAS,GAAG,CAAC,CAAC,CAAA;KAChE;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,wBAAoG,SAAQ,gBAAmB;IAC5H,IAAI,CAA8B;IAClC,IAAI,CAA8B;IACzC,YAAY,EAAK;QACf,KAAK,CAAC,EAAE,CAAC,CAAA;QACT,IAAI,CAAC,IAAI,GAAG,IAAI,4BAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACtD,OAAO;YACL,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,qCAAqC,CAAC;YAClH,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAU,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC/D,MAAM,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC/E,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC;SACP,CAAA;IACH,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7D,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAA"}
+{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAG/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAA;AAE9D,MAAM,wBAAwB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,OAAO,GAAG,uBAAuB,EAAE,EAAE;IACjG,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,wBAAoG,SAAQ,gBAAmB;IAC5H,IAAI,CAA8B;IAClC,IAAI,CAA8B;IACzC,YAAY,EAAK;QACf,KAAK,CAAC,EAAE,CAAC,CAAA;QACT,IAAI,CAAC,IAAI,GAAG,IAAI,4BAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;IACrC,CAAC;IAEM,UAAU;QACf,OAAO;YACL,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,qCAAqC,CAAC;YAClH,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAU,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC/D,MAAM,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC7G,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC;SACP,CAAA;IACH,CAAC;IAEM,QAAQ;QACb,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAY,EAAE,OAAe,EAAE,SAAkB;QACxE,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,CAAC,CAAC,CAAA;SACjD;QACD,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;YACzD,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,MAAM,SAAS,GAAG,CAAC,CAAC,CAAA;SAChE;QACD,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAA"}

package/package.json

@@ -12,10 +12,10 @@
   "dependencies": {
     "@xylabs/buffer": "^2.6.3",
     "@xylabs/sdk-js": "^2.6.3",
-    "@xyo-network/account": "^2.24.0",
-    "@xyo-network/core": "^2.24.0",
-    "@xyo-network/payload": "^2.24.0",
-    "@xyo-network/typeof": "^2.24.0",
+    "@xyo-network/account": "^2.24.3",
+    "@xyo-network/core": "^2.24.3",
+    "@xyo-network/payload": "^2.24.3",
+    "@xyo-network/typeof": "^2.24.3",
     "lodash": "^4.17.21",
     "ua-parser-js": "^1.0.2"
   },
@@ -58,6 +58,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.24.0",
+  "version": "2.24.3",
   "packageManager": "yarn@3.1.1"
 }

package/src/Validator/Validator.ts

@@ -1,6 +1,5 @@
-import { assertEx } from '@xylabs/sdk-js'
 import { XyoAddressValue } from '@xyo-network/account'
-import { XyoValidatorBase } from '@xyo-network/core'
+import { XyoHasher, XyoValidatorBase } from '@xyo-network/core'
 
 import { XyoBoundWitnessWithPartialMeta } from '../models'
 import { XyoBoundWitnessBodyValidator } from './BodyValidator'
@@ -10,16 +9,6 @@ const validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array l
   return a.length != b.length ? [Error(`${message} []`)] : []
 }
 
-const validateSignature = (hash: string, address: string, signature?: string) => {
-  if (!signature) {
-    return [Error(`Missing signature [${address}]`)]
-  }
-  if (!new XyoAddressValue(address).verify(hash, signature)) {
-    return [Error(`Invalid signature [${address}] [${signature}]`)]
-  }
-  return []
-}
-
 class XyoBoundWitnessValidator<T extends XyoBoundWitnessWithPartialMeta = XyoBoundWitnessWithPartialMeta> extends XyoValidatorBase<T> {
   public body: XyoBoundWitnessBodyValidator
   public meta: XyoBoundWitnessMetaValidator
@@ -29,22 +18,32 @@ class XyoBoundWitnessValidator<T extends XyoBoundWitnessWithPartialMeta = XyoBou
     this.meta = new XyoBoundWitnessMetaValidator(bw)
   }
 
+  public get hash() {
+    return new XyoHasher(this.obj).hash
+  }
+
   public signatures() {
-    const hash = assertEx(this.obj._hash, 'Missing _hash')
     return [
       ...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]))
+        errors.push(...XyoBoundWitnessValidator.validateSignature(this.hash, address, this.obj._signatures?.[index]))
         return errors
       }, []),
     ]
   }
 
   public validate() {
-    const errors: Error[] = []
-    errors.push(...this.meta.validate(), ...this.body.validate())
-    errors.push(...this.signatures())
-    return errors
+    return [...this.body.validate(), ...this.signatures()]
+  }
+
+  static validateSignature(hash: string, address: string, signature?: string) {
+    if (!signature) {
+      return [Error(`Missing signature [${address}]`)]
+    }
+    if (!new XyoAddressValue(address).verify(hash, signature)) {
+      return [Error(`Invalid signature [${address}] [${signature}]`)]
+    }
+    return []
   }
 }