@xyo-network/boundwitness-validator 2.108.0 → 2.109.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/Validator.d.cts +1 -1
- package/dist/browser/Validator.d.cts.map +1 -1
- package/dist/browser/Validator.d.mts +1 -1
- package/dist/browser/Validator.d.mts.map +1 -1
- package/dist/browser/Validator.d.ts +1 -1
- package/dist/browser/Validator.d.ts.map +1 -1
- package/dist/browser/index.cjs +3 -3
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +4 -4
- package/dist/browser/index.js.map +1 -1
- package/dist/neutral/Validator.d.cts +1 -1
- package/dist/neutral/Validator.d.cts.map +1 -1
- package/dist/neutral/Validator.d.mts +1 -1
- package/dist/neutral/Validator.d.mts.map +1 -1
- package/dist/neutral/Validator.d.ts +1 -1
- package/dist/neutral/Validator.d.ts.map +1 -1
- package/dist/neutral/index.cjs +3 -3
- package/dist/neutral/index.cjs.map +1 -1
- package/dist/neutral/index.js +4 -4
- package/dist/neutral/index.js.map +1 -1
- package/dist/node/Validator.d.cts +1 -1
- package/dist/node/Validator.d.cts.map +1 -1
- package/dist/node/Validator.d.mts +1 -1
- package/dist/node/Validator.d.mts.map +1 -1
- package/dist/node/Validator.d.ts +1 -1
- package/dist/node/Validator.d.ts.map +1 -1
- package/dist/node/index.cjs +3 -3
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +4 -4
- package/dist/node/index.js.map +1 -1
- package/package.json +7 -7
- package/src/Validator.ts +4 -4
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -45,15 +45,15 @@ var BoundWitnessValidator = class _BoundWitnessValidator extends import_payload_
|
|
|
45
45
|
get expectedSchema() {
|
|
46
46
|
return import_boundwitness_model.BoundWitnessSchema;
|
|
47
47
|
}
|
|
48
|
-
static validateSignature(hash, address, signature) {
|
|
48
|
+
static async validateSignature(hash, address, signature) {
|
|
49
49
|
if (!signature) {
|
|
50
50
|
return [
|
|
51
51
|
new Error(`Missing signature [${address}]`)
|
|
52
52
|
];
|
|
53
53
|
}
|
|
54
|
-
if (!
|
|
54
|
+
if (!await import_account.Elliptic.verify(hash, signature, address)) {
|
|
55
55
|
return [
|
|
56
|
-
new Error(`Invalid signature [${address}]
|
|
56
|
+
new Error(`Invalid signature [${address}]`)
|
|
57
57
|
];
|
|
58
58
|
}
|
|
59
59
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -5,7 +5,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
5
5
|
import { toUint8Array } from "@xylabs/arraybuffer";
|
|
6
6
|
import { uniq } from "@xylabs/lodash";
|
|
7
7
|
import { validateType } from "@xylabs/typeof";
|
|
8
|
-
import {
|
|
8
|
+
import { Elliptic } from "@xyo-network/account";
|
|
9
9
|
import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
|
|
10
10
|
import { PayloadBuilder } from "@xyo-network/payload";
|
|
11
11
|
import { PayloadValidator } from "@xyo-network/payload-validator";
|
|
@@ -21,15 +21,15 @@ var BoundWitnessValidator = class _BoundWitnessValidator extends PayloadValidato
|
|
|
21
21
|
get expectedSchema() {
|
|
22
22
|
return BoundWitnessSchema;
|
|
23
23
|
}
|
|
24
|
-
static validateSignature(hash, address, signature) {
|
|
24
|
+
static async validateSignature(hash, address, signature) {
|
|
25
25
|
if (!signature) {
|
|
26
26
|
return [
|
|
27
27
|
new Error(`Missing signature [${address}]`)
|
|
28
28
|
];
|
|
29
29
|
}
|
|
30
|
-
if (!
|
|
30
|
+
if (!await Elliptic.verify(hash, signature, address)) {
|
|
31
31
|
return [
|
|
32
|
-
new Error(`Invalid signature [${address}]
|
|
32
|
+
new Error(`Invalid signature [${address}]`)
|
|
33
33
|
];
|
|
34
34
|
}
|
|
35
35
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["toUint8Array","uniq","validateType","Elliptic","BoundWitnessSchema","PayloadBuilder","PayloadValidator","validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
package/dist/neutral/index.cjs
CHANGED
|
@@ -45,15 +45,15 @@ var BoundWitnessValidator = class _BoundWitnessValidator extends import_payload_
|
|
|
45
45
|
get expectedSchema() {
|
|
46
46
|
return import_boundwitness_model.BoundWitnessSchema;
|
|
47
47
|
}
|
|
48
|
-
static validateSignature(hash, address, signature) {
|
|
48
|
+
static async validateSignature(hash, address, signature) {
|
|
49
49
|
if (!signature) {
|
|
50
50
|
return [
|
|
51
51
|
new Error(`Missing signature [${address}]`)
|
|
52
52
|
];
|
|
53
53
|
}
|
|
54
|
-
if (!
|
|
54
|
+
if (!await import_account.Elliptic.verify(hash, signature, address)) {
|
|
55
55
|
return [
|
|
56
|
-
new Error(`Invalid signature [${address}]
|
|
56
|
+
new Error(`Invalid signature [${address}]`)
|
|
57
57
|
];
|
|
58
58
|
}
|
|
59
59
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
package/dist/neutral/index.js
CHANGED
|
@@ -5,7 +5,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
5
5
|
import { toUint8Array } from "@xylabs/arraybuffer";
|
|
6
6
|
import { uniq } from "@xylabs/lodash";
|
|
7
7
|
import { validateType } from "@xylabs/typeof";
|
|
8
|
-
import {
|
|
8
|
+
import { Elliptic } from "@xyo-network/account";
|
|
9
9
|
import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
|
|
10
10
|
import { PayloadBuilder } from "@xyo-network/payload";
|
|
11
11
|
import { PayloadValidator } from "@xyo-network/payload-validator";
|
|
@@ -21,15 +21,15 @@ var BoundWitnessValidator = class _BoundWitnessValidator extends PayloadValidato
|
|
|
21
21
|
get expectedSchema() {
|
|
22
22
|
return BoundWitnessSchema;
|
|
23
23
|
}
|
|
24
|
-
static validateSignature(hash, address, signature) {
|
|
24
|
+
static async validateSignature(hash, address, signature) {
|
|
25
25
|
if (!signature) {
|
|
26
26
|
return [
|
|
27
27
|
new Error(`Missing signature [${address}]`)
|
|
28
28
|
];
|
|
29
29
|
}
|
|
30
|
-
if (!
|
|
30
|
+
if (!await Elliptic.verify(hash, signature, address)) {
|
|
31
31
|
return [
|
|
32
|
-
new Error(`Invalid signature [${address}]
|
|
32
|
+
new Error(`Invalid signature [${address}]`)
|
|
33
33
|
];
|
|
34
34
|
}
|
|
35
35
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["toUint8Array","uniq","validateType","Elliptic","BoundWitnessSchema","PayloadBuilder","PayloadValidator","validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
package/dist/node/Validator.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export declare class BoundWitnessValidator<T extends BoundWitness<{
|
|
|
4
4
|
schema: string;
|
|
5
5
|
}> = BoundWitness> extends PayloadValidator<T> {
|
|
6
6
|
protected get expectedSchema(): string;
|
|
7
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[]
|
|
7
|
+
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]>;
|
|
8
8
|
addresses(): Error[];
|
|
9
9
|
addressesUniqueness(): Error[];
|
|
10
10
|
previousHashes(): Error[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;
|
|
1
|
+
{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAMjE,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACvH,SAAS,KAAK,cAAc,IAAI,MAAM,CAErC;WAEY,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUlH,SAAS,IAAI,KAAK,EAAE;IAQpB,mBAAmB,IAAI,KAAK,EAAE;IAQ9B,cAAc;IAKd,MAAM,IAAI,KAAK,EAAE;IAQjB,OAAO,IAAI,KAAK,EAAE;IAgBZ,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBrB,QAAQ;IAYvB,oBAAoB,IAAI,KAAK,EAAE;IAM/B,2BAA2B,IAAI,KAAK,EAAE;IAMtC,OAAO,CAAC,mBAAmB;CAY5B"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -42,15 +42,15 @@ var _BoundWitnessValidator = class _BoundWitnessValidator extends import_payload
|
|
|
42
42
|
get expectedSchema() {
|
|
43
43
|
return import_boundwitness_model.BoundWitnessSchema;
|
|
44
44
|
}
|
|
45
|
-
static validateSignature(hash, address, signature) {
|
|
45
|
+
static async validateSignature(hash, address, signature) {
|
|
46
46
|
if (!signature) {
|
|
47
47
|
return [
|
|
48
48
|
new Error(`Missing signature [${address}]`)
|
|
49
49
|
];
|
|
50
50
|
}
|
|
51
|
-
if (!
|
|
51
|
+
if (!await import_account.Elliptic.verify(hash, signature, address)) {
|
|
52
52
|
return [
|
|
53
|
-
new Error(`Invalid signature [${address}]
|
|
53
|
+
new Error(`Invalid signature [${address}]`)
|
|
54
54
|
];
|
|
55
55
|
}
|
|
56
56
|
return [];
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/Validator.ts"],"sourcesContent":["export * from './Validator'\n","import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","_a","_b","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
package/dist/node/index.js
CHANGED
|
@@ -5,7 +5,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
5
5
|
import { toUint8Array } from "@xylabs/arraybuffer";
|
|
6
6
|
import { uniq } from "@xylabs/lodash";
|
|
7
7
|
import { validateType } from "@xylabs/typeof";
|
|
8
|
-
import {
|
|
8
|
+
import { Elliptic } from "@xyo-network/account";
|
|
9
9
|
import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
|
|
10
10
|
import { PayloadBuilder } from "@xyo-network/payload";
|
|
11
11
|
import { PayloadValidator } from "@xyo-network/payload-validator";
|
|
@@ -18,15 +18,15 @@ var _BoundWitnessValidator = class _BoundWitnessValidator extends PayloadValidat
|
|
|
18
18
|
get expectedSchema() {
|
|
19
19
|
return BoundWitnessSchema;
|
|
20
20
|
}
|
|
21
|
-
static validateSignature(hash, address, signature) {
|
|
21
|
+
static async validateSignature(hash, address, signature) {
|
|
22
22
|
if (!signature) {
|
|
23
23
|
return [
|
|
24
24
|
new Error(`Missing signature [${address}]`)
|
|
25
25
|
];
|
|
26
26
|
}
|
|
27
|
-
if (!
|
|
27
|
+
if (!await Elliptic.verify(hash, signature, address)) {
|
|
28
28
|
return [
|
|
29
|
-
new Error(`Invalid signature [${address}]
|
|
29
|
+
new Error(`Invalid signature [${address}]`)
|
|
30
30
|
];
|
|
31
31
|
}
|
|
32
32
|
return [];
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/Validator.ts"],"sourcesContent":["import { toUint8Array } from '@xylabs/arraybuffer'\nimport { uniq } from '@xylabs/lodash'\nimport { validateType } from '@xylabs/typeof'\nimport { Elliptic } from '@xyo-network/account'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { PayloadValidator } from '@xyo-network/payload-validator'\n\nconst validateArraysSameLength = (a: unknown[], b: unknown[], message = 'Array length mismatch') => {\n return a.length == b.length ? [] : [new Error(`${message} []`)]\n}\n\nexport class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> = BoundWitness> extends PayloadValidator<T> {\n protected get expectedSchema(): string {\n return BoundWitnessSchema\n }\n\n static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {\n if (!signature) {\n return [new Error(`Missing signature [${address}]`)]\n }\n if (!(await Elliptic.verify(hash, signature, address))) {\n return [new Error(`Invalid signature [${address}]`)]\n }\n return []\n }\n\n addresses(): Error[] {\n const errors: Error[] = []\n //const { addresses } = this.obj\n //if (!addresses?.length) errors.push(new Error('addresses missing [at least one address required]'))\n errors.push(...this.addressesUniqueness())\n return errors\n }\n\n addressesUniqueness(): Error[] {\n const errors: Error[] = []\n const { addresses } = this.obj\n const uniqAddresses = uniq(addresses)\n if (addresses?.length !== uniqAddresses?.length) errors.push(new Error('addresses must be unique'))\n return errors\n }\n\n previousHashes() {\n const errors: Error[] = []\n return errors\n }\n\n schema(): Error[] {\n const errors: Error[] = []\n if (this.obj.schema !== this.expectedSchema) {\n errors.push(new Error(`invalid schema [${this.expectedSchema} !== ${this.obj.schema}]`))\n }\n return errors\n }\n\n schemas(): Error[] {\n const errors: Error[] = []\n const Schemas = this.obj.payload_schemas\n if (Schemas) {\n const schemaValidators = Schemas.map((schema: string) => {\n return PayloadValidator.schemaNameValidatorFactory?.(schema)\n })\n for (const validator of schemaValidators) {\n if (validator) {\n errors.push(...validator.all())\n }\n }\n }\n return errors\n }\n\n async signatures(): Promise<Error[]> {\n return [\n ...validateArraysSameLength(this.obj.$meta?.signatures ?? [], this.obj.addresses ?? [], 'Length mismatch: address/signature'),\n ...(\n await Promise.all(\n this.obj.addresses?.map<Promise<Error[]>>(async (address, index) =>\n BoundWitnessValidator.validateSignature(\n toUint8Array(await PayloadBuilder.dataHash(this.payload)),\n toUint8Array(address),\n toUint8Array(this.obj.$meta?.signatures?.[index]),\n ),\n ) ?? [],\n )\n ).flat(),\n ]\n }\n\n override async validate() {\n return [\n ...(await this.signatures()),\n ...this.addresses(),\n ...this.validateArrayLengths(),\n ...this.schemas(),\n ...this.previousHashes(),\n ...this.schema(),\n ...(await super.validate()),\n ]\n }\n\n validateArrayLengths(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validatePayloadHashesLength())\n return errors\n }\n\n validatePayloadHashesLength(): Error[] {\n const errors: Error[] = []\n errors.push(...this.validateArrayLength('payload_hashes', 'payload_schemas'))\n return errors\n }\n\n private validateArrayLength(fieldName: string, compareArrayName: string): Error[] {\n const errors: Error[] = []\n\n const [array, arrayErrors] = validateType('array', this.stringKeyObj[fieldName] as [], true)\n const [compareArray, compareArrayErrors] = validateType('array', this.stringKeyObj[compareArrayName] as [], true)\n\n if (array?.length !== compareArray?.length) {\n errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array?.length} !== ${compareArray?.length}]`))\n }\n\n return [...arrayErrors, ...compareArrayErrors, ...errors]\n }\n}\n"],"mappings":"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","names":["toUint8Array","uniq","validateType","Elliptic","BoundWitnessSchema","PayloadBuilder","PayloadValidator","validateArraysSameLength","a","b","message","length","Error","BoundWitnessValidator","PayloadValidator","expectedSchema","BoundWitnessSchema","validateSignature","hash","address","signature","Elliptic","verify","addresses","errors","push","addressesUniqueness","obj","uniqAddresses","uniq","previousHashes","schema","schemas","Schemas","payload_schemas","schemaValidators","map","schemaNameValidatorFactory","validator","all","signatures","$meta","Promise","index","_a","_b","toUint8Array","PayloadBuilder","dataHash","payload","flat","validate","validateArrayLengths","validatePayloadHashesLength","validateArrayLength","fieldName","compareArrayName","array","arrayErrors","validateType","stringKeyObj","compareArray","compareArrayErrors"]}
|
package/package.json
CHANGED
|
@@ -13,17 +13,17 @@
|
|
|
13
13
|
"@xylabs/arraybuffer": "^3.5.2",
|
|
14
14
|
"@xylabs/lodash": "^3.5.2",
|
|
15
15
|
"@xylabs/typeof": "^3.5.2",
|
|
16
|
-
"@xyo-network/account": "^2.
|
|
17
|
-
"@xyo-network/boundwitness-model": "^2.
|
|
18
|
-
"@xyo-network/payload": "^2.
|
|
19
|
-
"@xyo-network/payload-validator": "^2.
|
|
16
|
+
"@xyo-network/account": "^2.109.0",
|
|
17
|
+
"@xyo-network/boundwitness-model": "^2.109.0",
|
|
18
|
+
"@xyo-network/payload": "^2.109.0",
|
|
19
|
+
"@xyo-network/payload-validator": "^2.109.0"
|
|
20
20
|
},
|
|
21
21
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
22
22
|
"devDependencies": {
|
|
23
23
|
"@xylabs/ts-scripts-yarn3": "^3.11.12",
|
|
24
24
|
"@xylabs/tsconfig": "^3.11.12",
|
|
25
|
-
"@xyo-network/boundwitness-builder": "^2.
|
|
26
|
-
"@xyo-network/schema-name-validator": "^2.
|
|
25
|
+
"@xyo-network/boundwitness-builder": "^2.109.0",
|
|
26
|
+
"@xyo-network/schema-name-validator": "^2.109.0",
|
|
27
27
|
"typescript": "^5.5.3"
|
|
28
28
|
},
|
|
29
29
|
"exports": {
|
|
@@ -64,6 +64,6 @@
|
|
|
64
64
|
},
|
|
65
65
|
"sideEffects": false,
|
|
66
66
|
"types": "dist/node/index.d.ts",
|
|
67
|
-
"version": "2.
|
|
67
|
+
"version": "2.109.0",
|
|
68
68
|
"type": "module"
|
|
69
69
|
}
|
package/src/Validator.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { toUint8Array } from '@xylabs/arraybuffer'
|
|
2
2
|
import { uniq } from '@xylabs/lodash'
|
|
3
3
|
import { validateType } from '@xylabs/typeof'
|
|
4
|
-
import {
|
|
4
|
+
import { Elliptic } from '@xyo-network/account'
|
|
5
5
|
import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'
|
|
6
6
|
import { PayloadBuilder } from '@xyo-network/payload'
|
|
7
7
|
import { PayloadValidator } from '@xyo-network/payload-validator'
|
|
@@ -15,12 +15,12 @@ export class BoundWitnessValidator<T extends BoundWitness<{ schema: string }> =
|
|
|
15
15
|
return BoundWitnessSchema
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
static validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Error[] {
|
|
18
|
+
static async validateSignature(hash: ArrayBuffer, address: ArrayBuffer, signature?: ArrayBuffer): Promise<Error[]> {
|
|
19
19
|
if (!signature) {
|
|
20
20
|
return [new Error(`Missing signature [${address}]`)]
|
|
21
21
|
}
|
|
22
|
-
if (!
|
|
23
|
-
return [new Error(`Invalid signature [${address}]
|
|
22
|
+
if (!(await Elliptic.verify(hash, signature, address))) {
|
|
23
|
+
return [new Error(`Invalid signature [${address}]`)]
|
|
24
24
|
}
|
|
25
25
|
return []
|
|
26
26
|
}
|