@prosopo/account 1.0.1 → 2.0.0

package/dist/cjs/util/dist/util.cjs

@@ -1,161 +1,22 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const util = require("@polkadot/util");
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function* permutations(bins, options) {
-  if (options?.includeEmpty) {
-    yield [];
-  }
-  if (bins.length === 0) {
-    return;
-  }
-  const arr = Array.from({ length: bins.length }, () => 0);
-  let i = arr.length - 1;
-  while (true) {
-    yield [...arr];
-    arr[i]++;
-    while (arr[i] === bins[i]) {
-      arr[i] = 0;
-      i--;
-      if (i < 0) {
-        return;
-      }
-      arr[i]++;
-    }
-    i = arr.length - 1;
-  }
-}
-function get(obj, key, required = true) {
-  const value = obj[key];
-  if (required && value === void 0) {
-    throw new Error(`Object has no property '${String(key)}': ${JSON.stringify(obj, null, 2)}`);
-  }
-  return value;
-}
-function at(items, index, options) {
-  if (items.length === 0) {
-    throw new Error("Array is empty");
-  }
-  if (!options?.noWrap) {
-    if (index > 0) {
-      index = index % items.length;
-    } else {
-      index = Math.ceil(Math.abs(index) / items.length) * items.length + index;
-    }
-  }
-  if (index >= items.length) {
-    throw new Error(`Index ${index} larger than array length ${items.length}`);
-  }
-  if (index < 0) {
-    throw new Error(`Index ${index} smaller than 0`);
-  }
-  return items[index];
-}
-function choice(items, n, random, options) {
-  if (n > items.length) {
-    throw new Error(`Cannot choose ${n} items from array of length ${items.length}`);
-  }
-  const result = [];
-  const indices = [];
-  for (let i = 0; i < n; i++) {
-    let index;
-    do {
-      index = Math.floor(Math.abs(random()) * items.length) % items.length;
-    } while (options?.withReplacement === false && indices.includes(index));
-    indices.push(index);
-    result.push(items[index]);
-  }
-  return result;
-}
 function getCurrentFileDirectory(url) {
   return new URL(url).pathname.split("/").slice(0, -1).join("/");
 }
-const flattenObj = (obj, prefix = "") => {
+const flatten = (obj, prefix = "") => {
   const flattenedObj = {};
   for (const [key, value] of Object.entries(obj)) {
     if (value instanceof Object) {
-      Object.assign(flattenedObj, flattenObj(value, prefix + "." + key));
+      Object.assign(flattenedObj, flatten(value, `${prefix + key}.`));
     } else {
-      flattenedObj[prefix + "." + key] = value;
+      flattenedObj[prefix + key] = value;
     }
   }
   return flattenedObj;
 };
 const kebabCase = (str) => str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? "-" : "") + $.toLowerCase());
-function merge(dest, src, options) {
-  const atomicArrays = options?.atomicArrays;
-  const queue = [
-    {
-      src,
-      dest
-    }
-  ];
-  while (queue.length > 0) {
-    const task = queue.pop();
-    if (task === void 0) {
-      throw new Error("queue is empty");
-    }
-    if (isArray(task.dest)) {
-      const src2 = task.src;
-      const dest2 = task.dest;
-      if (atomicArrays) {
-        while (dest2.length > src2.length) {
-          dest2.pop();
-        }
-        for (let i = 0; i < src2.length; i++) {
-          dest2[i] = src2[i];
-        }
-      } else {
-        for (let i = 0; i < src2.length; i++) {
-          if (isArray(dest2[i]) && isArray(src2[i]) || isObject(dest2[i]) && isObject(src2[i])) {
-            queue.push({
-              src: src2[i],
-              dest: dest2[i]
-            });
-          } else {
-            dest2[i] = src2[i];
-          }
-        }
-      }
-    } else if (isObject(task.dest)) {
-      const src2 = task.src;
-      const destAny = task.dest;
-      for (const [key, value] of Object.entries(src2)) {
-        if (isArray(value) && isArray(destAny[key]) || isObject(value) && isObject(destAny[key])) {
-          queue.push({
-            src: value,
-            dest: destAny[key]
-          });
-        } else {
-          destAny[key] = value;
-        }
-      }
-    } else {
-      throw new Error(`cannot handle type in queue: ${typeof task.dest}`);
-    }
-  }
-  return dest;
-}
-const isArray = (value) => {
-  return Array.isArray(value);
-};
-const isObject = (value) => {
-  return value instanceof Object && !isArray(value);
-};
-const hashToHex = (hash) => {
-  if (isArray(hash)) {
-    return util.u8aToHex(new Uint8Array(hash));
-  }
-  return hash.toString();
-};
-exports.at = at;
-exports.flattenObj = flattenObj;
-exports.get = get;
+exports.flatten = flatten;
 exports.getCurrentFileDirectory = getCurrentFileDirectory;
-exports.hashToHex = hashToHex;
-exports.isArray = isArray;
-exports.isObject = isObject;
 exports.kebabCase = kebabCase;
-exports.merge = merge;
-exports.permutations = permutations;
 exports.sleep = sleep;

package/dist/extension/Extension.d.ts

@@ -1,4 +1,4 @@
-import { Account, ProcaptchaClientConfigOutput } from '@prosopo/types';
+import type { Account, ProcaptchaClientConfigOutput } from "@prosopo/types";
 export declare abstract class Extension {
     abstract getAccount(config: ProcaptchaClientConfigOutput): Promise<Account>;
 }

package/dist/extension/Extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Extension.d.ts","sourceRoot":"","sources":["../../src/extension/Extension.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAKtE,8BAAsB,SAAS;aAOX,UAAU,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,OAAO,CAAC;CACrF"}
+{"version":3,"file":"Extension.d.ts","sourceRoot":"","sources":["../../src/extension/Extension.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAK5E,8BAAsB,SAAS;aAOd,UAAU,CACzB,MAAM,EAAE,4BAA4B,GAClC,OAAO,CAAC,OAAO,CAAC;CACnB"}

package/dist/extension/Extension.js.map

@@ -1 +1 @@
-{"version":3,"file":"Extension.js","sourceRoot":"","sources":["../../src/extension/Extension.ts"],"names":[],"mappings":"AAkBA,MAAM,OAAgB,SAAS;CAQ9B"}
+{"version":3,"file":"Extension.js","sourceRoot":"","sources":["../../src/extension/Extension.ts"],"names":[],"mappings":"AAkBA,MAAM,OAAgB,SAAS;CAU9B"}

package/dist/extension/ExtensionWeb2.d.ts

@@ -1,16 +1,15 @@
-import { Account, ProcaptchaClientConfigOutput } from '@prosopo/types';
-import { Extension } from './Extension.js';
+import type { Account, ProcaptchaClientConfigOutput } from "@prosopo/types";
+import { Extension } from "./Extension.js";
 export declare class ExtensionWeb2 extends Extension {
     getAccount(config: ProcaptchaClientConfigOutput): Promise<Account>;
     private createExtension;
     private createAccount;
-    private getFingerprint;
     getNetwork: (config: ProcaptchaClientConfigOutput) => {
-        endpoint: string[];
         contract: {
-            address: string;
             name: string;
+            address: string;
         };
+        endpoint: string[];
         pairType: "ed25519" | "sr25519" | "ecdsa" | "ethereum";
         ss58Format: number;
     };

package/dist/extension/ExtensionWeb2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb2.d.ts","sourceRoot":"","sources":["../../src/extension/ExtensionWeb2.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAEtE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAsB1C,qBAAa,aAAc,SAAQ,SAAS;IAC3B,UAAU,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,OAAO,CAAC;YAajE,eAAe;YAiCf,aAAa;YAgCb,cAAc;IAW5B,UAAU,WAAY,4BAA4B;;;;;;;;MAQjD;CACJ"}
+{"version":3,"file":"ExtensionWeb2.d.ts","sourceRoot":"","sources":["../../src/extension/ExtensionWeb2.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAO3C,qBAAa,aAAc,SAAQ,SAAS;IAC9B,UAAU,CACtB,MAAM,EAAE,4BAA4B,GAClC,OAAO,CAAC,OAAO,CAAC;YAUL,eAAe;YAmCf,aAAa;IAwC3B,UAAU,WAAY,4BAA4B;;;;;;;;MAUhD;CACF"}

package/dist/extension/ExtensionWeb2.js

@@ -1,33 +1,31 @@
-import { ApiPromise } from '@polkadot/api/promise/Api';
-import { Extension } from './Extension.js';
-import { Keyring } from '@polkadot/keyring';
-import { ProsopoEnvError, hexHash } from '@prosopo/common';
-import { default as Signer } from '@polkadot/extension-base/page/Signer';
-import { WsProvider } from '@polkadot/rpc-provider/ws';
-import { decodeAddress, encodeAddress } from '@polkadot/util-crypto/address';
-import { entropyToMnemonic } from '@polkadot/util-crypto/mnemonic/bip39';
-import { hashComponents, load } from '@fingerprintjs/fingerprintjs';
-import { picassoCanvas } from '@prosopo/util';
-import { stringToU8a } from '@polkadot/util/string';
-import { u8aToHex } from '@polkadot/util/u8a';
-import { version } from '@prosopo/util';
+import { default as Signer } from "@polkadot/extension-base/page/Signer";
+import { Keyring } from "@polkadot/keyring";
+import { cryptoWaitReady } from "@polkadot/util-crypto";
+import { entropyToMnemonic } from "@polkadot/util-crypto/mnemonic/bip39";
+import { stringToU8a } from "@polkadot/util/string";
+import { u8aToHex } from "@polkadot/util/u8a";
+import { ProsopoEnvError, hexHash } from "@prosopo/common";
+import { getFingerprint } from "@prosopo/detector";
+import { picassoCanvas } from "@prosopo/util";
+import { version } from "@prosopo/util";
+import { Extension } from "./Extension.js";
 export class ExtensionWeb2 extends Extension {
     constructor() {
         super(...arguments);
         this.getNetwork = (config) => {
             const network = config.networks[config.defaultNetwork];
             if (!network) {
-                throw new ProsopoEnvError('DEVELOPER.NETWORK_NOT_FOUND', {
-                    context: { error: `No network found for environment ${config.defaultEnvironment}` },
+                throw new ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
+                    context: {
+                        error: `No network found for environment ${config.defaultEnvironment}`,
+                    },
                 });
             }
             return network;
         };
     }
     async getAccount(config) {
-        const network = this.getNetwork(config);
-        const wsProvider = new WsProvider(network.endpoint);
-        const account = await this.createAccount(wsProvider);
+        const account = await this.createAccount(config);
         const extension = await this.createExtension(account);
         return {
             account,
@@ -56,12 +54,13 @@ export class ExtensionWeb2 extends Extension {
                     };
                 },
             },
-            name: 'procaptcha-web2',
+            name: "procaptcha-web2",
             version,
             signer,
         };
     }
-    async createAccount(wsProvider) {
+    async createAccount(config) {
+        await cryptoWaitReady();
         const params = {
             area: { width: 300, height: 300 },
             offsetParameter: 2001000001,
@@ -71,31 +70,23 @@ export class ExtensionWeb2 extends Extension {
             numberOfRounds: 5,
             seed: 42,
         };
-        const browserEntropy = await this.getFingerprint();
+        const browserEntropy = await getFingerprint();
         const canvasEntropy = picassoCanvas(params.numberOfRounds, params.seed, params);
-        const entropy = hexHash([canvasEntropy, browserEntropy].join(''), 128).slice(2);
+        const entropy = hexHash([canvasEntropy, browserEntropy].join(""), 128).slice(2);
         const u8Entropy = stringToU8a(entropy);
         const mnemonic = entropyToMnemonic(u8Entropy);
-        const api = await ApiPromise.create({ provider: wsProvider, initWasm: false, noInitWarn: true });
-        const type = 'ed25519';
-        const keyring = new Keyring({ type, ss58Format: api.registry.chainSS58 });
+        const type = "sr25519";
+        const keyring = new Keyring({
+            type,
+            ss58Format: config.networks[config.defaultNetwork].ss58Format,
+        });
         const keypair = keyring.addFromMnemonic(mnemonic);
-        const address = keypair.address.length === 42
-            ? keypair.address
-            : encodeAddress(decodeAddress(keypair.address), api.registry.chainSS58);
+        const address = keypair.address;
         return {
             address,
-            type,
             name: address,
             keypair,
         };
     }
-    async getFingerprint() {
-        const fpPromise = load();
-        const fp = await fpPromise;
-        const result = await fp.get();
-        const { screenFrame, ...componentsReduced } = result.components;
-        return hashComponents(componentsReduced);
-    }
 }
 //# sourceMappingURL=ExtensionWeb2.js.map

package/dist/extension/ExtensionWeb2.js.map

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

package/dist/extension/ExtensionWeb3.d.ts

@@ -1,5 +1,5 @@
-import { Account, ProcaptchaClientConfigOutput } from '@prosopo/types';
-import { Extension } from './Extension.js';
+import type { Account, ProcaptchaClientConfigOutput } from "@prosopo/types";
+import { Extension } from "./Extension.js";
 export declare class ExtensionWeb3 extends Extension {
     getAccount(config: ProcaptchaClientConfigOutput): Promise<Account>;
 }

package/dist/extension/ExtensionWeb3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb3.d.ts","sourceRoot":"","sources":["../../src/extension/ExtensionWeb3.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAQ1C,qBAAa,aAAc,SAAQ,SAAS;IAC3B,UAAU,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BlF"}
+{"version":3,"file":"ExtensionWeb3.d.ts","sourceRoot":"","sources":["../../src/extension/ExtensionWeb3.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,qBAAa,aAAc,SAAQ,SAAS;IAC9B,UAAU,CACtB,MAAM,EAAE,4BAA4B,GAClC,OAAO,CAAC,OAAO,CAAC;CA4BnB"}

package/dist/extension/ExtensionWeb3.js

@@ -1,15 +1,17 @@
-import { Extension } from './Extension.js';
-import { ProsopoError } from '@prosopo/common';
-import { web3Enable } from '@polkadot/extension-dapp';
+import { web3Enable } from "@polkadot/extension-dapp";
+import { ProsopoError } from "@prosopo/common";
+import { Extension } from "./Extension.js";
 export class ExtensionWeb3 extends Extension {
     async getAccount(config) {
         const { dappName, userAccountAddress: address } = config;
         if (!address) {
-            throw new ProsopoError('WIDGET.NO_ACCOUNTS_FOUND', { context: { error: 'No account address provided' } });
+            throw new ProsopoError("WIDGET.NO_ACCOUNTS_FOUND", {
+                context: { error: "No account address provided" },
+            });
         }
         const extensions = await web3Enable(dappName);
         if (extensions.length === 0) {
-            throw new ProsopoError('WIDGET.NO_EXTENSION_FOUND');
+            throw new ProsopoError("WIDGET.NO_EXTENSION_FOUND");
         }
         for (const extension of extensions) {
             const accounts = await extension.accounts.get();
@@ -18,7 +20,7 @@ export class ExtensionWeb3 extends Extension {
                 return { account, extension };
             }
         }
-        throw new ProsopoError('WIDGET.ACCOUNT_NOT_FOUND', {
+        throw new ProsopoError("WIDGET.ACCOUNT_NOT_FOUND", {
             context: { error: `No account found matching ${address}` },
         });
     }

package/dist/extension/ExtensionWeb3.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb3.js","sourceRoot":"","sources":["../../src/extension/ExtensionWeb3.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAKrD,MAAM,OAAO,aAAc,SAAQ,SAAS;IACjC,KAAK,CAAC,UAAU,CAAC,MAAoC;QACxD,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;QAExD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,YAAY,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,6BAA6B,EAAE,EAAE,CAAC,CAAA;SAC5G;QAGD,MAAM,UAAU,GAAwB,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAA;QAClE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,MAAM,IAAI,YAAY,CAAC,2BAA2B,CAAC,CAAA;SACtD;QAGD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;YAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;YACvE,IAAI,OAAO,EAAE;gBACT,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;aAChC;SACJ;QAED,MAAM,IAAI,YAAY,CAAC,0BAA0B,EAAE;YAC/C,OAAO,EAAE,EAAE,KAAK,EAAE,6BAA6B,OAAO,EAAE,EAAE;SAC7D,CAAC,CAAA;IACN,CAAC;CACJ"}
+{"version":3,"file":"ExtensionWeb3.js","sourceRoot":"","sources":["../../src/extension/ExtensionWeb3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAe/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,MAAM,OAAO,aAAc,SAAQ,SAAS;IACpC,KAAK,CAAC,UAAU,CACtB,MAAoC;QAEpC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAEzD,IAAI,CAAC,OAAO,EAAE;YACb,MAAM,IAAI,YAAY,CAAC,0BAA0B,EAAE;gBAClD,OAAO,EAAE,EAAE,KAAK,EAAE,6BAA6B,EAAE;aACjD,CAAC,CAAC;SACH;QAGD,MAAM,UAAU,GAAwB,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,YAAY,CAAC,2BAA2B,CAAC,CAAC;SACpD;QAGD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;YACxE,IAAI,OAAO,EAAE;gBACZ,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;aAC9B;SACD;QAED,MAAM,IAAI,YAAY,CAAC,0BAA0B,EAAE;YAClD,OAAO,EAAE,EAAE,KAAK,EAAE,6BAA6B,OAAO,EAAE,EAAE;SAC1D,CAAC,CAAC;IACJ,CAAC;CACD"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './extension/Extension.js';
-export * from './extension/ExtensionWeb2.js';
-export * from './extension/ExtensionWeb3.js';
+export * from "./extension/Extension.js";
+export * from "./extension/ExtensionWeb2.js";
+export * from "./extension/ExtensionWeb3.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-export * from './extension/Extension.js';
-export * from './extension/ExtensionWeb2.js';
-export * from './extension/ExtensionWeb3.js';
+export * from "./extension/Extension.js";
+export * from "./extension/ExtensionWeb2.js";
+export * from "./extension/ExtensionWeb3.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC"}

package/package.json

@@ -1,60 +1,55 @@
 {
-    "name": "@prosopo/account",
-    "version": "1.0.1",
-    "description": "Services and Utils for Prosopo account gen and management",
-    "main": "dist/index.js",
-    "type": "module",
-    "engines": {
-        "node": ">=18",
-        "npm": ">=9"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/cjs/index.cjs"
-        }
-    },
-    "scripts": {
-        "test": "echo \"No test specified\"",
-        "clean": "tsc --build --clean",
-        "build": "tsc --build --verbose tsconfig.json",
-        "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
-        "eslint:fix": "npm run eslint -- --fix",
-        "prettier": "npx prettier . --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
-        "prettier:fix": "npm run prettier -- --write",
-        "lint": "npm run eslint && npm run prettier",
-        "lint:fix": "npm run eslint:fix && npm run prettier:fix"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+ssh://git@github.com/prosopo/types.git"
-    },
-    "author": "Prosopo Limited",
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/prosopo/captcha/issues"
-    },
-    "homepage": "https://github.com/prosopo/captcha#readme",
-    "dependencies": {
-        "react": "^18.3.1",
-        "@fingerprintjs/fingerprintjs": "^3.3.6",
-        "@polkadot/api": "10.13.1",
-        "@polkadot/extension-base": "0.46.9",
-        "@polkadot/extension-dapp": "0.46.9",
-        "@polkadot/extension-inject": "0.46.9",
-        "@polkadot/keyring": "12.6.2",
-        "@polkadot/rpc-provider": "10.13.1",
-        "@polkadot/util": "12.6.2",
-        "@polkadot/util-crypto": "12.6.2",
-        "@prosopo/common": "1.0.1",
-        "@prosopo/types": "1.0.1",
-        "@prosopo/util": "1.0.1"
-    },
-    "devDependencies": {
-        "@prosopo/config": "1.0.1",
-        "tslib": "2.6.2",
-        "typescript": "5.1.6"
-    },
-    "sideEffects": false
+	"name": "@prosopo/account",
+	"version": "2.0.0",
+	"description": "Services and Utils for Prosopo account gen and management",
+	"main": "dist/index.js",
+	"type": "module",
+	"engines": {
+		"node": ">=20",
+		"npm": ">=9"
+	},
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/cjs/index.cjs"
+		}
+	},
+	"scripts": {
+		"test": "echo \"No test specified\"",
+		"clean": "tsc --build --clean",
+		"build": "tsc --build --verbose",
+		"build:cjs": "npx vite --config vite.cjs.config.ts build"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+ssh://git@github.com/prosopo/types.git"
+	},
+	"author": "Prosopo Limited",
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/prosopo/captcha/issues"
+	},
+	"homepage": "https://github.com/prosopo/captcha#readme",
+	"dependencies": {
+		"react": "^18.3.1",
+		"@fingerprintjs/fingerprintjs": "^3.3.6",
+		"@polkadot/api": "10.13.1",
+		"@polkadot/extension-base": "0.46.9",
+		"@polkadot/extension-dapp": "0.46.9",
+		"@polkadot/extension-inject": "0.46.9",
+		"@polkadot/keyring": "12.6.2",
+		"@polkadot/rpc-provider": "10.13.1",
+		"@polkadot/util": "12.6.2",
+		"@polkadot/util-crypto": "12.6.2",
+		"@prosopo/common": "2.0.0",
+		"@prosopo/detector": "2.0.0",
+		"@prosopo/types": "2.0.0",
+		"@prosopo/util": "2.0.0"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.0.0",
+		"tslib": "2.6.2",
+		"typescript": "5.1.6"
+	},
+	"sideEffects": false
 }

package/vite.cjs.config.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,9 +12,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ViteCommonJSConfig } from '@prosopo/config'
-import path from 'path'
+import { ViteCommonJSConfig } from "@prosopo/config";
 
 export default function () {
-    return ViteCommonJSConfig('util', path.resolve('./tsconfig.cjs.json'))
+	return ViteCommonJSConfig("util", path.resolve("./tsconfig.cjs.json"));
 }