@prosopo/procaptcha 1.0.2 → 2.0.1

package/dist/cjs/account/dist/extension/ExtensionWeb2.cjs

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Api = require("@polkadot/api/promise/Api");
-const Extension = require("./Extension.cjs");
-const keyring = require("@polkadot/keyring");
-const common = require("@prosopo/common");
 const Signer = require("@polkadot/extension-base/page/Signer");
-const ws = require("@polkadot/rpc-provider/ws");
-const address = require("@polkadot/util-crypto/address");
+const keyring = require("@polkadot/keyring");
+const utilCrypto = require("@polkadot/util-crypto");
 const bip39 = require("@polkadot/util-crypto/mnemonic/bip39");
-const fingerprintjs = require("@fingerprintjs/fingerprintjs");
-const util = require("@prosopo/util");
 const string = require("@polkadot/util/string");
 const u8a = require("@polkadot/util/u8a");
+const common = require("@prosopo/common");
+const index = require("../../../detector/src/index.cjs");
+const util = require("@prosopo/util");
+const Extension = require("./Extension.cjs");
 class ExtensionWeb2 extends Extension.Extension {
   constructor() {
     super(...arguments);
@@ -19,16 +17,16 @@ class ExtensionWeb2 extends Extension.Extension {
       const network = config.networks[config.defaultNetwork];
       if (!network) {
         throw new common.ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
-          context: { error: `No network found for environment ${config.defaultEnvironment}` }
+          context: {
+            error: `No network found for environment ${config.defaultEnvironment}`
+          }
         });
       }
       return network;
     };
   }
   async getAccount(config) {
-    const network = this.getNetwork(config);
-    const wsProvider = new ws.WsProvider(network.endpoint);
-    const account = await this.createAccount(wsProvider);
+    const account = await this.createAccount(config);
     const extension = await this.createExtension(account);
     return {
       account,
@@ -62,7 +60,8 @@ class ExtensionWeb2 extends Extension.Extension {
       signer
     };
   }
-  async createAccount(wsProvider) {
+  async createAccount(config) {
+    await utilCrypto.cryptoWaitReady();
     const params = {
       area: { width: 300, height: 300 },
       offsetParameter: 2001000001,
@@ -72,29 +71,23 @@ class ExtensionWeb2 extends Extension.Extension {
       numberOfRounds: 5,
       seed: 42
     };
-    const browserEntropy = await this.getFingerprint();
+    const browserEntropy = await index.getFingerprint();
     const canvasEntropy = util.picassoCanvas(params.numberOfRounds, params.seed, params);
     const entropy = common.hexHash([canvasEntropy, browserEntropy].join(""), 128).slice(2);
     const u8Entropy = string.stringToU8a(entropy);
     const mnemonic = bip39.entropyToMnemonic(u8Entropy);
-    const api = await Api.ApiPromise.create({ provider: wsProvider, initWasm: false, noInitWarn: true });
-    const type = "ed25519";
-    const keyring$1 = new keyring.Keyring({ type, ss58Format: api.registry.chainSS58 });
+    const type = "sr25519";
+    const keyring$1 = new keyring.Keyring({
+      type,
+      ss58Format: config.networks[config.defaultNetwork].ss58Format
+    });
     const keypair = keyring$1.addFromMnemonic(mnemonic);
-    const address$1 = keypair.address.length === 42 ? keypair.address : address.encodeAddress(address.decodeAddress(keypair.address), api.registry.chainSS58);
+    const address = keypair.address;
     return {
-      address: address$1,
-      type,
-      name: address$1,
+      address,
+      name: address,
       keypair
     };
   }
-  async getFingerprint() {
-    const fpPromise = fingerprintjs.load();
-    const fp = await fpPromise;
-    const result = await fp.get();
-    const { screenFrame, ...componentsReduced } = result.components;
-    return fingerprintjs.hashComponents(componentsReduced);
-  }
 }
 exports.ExtensionWeb2 = ExtensionWeb2;

package/dist/cjs/account/dist/extension/ExtensionWeb3.cjs

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Extension = require("./Extension.cjs");
-const common = require("@prosopo/common");
 const extensionDapp = require("@polkadot/extension-dapp");
+const common = require("@prosopo/common");
+const Extension = require("./Extension.cjs");
 class ExtensionWeb3 extends Extension.Extension {
   async getAccount(config) {
     const { dappName, userAccountAddress: address } = config;
     if (!address) {
-      throw new common.ProsopoError("WIDGET.NO_ACCOUNTS_FOUND", { context: { error: "No account address provided" } });
+      throw new common.ProsopoError("WIDGET.NO_ACCOUNTS_FOUND", {
+        context: { error: "No account address provided" }
+      });
     }
     const extensions = await extensionDapp.web3Enable(dappName);
     if (extensions.length === 0) {