@prosopo/datasets 0.1.9 → 0.1.10

package/.eslintrc.js

@@ -1,24 +1,36 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
+    env: {
+        browser: true,
+        es2021: true,
     },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
+    extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+    },
+    plugins: ['unused-imports', '@typescript-eslint', 'prettier'],
+    rules: {
+        'no-unused-vars': 'off',
+        'unused-imports/no-unused-imports': 'error',
+        'unused-imports/no-unused-vars': [
+            'warn',
+            {
+                vars: 'all',
+                varsIgnorePattern: '^_',
+                args: 'after-used',
+                argsIgnorePattern: '^_',
+            },
+        ],
+        //"indent": ["error", 4],
+        //"indent": "off",
+        'sort-imports': [
+            'error',
+            {
+                ignoreDeclarationSort: true,
+                allowSeparatedGroups: false,
+            },
+        ],
+        'prettier/prettier': ['error'],
     },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "indent": ["error", 4],
-        "no-empty": "warn",
-        "@typescript-eslint/ban-ts-comment": "warn",
-        "@typescript-eslint/no-empty-function": "warn"
-    }
 }

package/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    trailingComma: 'es5',
+    tabWidth: 4,
+    semi: false,
+    singleQuote: true,
+    printWidth: 120,
+}

package/dist/js/captcha/captcha.d.ts

@@ -1,4 +1,4 @@
-import { AssetsResolver, Captcha, CaptchaSolution, CaptchaWithoutId, DatasetRaw, HashedSolution, Item, RawSolution } from '../types/index';
+import { AssetsResolver, Captcha, CaptchaSolution, CaptchaWithoutId, DatasetRaw, HashedItem, HashedSolution, Item, RawSolution } from '../types/index';
 /**
  * Parse a dataset
  * @return {JSON} captcha dataset, stored in JSON
@@ -8,9 +8,12 @@ export declare function parseCaptchaDataset(datasetJSON: JSON): DatasetRaw;
 /**
  * Make sure captcha solutions are in the correct format
  * @param {JSON} captchaJSON captcha solutions received from the api
- * @return {CaptchaSolution[]} an array of parsed captcha solutions
+ * @return {CaptchaSolution[]} an array of parsed and sorted captcha solutions
  */
-export declare function parseCaptchaSolutions(captchaJSON: JSON): CaptchaSolution[];
+export declare function parseAndSortCaptchaSolutions(captchaJSON: JSON): CaptchaSolution[];
+export declare function captchaSort<T extends {
+    captchaId: string;
+}>(a: T, b: T): number;
 export declare function sortAndComputeHashes(received: CaptchaSolution[], stored: Captcha[]): {
     captchaId: string;
     hash: string;
@@ -31,20 +34,20 @@ export declare function compareCaptchaSolutions(received: CaptchaSolution[], sto
  * @return {string} the hex string hash
  */
 export declare function computeCaptchaHash(captcha: CaptchaWithoutId, includeSolution: boolean | undefined, includeSalt: boolean | undefined, sortItemHashes: boolean): string;
-export declare function calculateItemHashes(items: Item[]): Item[];
-export declare function matchItemsToSolutions(solutions: RawSolution[] | undefined, items: Item[] | undefined): HashedSolution[];
+export declare function computeItemHash(item: Item): Promise<HashedItem>;
+/**
+ * Converts an indexed captcha solution to a hashed captcha solution or simply returns the hash if it is already hashed
+ * @return {HashedSolution[]}
+ * @param {RawSolution[] | HashedSolution[]} solutions
+ * @param {Item[]} items
+ */
+export declare function matchItemsToSolutions(solutions: RawSolution[] | HashedSolution[], items: Item[] | undefined): HashedSolution[];
 /**
  * Create a unique solution commitment
  * @param  {CaptchaSolution} captcha
  * @return {string} the hex string hash
  */
 export declare function computeCaptchaSolutionHash(captcha: CaptchaSolution): string;
-/**
- * Map a Captcha to a Captcha solution (drop items, target, etc.)
- * @param  {Captcha} captcha
- * @return {CaptchaSolution}
- */
-export declare function convertCaptchaToCaptchaSolution(captcha: Captcha): CaptchaSolution;
 /**
  * Compute hash for an array of captcha ids, userAccount, and salt, which serves as the identifier for a pending request
  * @param  {string[]} captchaIds

package/dist/js/captcha/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,cAAc,EACd,OAAO,EACP,eAAe,EAEf,gBAAgB,EAChB,UAAU,EAEV,cAAc,EACd,IAAI,EACJ,WAAW,EACd,MAAM,gBAAgB,CAAC;AAQxB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,IAAI,GAAG,eAAe,EAAE,CAM1E;AAMD,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,eAAe,EAAE,EAC3B,MAAM,EAAE,OAAO,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAqBvC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAO/F;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,eAAe,qBAAQ,EAAE,WAAW,qBAAO,EAAE,cAAc,EAAE,OAAO,GAAG,MAAM,CAc1I;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAUzD;AAED,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,WAAW,EAAE,GAAG,SAAS,EACpC,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,GAC1B,cAAc,EAAE,CAUlB;AAeD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,UAElE;AAqBD;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,CAEjF;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,SAAS;;;;;EAExF"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,cAAc,EACd,OAAO,EACP,eAAe,EAEf,gBAAgB,EAChB,UAAU,EAEV,UAAU,EACV,cAAc,EACd,IAAI,EACJ,WAAW,EACd,MAAM,gBAAgB,CAAA;AAOvB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,IAAI,GAAG,eAAe,EAAE,CAQjF;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAEtE;AAED,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,eAAe,EAAE,EAC3B,MAAM,EAAE,OAAO,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAwBvC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAO/F;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,eAAe,qBAAQ,EACvB,WAAW,qBAAQ,EACnB,cAAc,EAAE,OAAO,GACxB,MAAM,CAkBR;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAQrE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,WAAW,EAAE,GAAG,cAAc,EAAE,EAC3C,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,GAC1B,cAAc,EAAE,CAgBlB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,UAElE;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,SAAS;;;;;EAExF"}

package/dist/js/captcha/captcha.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCaptchaAssets = exports.computePendingRequestHash = exports.convertCaptchaToCaptchaSolution = exports.computeCaptchaSolutionHash = exports.matchItemsToSolutions = exports.calculateItemHashes = exports.computeCaptchaHash = exports.compareCaptchaSolutions = exports.sortAndComputeHashes = exports.parseCaptchaSolutions = exports.parseCaptchaDataset = void 0;
+exports.parseCaptchaAssets = exports.computePendingRequestHash = exports.computeCaptchaSolutionHash = exports.matchItemsToSolutions = exports.computeItemHash = exports.computeCaptchaHash = exports.compareCaptchaSolutions = exports.sortAndComputeHashes = exports.captchaSort = exports.parseAndSortCaptchaSolutions = exports.parseCaptchaDataset = void 0;
+const tslib_1 = require("tslib");
 // Copyright (C) 2021-2022 Prosopo (UK) Ltd.
 // This file is part of provider <https://github.com/prosopo/provider>.
 //
@@ -18,7 +19,8 @@ exports.parseCaptchaAssets = exports.computePendingRequestHash = exports.convert
 // along with provider.  If not, see <http://www.gnu.org/licenses/>.
 const index_1 = require("../types/index");
 const util_1 = require("./util");
-const contract_1 = require("@prosopo/contract");
+const error_1 = require("../types/error");
+const util_2 = require("@polkadot/util");
 // import {encodeAddress} from "@polkadot/util-crypto";
 /**
  * Parse a dataset
@@ -30,33 +32,36 @@ function parseCaptchaDataset(datasetJSON) {
         return index_1.DatasetSchema.parse(datasetJSON);
     }
     catch (err) {
-        throw new contract_1.ProsopoEnvError(err, "ERRORS.DATASET.PARSE_ERROR");
+        throw new error_1.ProsopoEnvError(err, 'ERRORS.DATASET.PARSE_ERROR');
     }
 }
 exports.parseCaptchaDataset = parseCaptchaDataset;
 /**
  * Make sure captcha solutions are in the correct format
  * @param {JSON} captchaJSON captcha solutions received from the api
- * @return {CaptchaSolution[]} an array of parsed captcha solutions
+ * @return {CaptchaSolution[]} an array of parsed and sorted captcha solutions
  */
-function parseCaptchaSolutions(captchaJSON) {
+function parseAndSortCaptchaSolutions(captchaJSON) {
     try {
-        return index_1.CaptchaSolutionSchema.parse(captchaJSON);
+        const parsed = index_1.CaptchaSolutionArraySchema.parse(captchaJSON);
+        parsed.map((captcha) => (Object.assign(Object.assign({}, captcha), { solution: captcha.solution.sort() })));
+        return parsed;
     }
     catch (err) {
-        throw new contract_1.ProsopoEnvError(err, "ERRORS.CAPTCHA.PARSE_ERROR");
+        throw new error_1.ProsopoEnvError(err, 'ERRORS.CAPTCHA.PARSE_ERROR');
     }
 }
-exports.parseCaptchaSolutions = parseCaptchaSolutions;
+exports.parseAndSortCaptchaSolutions = parseAndSortCaptchaSolutions;
 function captchaSort(a, b) {
     return a.captchaId.localeCompare(b.captchaId);
 }
+exports.captchaSort = captchaSort;
 function sortAndComputeHashes(received, stored) {
     received.sort(captchaSort);
     stored.sort(captchaSort);
-    return stored.map(({ salt, items = [], target = "", captchaId, solved }, index) => {
+    return stored.map(({ salt, items = [], target = '', captchaId, solved }, index) => {
         if (captchaId != received[index].captchaId) {
-            throw new contract_1.ProsopoEnvError("CAPTCHA.ID_MISMATCH");
+            throw new error_1.ProsopoEnvError('CAPTCHA.ID_MISMATCH');
         }
         return {
             hash: computeCaptchaHash({
@@ -94,85 +99,68 @@ exports.compareCaptchaSolutions = compareCaptchaSolutions;
  */
 function computeCaptchaHash(captcha, includeSolution = false, includeSalt = false, sortItemHashes) {
     try {
-        const itemHashes = captcha.items.map((item, index) => item.hash ? item.hash : calculateItemHashes([item])[0].hash);
-        return (0, util_1.hexHash)([
+        const itemHashes = captcha.items.map((item, index) => {
+            if (item.hash) {
+                return item.hash;
+            }
+            else {
+                throw new error_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH', computeCaptchaHash.name, undefined, index);
+            }
+        });
+        return (0, util_1.hexHashArray)([
             captcha.target,
             ...(includeSolution && captcha.solution ? captcha.solution.sort() : []),
             includeSalt ? captcha.salt : '',
             sortItemHashes ? itemHashes.sort() : itemHashes,
-        ].join());
+        ]);
     }
     catch (err) {
-        throw new contract_1.ProsopoEnvError(err);
+        throw new error_1.ProsopoEnvError(err);
     }
 }
 exports.computeCaptchaHash = computeCaptchaHash;
-function calculateItemHashes(items) {
-    return items.map((item) => {
-        if (item.type === "image" || item.type === "text") {
-            return Object.assign(Object.assign({}, item), { hash: (0, util_1.hexHash)((item.data)) });
+function computeItemHash(item) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (item.type === 'text') {
+            return Object.assign(Object.assign({}, item), { hash: (0, util_1.hexHash)(item.data) });
+        }
+        else if (item.type === 'image') {
+            return Object.assign(Object.assign({}, item), { hash: (0, util_1.hexHash)(yield (0, util_1.downloadImage)(item.data)) });
         }
         else {
-            throw new contract_1.ProsopoEnvError("CAPTCHA.INVALID_ITEM_FORMAT");
+            throw new error_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_FORMAT');
         }
     });
 }
-exports.calculateItemHashes = calculateItemHashes;
+exports.computeItemHash = computeItemHash;
+/**
+ * Converts an indexed captcha solution to a hashed captcha solution or simply returns the hash if it is already hashed
+ * @return {HashedSolution[]}
+ * @param {RawSolution[] | HashedSolution[]} solutions
+ * @param {Item[]} items
+ */
 function matchItemsToSolutions(solutions, items) {
-    return (solutions === null || solutions === void 0 ? void 0 : solutions.map((solution) => {
-        const hash = items === null || items === void 0 ? void 0 : items[solution].hash;
+    return ((solutions === null || solutions === void 0 ? void 0 : solutions.map((solution) => {
+        const hash = items && items[solution] && items[solution].hash ? items[solution].hash : solution;
         if (!hash) {
-            throw new contract_1.ProsopoEnvError("CAPTCHA.MISSING_ITEM_HASH");
+            throw new error_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH');
+        }
+        if (!(0, util_2.isHex)(hash)) {
+            throw new error_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_HASH');
         }
         return hash;
-    })) || [];
+    })) || []);
 }
 exports.matchItemsToSolutions = matchItemsToSolutions;
-// export function hashSolutions<T>(solutions: T[]): T[] {
-//     try {
-//         return solutions?.map(({ solution, ...rest }: any) => ({
-//             ...rest,
-//             solution: hashSolutionRaw(solution),
-//         }));
-//     } catch (err) {
-//         console.error(err);
-//         // @ts-ignore
-//         return arg0;
-//     }
-// }
 /**
  * Create a unique solution commitment
  * @param  {CaptchaSolution} captcha
  * @return {string} the hex string hash
  */
 function computeCaptchaSolutionHash(captcha) {
-    return (0, util_1.hexHash)([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt].join());
+    return (0, util_1.hexHashArray)([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt]);
 }
 exports.computeCaptchaSolutionHash = computeCaptchaSolutionHash;
-// /**
-//  * Compute hashes for an array of captchas
-//  * @param  {Captcha[]} captchas
-//  * @return {Promise<CaptchaSolution[]>} captchasWithHashes
-//  */
-// export async function computeCaptchaHashes(captchas: CaptchaWithoutId[]): Promise<CaptchaSolution[]> {
-//     const captchasWithHashes: CaptchaSolution[] = [];
-//     for (const captcha of captchas) {
-//         const captchaId = await computeCaptchaHash(captcha);
-//         const captchaWithId: Captcha = {captchaId, ...captcha};
-//         const captchaSol = convertCaptchaToCaptchaSolution(captchaWithId);
-//         captchasWithHashes.push(captchaSol);
-//     }
-//     return captchasWithHashes;
-// }
-/**
- * Map a Captcha to a Captcha solution (drop items, target, etc.)
- * @param  {Captcha} captcha
- * @return {CaptchaSolution}
- */
-function convertCaptchaToCaptchaSolution(captcha) {
-    return { captchaId: captcha.captchaId, captchaContentId: captcha.captchaContentId, salt: captcha.salt, solution: captcha.solution || [] };
-}
-exports.convertCaptchaToCaptchaSolution = convertCaptchaToCaptchaSolution;
 /**
  * Compute hash for an array of captcha ids, userAccount, and salt, which serves as the identifier for a pending request
  * @param  {string[]} captchaIds
@@ -181,7 +169,7 @@ exports.convertCaptchaToCaptchaSolution = convertCaptchaToCaptchaSolution;
  * @return {string}
  */
 function computePendingRequestHash(captchaIds, userAccount, salt) {
-    return (0, util_1.hexHash)([...captchaIds.sort(), userAccount, salt].join());
+    return (0, util_1.hexHashArray)([...captchaIds.sort(), userAccount, salt]);
 }
 exports.computePendingRequestHash = computePendingRequestHash;
 /**

package/dist/js/captcha/captcha.js.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"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"}

package/dist/js/captcha/dataset.d.ts

@@ -1,5 +1,5 @@
-import { Dataset, DatasetRaw } from "../types/dataset";
-import { CaptchaMerkleTree } from "./merkle";
+import { Dataset, DatasetRaw } from '../types/dataset';
+import { CaptchaMerkleTree } from './merkle';
 export declare function buildDataset(datasetRaw: DatasetRaw): Promise<Dataset>;
 export declare function buildCaptchaTree(dataset: Dataset, includeSolution: boolean, includeSalt: boolean, sortItemHashes: boolean): Promise<CaptchaMerkleTree>;
 export declare function addItemHashesAndSolutionHashesToDataset(datasetRaw: DatasetRaw): Promise<Dataset>;

package/dist/js/captcha/dataset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,UAAU,EACb,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAA;AAG1C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAY3E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAS5J;AAED,wBAAsB,uCAAuC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAatG"}
+{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAGtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAG5C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3E;AAED,wBAAsB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,OAAO,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,uCAAuC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBtG"}

package/dist/js/captcha/dataset.js

@@ -4,11 +4,18 @@ exports.addItemHashesAndSolutionHashesToDataset = exports.buildCaptchaTree = exp
 const tslib_1 = require("tslib");
 const captcha_1 = require("./captcha");
 const merkle_1 = require("./merkle");
-const contract_1 = require("@prosopo/contract");
+const error_1 = require("../types/error");
 function buildDataset(datasetRaw) {
     var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const dataset = yield addItemHashesAndSolutionHashesToDataset(datasetRaw);
+        // console.log(dataset.captchas[0])
+        // dataset.captchas.map((captcha: CaptchaWithoutId) => {
+        //     if (captcha.target === 'car') {
+        //         console.log(captcha)
+        //     }
+        // })
+        // process.exit(0)
         const contentTree = yield buildCaptchaTree(dataset, false, false, true);
         const solutionTree = yield buildCaptchaTree(dataset, true, true, false);
         dataset.captchas = dataset.captchas.map((captcha, index) => (Object.assign(Object.assign({}, captcha), { captchaId: solutionTree.leaves[index].hash, captchaContentId: contentTree.leaves[index].hash })));
@@ -24,22 +31,23 @@ function buildCaptchaTree(dataset, includeSolution, includeSalt, sortItemHashes)
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             const tree = new merkle_1.CaptchaMerkleTree();
-            const captchaHashes = dataset.captchas.map((captcha) => (0, captcha_1.computeCaptchaHash)(captcha, includeSolution, includeSalt, sortItemHashes));
+            const datasetWithItemHashes = Object.assign({}, dataset);
+            const captchaHashes = datasetWithItemHashes.captchas.map((captcha) => (0, captcha_1.computeCaptchaHash)(captcha, includeSolution, includeSalt, sortItemHashes));
             tree.build(captchaHashes);
             return tree;
         }
         catch (err) {
-            throw new contract_1.ProsopoEnvError("DATASET.HASH_ERROR");
+            throw new error_1.ProsopoEnvError('DATASET.HASH_ERROR');
         }
     });
 }
 exports.buildCaptchaTree = buildCaptchaTree;
 function addItemHashesAndSolutionHashesToDataset(datasetRaw) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return Object.assign(Object.assign({}, datasetRaw), { captchas: datasetRaw.captchas.map((captcha) => {
-                const items = (0, captcha_1.calculateItemHashes)(captcha.items);
-                return Object.assign(Object.assign({}, captcha), { items, solution: (0, captcha_1.matchItemsToSolutions)(captcha.solution, items) });
-            }) });
+        return Object.assign(Object.assign({}, datasetRaw), { captchas: yield Promise.all(datasetRaw.captchas.map((captcha) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const items = yield Promise.all(captcha.items.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield (0, captcha_1.computeItemHash)(item); })));
+                return Object.assign(Object.assign(Object.assign({}, captcha), { items }), (captcha.solution !== undefined && { solution: (0, captcha_1.matchItemsToSolutions)(captcha.solution, items) }));
+            }))) });
     });
 }
 exports.addItemHashesAndSolutionHashesToDataset = addItemHashesAndSolutionHashesToDataset;

package/dist/js/captcha/dataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":";;;;AAOA,uCAIkB;AAClB,qCAA0C;AAC1C,gDAAiD;AAEjD,SAAsB,YAAY,CAAC,UAAsB;;;QACrD,MAAM,OAAO,GAAG,MAAM,uCAAuC,CAAC,UAAU,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACxE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CACxD,gCAAI,OAAO,KAAE,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,GAC5G,CAAA,CAAC,CAAC;QACH,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;QAC3C,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC;QACzC,OAAO,CAAC,SAAS,GAAG,MAAA,YAAY,CAAC,IAAI,0CAAE,IAAI,CAAC;QAC5C,OAAO,CAAC,gBAAgB,GAAG,MAAA,WAAW,CAAC,IAAI,0CAAE,IAAI,CAAC;QAClD,OAAO,OAAO,CAAA;;CACjB;AAZD,oCAYC;AAED,SAAsB,gBAAgB,CAAC,OAAgB,EAAE,eAAwB,EAAE,WAAoB,EAAE,cAAuB;;QAC5H,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,0BAAiB,EAAE,CAAC;YACrC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,4BAAkB,EAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;YACnI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,0BAAe,CAAC,oBAAoB,CAAC,CAAC;SACnD;IACL,CAAC;CAAA;AATD,4CASC;AAED,SAAsB,uCAAuC,CAAC,UAAsB;;QAChF,OAAO,gCACA,UAAU,KACb,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC1C,MAAM,KAAK,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAEjD,uCACO,OAAO,KACV,KAAK,EACL,QAAQ,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAC1D;YACN,CAAC,CAAC,GACM,CAAA;IAChB,CAAC;CAAA;AAbD,0FAaC"}
+{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":";;;;AAEA,uCAAsF;AACtF,qCAA4C;AAC5C,0CAAgD;AAEhD,SAAsB,YAAY,CAAC,UAAsB;;;QACrD,MAAM,OAAO,GAAG,MAAM,uCAAuC,CAAC,UAAU,CAAC,CAAA;QACzE,mCAAmC;QACnC,wDAAwD;QACxD,sCAAsC;QACtC,+BAA+B;QAC/B,QAAQ;QACR,KAAK;QACL,kBAAkB;QAClB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACvE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACvE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CACnC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CACf,CAAC,gCACM,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAC1C,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,GACvC,CAAA,CACpB,CAAA;QACD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAA;QAC1C,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAA;QACxC,OAAO,CAAC,SAAS,GAAG,MAAA,YAAY,CAAC,IAAI,0CAAE,IAAI,CAAA;QAC3C,OAAO,CAAC,gBAAgB,GAAG,MAAA,WAAW,CAAC,IAAI,0CAAE,IAAI,CAAA;QACjD,OAAO,OAAO,CAAA;;CACjB;AAxBD,oCAwBC;AAED,SAAsB,gBAAgB,CAClC,OAAgB,EAChB,eAAwB,EACxB,WAAoB,EACpB,cAAuB;;QAEvB,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,0BAAiB,EAAE,CAAA;YACpC,MAAM,qBAAqB,qBAAQ,OAAO,CAAE,CAAA;YAC5C,MAAM,aAAa,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACjE,IAAA,4BAAkB,EAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAC5E,CAAA;YACD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YACzB,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,uBAAe,CAAC,oBAAoB,CAAC,CAAA;SAClD;IACL,CAAC;CAAA;AAjBD,4CAiBC;AAED,SAAsB,uCAAuC,CAAC,UAAsB;;QAChF,OAAO,gCACA,UAAU,KACb,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CACvB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE,wDAAC,OAAA,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAA,GAAA,CAAC,CAAC,CAAA;gBAE/F,qDACO,OAAO,KACV,KAAK,KAEF,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,EACtG;YACL,CAAC,CAAA,CAAC,CACL,GACO,CAAA;IAChB,CAAC;CAAA;AAhBD,0FAgBC"}

package/dist/js/captcha/merkle.d.ts

@@ -1,4 +1,4 @@
-import { MerkleNodeInterface } from '../types/merkle';
+import { MerkleLayer, MerkleLeaf, MerkleNodeInterface, MerkleProof } from '../types/merkle';
 declare class MerkleNode implements MerkleNodeInterface {
     hash: string;
     parent: string | null;
@@ -6,14 +6,14 @@ declare class MerkleNode implements MerkleNodeInterface {
 }
 export declare class CaptchaMerkleTree {
     leaves: MerkleNode[];
-    layers: string[][];
+    layers: MerkleLayer[];
     root: MerkleNode | undefined;
     constructor();
     build(leaves: string[]): void;
-    buildMerkleTree(leaves: any): any;
+    buildMerkleTree(leaves: MerkleNode[]): any;
     createParent(leftChild: any, rightChild: any): MerkleNode;
-    proof(leafHash: string): string[][];
+    proof(leafHash: MerkleLeaf): MerkleProof;
 }
-export declare function verifyProof(leaf: string, proof: string[][]): boolean;
+export declare function verifyProof(leaf: MerkleLeaf, proof: MerkleProof): boolean;
 export {};
 //# sourceMappingURL=merkle.d.ts.map

package/dist/js/captcha/merkle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merkle.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErD,cAAM,UAAW,YAAW,mBAAmB;IAC3C,IAAI,EAAE,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;gBAET,IAAI,KAAA;CAIpB;AAED,qBAAa,iBAAiB;IAC1B,MAAM,EAAE,UAAU,EAAE,CAAA;IAEpB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAA;IAElB,IAAI,EAAE,UAAU,GAAG,SAAS,CAAA;;IAO5B,KAAK,CAAE,MAAM,EAAE,MAAM,EAAE;IAevB,eAAe,CAAE,MAAM,KAAA;IAyBvB,YAAY,CAAE,SAAS,KAAA,EAAE,UAAU,KAAA,GAAG,UAAU;IAOhD,KAAK,CAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE;CAyBvC;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAkBpE"}
+{"version":3,"file":"merkle.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAA;AAE7G,cAAM,UAAW,YAAW,mBAAmB;IAC3C,IAAI,EAAE,MAAM,CAAA;IAEZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBAET,IAAI,KAAA;CAInB;AAED,qBAAa,iBAAiB;IAC1B,MAAM,EAAE,UAAU,EAAE,CAAA;IAEpB,MAAM,EAAE,WAAW,EAAE,CAAA;IAErB,IAAI,EAAE,UAAU,GAAG,SAAS,CAAA;;IAO5B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAetB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE;IAyBpC,YAAY,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA,GAAG,UAAU;IAO/C,KAAK,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW;CA0B3C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAkBzE"}

package/dist/js/captcha/merkle.js

@@ -53,7 +53,7 @@ class CaptchaMerkleTree {
         const newLayer = [];
         while (leafIndex < numLeaves) {
             const leftChild = leaves[leafIndex];
-            const rightChild = (leafIndex + 1 < numLeaves) ? leaves[leafIndex + 1] : leftChild;
+            const rightChild = leafIndex + 1 < numLeaves ? leaves[leafIndex + 1] : leftChild;
             const parentNode = this.createParent(leftChild, rightChild);
             newLayer.push(parentNode.hash);
             parents.push(parentNode);
@@ -63,7 +63,7 @@ class CaptchaMerkleTree {
         return this.buildMerkleTree(parents);
     }
     createParent(leftChild, rightChild) {
-        const parent = new MerkleNode((0, util_1.hexHash)([leftChild.hash, rightChild.hash].join()));
+        const parent = new MerkleNode((0, util_1.hexHashArray)([leftChild.hash, rightChild.hash]));
         leftChild.parent = parent;
         rightChild.parent = parent;
         return parent;
@@ -71,27 +71,29 @@ class CaptchaMerkleTree {
     proof(leafHash) {
         const proofTree = [];
         let layerNum = 0;
-        while (layerNum < this.layers.length) {
+        while (layerNum < this.layers.length - 1) {
             const leafIndex = this.layers[layerNum].indexOf(leafHash);
             // if layer 0 leaf index is 3, it should be partnered with 2: [L0,L1],[L2,L3],[L3,L4],...
             // layer one pairs looks like [L0L1, L2L3], [L3L4, L5L6],...etc
-            const partnerIndex = (leafIndex % 2 && leafIndex > 0) ? leafIndex - 1 : leafIndex + 1;
+            let partnerIndex = leafIndex % 2 && leafIndex > 0 ? leafIndex - 1 : leafIndex + 1;
+            // if there are an odd number of leaves in the layer, the last leaf is duplicated
+            if (partnerIndex > this.layers[layerNum].length - 1) {
+                partnerIndex = leafIndex;
+            }
             const pair = [leafHash];
             const layer = this.layers[layerNum];
-            if (partnerIndex < layer.length) {
-                // determine whether the leaf sits on the left or the right of its partner
-                if (partnerIndex > leafIndex) {
-                    pair.push(layer[partnerIndex]);
-                }
-                else {
-                    pair.unshift(layer[partnerIndex]);
-                }
+            // determine whether the leaf sits on the left or the right of its partner
+            if (partnerIndex > leafIndex) {
+                pair.push(layer[partnerIndex]);
+            }
+            else {
+                pair.unshift(layer[partnerIndex]);
             }
-            proofTree.push(pair);
+            proofTree.push([pair[0], pair[1]]);
             layerNum += 1;
-            leafHash = (0, util_1.hexHash)(pair.join());
+            leafHash = (0, util_1.hexHashArray)(pair);
         }
-        return proofTree;
+        return [...proofTree, [this.layers[this.layers.length - 1][0]]];
     }
 }
 exports.CaptchaMerkleTree = CaptchaMerkleTree;
@@ -101,7 +103,7 @@ function verifyProof(leaf, proof) {
             return false;
         }
         for (const [layerIndex, layer] of proof.entries()) {
-            leaf = (0, util_1.hexHash)(layer.join());
+            leaf = (0, util_1.hexHashArray)(layer);
             if (proof[layerIndex + 1].indexOf(leaf) === -1) {
                 return false;
             }

package/dist/js/captcha/merkle.js.map

@@ -1 +1 @@
-{"version":3,"file":"merkle.js","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merkle.js","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"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"}

package/dist/js/captcha/util.d.ts

@@ -1,3 +1,7 @@
 export declare const HEX_HASH_BIT_LENGTH = 256;
+export declare const ARRAY_JOINER = "";
 export declare function hexHash(data: string | Uint8Array, bitLength?: 256 | 512 | 64 | 128 | 384 | undefined): string;
+export declare function hexHashArray<T>(arr: T[]): string;
+export declare function arrayJoin<T>(arr: T[], joiner?: string): string;
+export declare function downloadImage(url: string): Promise<Uint8Array>;
 //# sourceMappingURL=util.d.ts.map

package/dist/js/captcha/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,wBAAgB,OAAO,CAAE,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,SAAS,GAAI,MAAM,CAG/G"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,mBAAmB,MAAM,CAAA;AACtC,eAAO,MAAM,YAAY,KAAK,CAAA;AAE9B,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,SAAS,GAAG,MAAM,CAG7G;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,CAEhD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAQpE"}

package/dist/js/captcha/util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hexHash = exports.HEX_HASH_BIT_LENGTH = void 0;
+exports.downloadImage = exports.arrayJoin = exports.hexHashArray = exports.hexHash = exports.ARRAY_JOINER = exports.HEX_HASH_BIT_LENGTH = void 0;
+const tslib_1 = require("tslib");
 // Copyright (C) 2021-2022 Prosopo (UK) Ltd.
 // This file is part of provider <https://github.com/prosopo/provider>.
 //
@@ -17,10 +18,32 @@ exports.hexHash = exports.HEX_HASH_BIT_LENGTH = void 0;
 // You should have received a copy of the GNU General Public License
 // along with provider.  If not, see <http://www.gnu.org/licenses/>.
 const util_crypto_1 = require("@polkadot/util-crypto");
+const axios_1 = tslib_1.__importDefault(require("axios"));
+const index_1 = require("../types/index");
 exports.HEX_HASH_BIT_LENGTH = 256;
+exports.ARRAY_JOINER = '';
 function hexHash(data, bitLength) {
     // default bit length is 256
     return (0, util_crypto_1.blake2AsHex)(data, bitLength);
 }
 exports.hexHash = hexHash;
+function hexHashArray(arr) {
+    return hexHash(arrayJoin(arr));
+}
+exports.hexHashArray = hexHashArray;
+function arrayJoin(arr, joiner) {
+    return arr.join(joiner ? joiner : exports.ARRAY_JOINER);
+}
+exports.arrayJoin = arrayJoin;
+function downloadImage(url) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            return new Uint8Array((yield axios_1.default.get(url, { url, method: 'GET', responseType: 'arraybuffer' })).data);
+        }
+        catch (error) {
+            throw new index_1.ProsopoEnvError(error, downloadImage.name);
+        }
+    });
+}
+exports.downloadImage = downloadImage;
 //# sourceMappingURL=util.js.map

package/dist/js/captcha/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,uDAAoD;AAEvC,QAAA,mBAAmB,GAAG,GAAG,CAAC;AAEvC,SAAgB,OAAO,CAAE,IAAyB,EAAE,SAAkD;IAClG,4BAA4B;IAC5B,OAAO,IAAA,yBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AACvC,CAAC;AAHD,0BAGC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,uDAAmD;AACnD,0DAA0B;AAC1B,0CAAgD;AAEnC,QAAA,mBAAmB,GAAG,GAAG,CAAA;AACzB,QAAA,YAAY,GAAG,EAAE,CAAA;AAE9B,SAAgB,OAAO,CAAC,IAAyB,EAAE,SAAkD;IACjG,4BAA4B;IAC5B,OAAO,IAAA,yBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AACvC,CAAC;AAHD,0BAGC;AAED,SAAgB,YAAY,CAAI,GAAQ;IACpC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAClC,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CAAI,GAAQ,EAAE,MAAe;IAClD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAY,CAAC,CAAA;AACnD,CAAC;AAFD,8BAEC;AAED,SAAsB,aAAa,CAAC,GAAW;;QAC3C,IAAI;YACA,OAAO,IAAI,UAAU,CACjB,CAAC,MAAM,eAAM,CAAC,GAAG,CAAc,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CACjG,CAAA;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,uBAAe,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAA;SACvD;IACL,CAAC;CAAA;AARD,sCAQC"}