@prosopo/procaptcha 0.1.8 → 0.1.10

package/.eslintrc.js

@@ -1,21 +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],
-    }
 }

package/.prettierrc.js

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

package/dist/api/AsyncFactory.d.ts

@@ -0,0 +1,7 @@
+export declare abstract class AsyncFactory {
+    constructor();
+    static create(...args: any[]): Promise<any>;
+    abstract init(...args: any[]): Promise<this>;
+}
+export default AsyncFactory;
+//# sourceMappingURL=AsyncFactory.d.ts.map

package/dist/api/AsyncFactory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AsyncFactory.d.ts","sourceRoot":"","sources":["../../src/api/AsyncFactory.ts"],"names":[],"mappings":"AAiBA,8BAAsB,YAAY;;WAKV,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;aAIzB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CACtD;AAED,eAAe,YAAY,CAAA"}

package/dist/api/AsyncFactory.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncFactory = void 0;
+// Copyright (C) 2021-2022 Prosopo (UK) Ltd.
+// This file is part of procaptcha <https://github.com/prosopo/procaptcha>.
+//
+// procaptcha is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// procaptcha is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with procaptcha.  If not, see <http://www.gnu.org/licenses/>.
+const datasets_1 = require("@prosopo/datasets");
+class AsyncFactory {
+    constructor() {
+        throw new datasets_1.ProsopoEnvError('GENERAL.ASYNC_FACTORY_CREATE');
+    }
+    static async create(...args) {
+        return await Object.create(this.prototype).init(...args);
+    }
+}
+exports.AsyncFactory = AsyncFactory;
+exports.default = AsyncFactory;
+//# sourceMappingURL=AsyncFactory.js.map

package/dist/api/AsyncFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AsyncFactory.js","sourceRoot":"","sources":["../../src/api/AsyncFactory.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,2EAA2E;AAC3E,EAAE;AACF,qEAAqE;AACrE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,gEAAgE;AAChE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,sEAAsE;AACtE,gDAAmD;AAEnD,MAAsB,YAAY;IAC9B;QACI,MAAM,IAAI,0BAAe,CAAC,8BAA8B,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAW;QACrC,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAC5D,CAAC;CAGJ;AAVD,oCAUC;AAED,kBAAe,YAAY,CAAA"}

package/dist/api/Extension.d.ts

@@ -0,0 +1,15 @@
+import { Account, ProcaptchaConfig } from '../types';
+/**
+ * Class to interface with accounts.
+ */
+export default abstract class Extension {
+    /**
+     * Find an account given an address.
+     * @param address the address of the account
+     * @param dappName the name of the dapp wanting to gain access to accounts (e.g. "Prosopo")
+     * @returns the account
+     * @throws if the account is not found
+     */
+    abstract getAccount(config: ProcaptchaConfig): Promise<Account>;
+}
+//# sourceMappingURL=Extension.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Extension.d.ts","sourceRoot":"","sources":["../../src/api/Extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,SAAS;IACnC;;;;;;OAMG;aACa,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CACzE"}

package/dist/api/Extension.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Class to interface with accounts.
+ */
+class Extension {
+}
+exports.default = Extension;
+//# sourceMappingURL=Extension.js.map

package/dist/api/Extension.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Extension.js","sourceRoot":"","sources":["../../src/api/Extension.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACH,MAA8B,SAAS;CAStC;AATD,4BASC"}

package/dist/api/ExtensionWeb2.d.ts

@@ -1,24 +1,12 @@
-import { InjectedAccountWithMeta, InjectedExtension } from "@polkadot/extension-inject/types";
-import { IExtensionInterface } from "../types/client";
-import AsyncFactory from "./AsyncFactory";
-import { WsProvider } from "@polkadot/rpc-provider";
-export declare class ExtensionWeb2 extends AsyncFactory implements IExtensionInterface {
-    private extension?;
-    private account;
-    private accounts;
-    protected wsProvider: WsProvider;
-    init(wsProvider: WsProvider): Promise<this>;
-    checkExtension(): Promise<void>;
-    getExtension(): InjectedExtension | undefined;
-    private setExtension;
-    getAccounts(): InjectedAccountWithMeta[];
-    private setAccounts;
-    getAccount(): InjectedAccountWithMeta | undefined;
-    setAccount(address: string): void;
-    unsetAccount(): void;
-    getDefaultAccount(): InjectedAccountWithMeta | undefined;
-    setDefaultAccount(): void;
-    createAccount(): Promise<any>;
+import Extension from './Extension';
+import { Account, ProcaptchaConfig } from '../types';
+/**
+ * Class for interfacing with web3 accounts.
+ */
+export default class ExtWeb2 extends Extension {
+    getAccount(config: ProcaptchaConfig): Promise<Account>;
+    private createExtension;
+    private createAccount;
+    private getFingerprint;
 }
-export default ExtensionWeb2;
 //# sourceMappingURL=ExtensionWeb2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb2.d.ts","sourceRoot":"","sources":["../../src/api/ExtensionWeb2.ts"],"names":[],"mappings":"AAeA,OAAO,EAEH,uBAAuB,EACvB,iBAAiB,EAEpB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAMlD,qBAAa,aAAc,SAAQ,YAAa,YAAW,mBAAmB;IAE1E,OAAO,CAAC,SAAS,CAAC,CAAoB;IACtC,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,QAAQ,CAA4B;IAE5C,SAAS,CAAC,UAAU,EAAE,UAAU,CAAA;IAEnB,IAAI,CAAC,UAAU,EAAE,UAAU;IAM3B,cAAc;IAIpB,YAAY;YAIL,YAAY;IA8BnB,WAAW;YAIJ,WAAW;IASlB,UAAU;IAIV,UAAU,CAAC,OAAO,EAAE,MAAM;IAc1B,YAAY;IAKZ,iBAAiB;IAKjB,iBAAiB;IAOX,aAAa;CAS7B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ExtensionWeb2.d.ts","sourceRoot":"","sources":["../../src/api/ExtensionWeb2.ts"],"names":[],"mappings":"AAOA,OAAO,SAAS,MAAM,aAAa,CAAA;AAKnC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAGpD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAS;IAC7B,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;YAYrD,eAAe;YA+Bf,aAAa;YAkCb,cAAc;CAU/B"}

package/dist/api/ExtensionWeb2.js

@@ -1,102 +1,95 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtensionWeb2 = void 0;
 const tslib_1 = require("tslib");
-const storage_1 = tslib_1.__importDefault(require("../modules/storage"));
-const AsyncFactory_1 = tslib_1.__importDefault(require("./AsyncFactory"));
-const contract_1 = require("@prosopo/contract");
-const AccountCreator_1 = require("./AccountCreator");
+const api_1 = require("@polkadot/api");
+const rpc_provider_1 = require("@polkadot/rpc-provider");
+const util_1 = require("@polkadot/util");
+const util_crypto_1 = require("@polkadot/util-crypto");
+const bip39_1 = require("@polkadot/util-crypto/mnemonic/bip39");
+const datasets_1 = require("@prosopo/datasets");
+const Extension_1 = tslib_1.__importDefault(require("./Extension"));
+const fingerprintjs_1 = tslib_1.__importStar(require("@fingerprintjs/fingerprintjs"));
 const Signer_1 = tslib_1.__importDefault(require("@polkadot/extension-base/page/Signer"));
-class ExtensionWeb2 extends AsyncFactory_1.default {
-    extension;
-    account;
-    accounts;
-    wsProvider;
-    async init(wsProvider) {
-        await this.setExtension();
-        this.wsProvider = wsProvider;
-        return this;
-    }
-    async checkExtension() {
-        return;
-    }
-    getExtension() {
-        return this.extension;
-    }
-    async setExtension() {
-        /*
-        InjectedAccounts
-        get: (anyType?: boolean) => Promise<InjectedAccount[]>;
-        subscribe: (cb: (accounts: InjectedAccount[]) => void | Promise<void>) => Unsubcall;
-         */
-        const injectedAccounts = {
-            get: () => Promise.resolve([]), subscribe: () => () => {
-            }
+const canvas_1 = require("../modules/canvas");
+/**
+ * Class for interfacing with web3 accounts.
+ */
+class ExtWeb2 extends Extension_1.default {
+    async getAccount(config) {
+        const wsProvider = new rpc_provider_1.WsProvider(config.network.endpoint);
+        const account = await this.createAccount(wsProvider);
+        const extension = await this.createExtension(account);
+        return {
+            account,
+            extension,
         };
-        async function sendMessage(message) {
+    }
+    async createExtension(account) {
+        const sendMessage = async (message) => {
             return new Promise((resolve, reject) => {
                 resolve();
             });
-        }
+        };
         await sendMessage('pub(authorize.tab)');
         const signer = new Signer_1.default(sendMessage);
-        this.extension = {
-            name: "polkadot-js-web2",
-            version: "procaptcha",
-            accounts: injectedAccounts,
-            signer: signer,
+        return {
+            accounts: {
+                get: async () => {
+                    // there is only ever 1 account
+                    return [account];
+                },
+                subscribe: () => {
+                    // do nothing, there will never be account changes
+                    return () => {
+                        return;
+                    };
+                },
+            },
+            name: 'procaptcha-web2',
+            version: '0.1.10',
+            signer,
         };
-        return;
-    }
-    getAccounts() {
-        return this.accounts;
-    }
-    async setAccounts(accounts) {
-        try {
-            this.accounts = accounts;
-        }
-        catch (err) {
-            throw new contract_1.ProsopoEnvError(err);
-        }
-        this.setDefaultAccount();
     }
-    getAccount() {
-        return this.account;
-    }
-    setAccount(address) {
-        if (!this.accounts.length) {
-            throw new contract_1.ProsopoEnvError("WIDGET.NO_ACCOUNTS_FOUND");
-        }
-        const account = this.accounts.find(acc => acc.address === address);
-        if (!account) {
-            throw new contract_1.ProsopoEnvError("WIDGET.ACCOUNT_NOT_FOUND");
-        }
-        this.account = account;
-        storage_1.default.setAccount(account.address);
-    }
-    unsetAccount() {
-        this.account = undefined;
-        storage_1.default.setAccount("");
-    }
-    getDefaultAccount() {
-        const defaultAccount = storage_1.default.getAccount();
-        return this.accounts.find(acc => acc.address === defaultAccount);
-    }
-    setDefaultAccount() {
-        const defaultAccount = storage_1.default.getAccount();
-        if (defaultAccount) {
-            this.setAccount(defaultAccount);
-        }
+    async createAccount(wsProvider) {
+        const params = {
+            area: { width: 300, height: 300 },
+            offsetParameter: 2001000001,
+            multiplier: 15000,
+            fontSizeFactor: 1.5,
+            maxShadowBlur: 50,
+            numberOfRounds: 5,
+            seed: 42,
+        };
+        const browserEntropy = await this.getFingerprint();
+        const canvasEntropy = (0, canvas_1.picassoCanvas)(params.numberOfRounds, params.seed, params);
+        const entropy = (0, datasets_1.hexHash)([canvasEntropy, browserEntropy].join(''), 128).slice(2);
+        console.log('canvas entropy', canvasEntropy);
+        console.log('browserEntropy', browserEntropy);
+        console.log('entropy', entropy);
+        const u8Entropy = (0, util_1.stringToU8a)(entropy);
+        const mnemonic = (0, bip39_1.entropyToMnemonic)(u8Entropy);
+        const api = await api_1.ApiPromise.create({ provider: wsProvider });
+        const type = 'sr25519';
+        const keyring = new api_1.Keyring({ type, ss58Format: api.registry.chainSS58 });
+        await (0, util_crypto_1.cryptoWaitReady)();
+        const account = keyring.addFromMnemonic(mnemonic);
+        const address = account.address.length === 42 ? account.address : (0, util_crypto_1.encodeAddress)((0, util_crypto_1.decodeAddress)(account.address));
+        return {
+            address,
+            type,
+            name: address,
+        };
     }
-    async createAccount() {
-        const accountCreator = await AccountCreator_1.AccountCreator.create(this.wsProvider);
-        const storedAccount = storage_1.default.getAccount();
-        const account = await accountCreator.createAccount(undefined, storedAccount);
-        await this.setAccounts([account]);
-        this.setAccount(account.address);
-        return account;
+    async getFingerprint() {
+        // Initialize an agent at application startup.
+        const fpPromise = fingerprintjs_1.default.load();
+        // Get the visitor identifier when you need it.
+        const fp = await fpPromise;
+        const result = await fp.get();
+        // strip out the components that change in incognito mode
+        const { screenFrame, ...componentsReduced } = result.components;
+        return (0, fingerprintjs_1.hashComponents)(componentsReduced);
     }
 }
-exports.ExtensionWeb2 = ExtensionWeb2;
-exports.default = ExtensionWeb2;
+exports.default = ExtWeb2;
 //# sourceMappingURL=ExtensionWeb2.js.map

package/dist/api/ExtensionWeb2.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb2.js","sourceRoot":"","sources":["../../src/api/ExtensionWeb2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExtensionWeb2.js","sourceRoot":"","sources":["../../src/api/ExtensionWeb2.ts"],"names":[],"mappings":";;;AAAA,uCAAmD;AAEnD,yDAAmD;AACnD,yCAA4C;AAC5C,uDAAqF;AACrF,gEAAwE;AACxE,gDAA2C;AAC3C,oEAAmC;AACnC,sFAA4E;AAE5E,0FAAyD;AAGzD,8CAAiD;AAEjD;;GAEG;AACH,MAAqB,OAAQ,SAAQ,mBAAS;IACnC,KAAK,CAAC,UAAU,CAAC,MAAwB;QAC5C,MAAM,UAAU,GAAG,IAAI,yBAAU,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAE1D,MAAM,OAAO,GAAoB,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;QACrE,MAAM,SAAS,GAAsB,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAExE,OAAO;YACH,OAAO;YACP,SAAS;SACZ,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAwB;QAClD,MAAM,WAAW,GAAG,KAAK,EACrB,OAAqB,EACR,EAAE;YACf,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACzC,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QAED,MAAM,WAAW,CAAC,oBAAmD,CAAC,CAAA;QACtE,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,WAAW,CAAC,CAAA;QAEtC,OAAO;YACH,QAAQ,EAAE;gBACN,GAAG,EAAE,KAAK,IAAI,EAAE;oBACZ,+BAA+B;oBAC/B,OAAO,CAAC,OAAO,CAAC,CAAA;gBACpB,CAAC;gBACD,SAAS,EAAE,GAAG,EAAE;oBACZ,kDAAkD;oBAClD,OAAO,GAAG,EAAE;wBACR,OAAM;oBACV,CAAC,CAAA;gBACL,CAAC;aACJ;YACD,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,QAAQ;YACjB,MAAM;SACT,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,UAAsB;QAC9C,MAAM,MAAM,GAAG;YACX,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;YACjC,eAAe,EAAE,UAAU;YAC3B,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,GAAG;YACnB,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE,CAAC;YACjB,IAAI,EAAE,EAAE;SACX,CAAA;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAClD,MAAM,aAAa,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC/E,MAAM,OAAO,GAAG,IAAA,kBAAO,EAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC/E,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;QAC5C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC/B,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAA;QACtC,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAA;QAE7C,MAAM,GAAG,GAAG,MAAM,gBAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAA;QAC7D,MAAM,IAAI,GAAG,SAAS,CAAA;QACtB,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAA;QAEzE,MAAM,IAAA,6BAAe,GAAE,CAAA;QACvB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QACjD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,2BAAa,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/G,OAAO;YACH,OAAO;YACP,IAAI;YACJ,IAAI,EAAE,OAAO;SAChB,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,cAAc;QACxB,8CAA8C;QAC9C,MAAM,SAAS,GAAG,uBAAa,CAAC,IAAI,EAAE,CAAA;QACtC,+CAA+C;QAC/C,MAAM,EAAE,GAAG,MAAM,SAAS,CAAA;QAC1B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAA;QAC7B,yDAAyD;QACzD,MAAM,EAAE,WAAW,EAAE,GAAG,iBAAiB,EAAE,GAAG,MAAM,CAAC,UAAU,CAAA;QAC/D,OAAO,IAAA,8BAAc,EAAC,iBAAiB,CAAC,CAAA;IAC5C,CAAC;CACJ;AAxFD,0BAwFC"}

package/dist/api/ExtensionWeb3.d.ts

@@ -1,55 +1,9 @@
-import { InjectedAccountWithMeta, InjectedExtension } from "@polkadot/extension-inject/types";
-import { IExtensionInterface } from "../types/client";
-import AsyncFactory from "./AsyncFactory";
+import Extension from './Extension';
+import { Account, ProcaptchaConfig } from '../types';
 /**
- * Class to discover web3 accounts from browser extensions
+ * Class for interfacing with web3 accounts.
  */
-export declare class ExtensionWeb3 extends AsyncFactory implements IExtensionInterface {
-    private extension?;
-    private account;
-    private accounts;
-    private injectedExtensions;
-    init(): Promise<this>;
-    checkExtension(): Promise<void>;
-    /**
-     * Get the extension for the selected account.
-     * @returns the extension holding the selected account. Undefined if no account selected.
-     */
-    getExtension(): InjectedExtension | undefined;
-    /**
-     * Set the extension for the selected account.
-     */
-    private setExtension;
-    /**
-     * Get all accounts across all extensions.
-     * @returns all accounts across all extensions.
-     */
-    getAccounts(): InjectedAccountWithMeta[];
-    /**
-     * Discover accounts across all extensions.
-     */
-    private setAccounts;
-    /**
-     * Get the selected account.
-     * @returns the selected account.
-     */
-    getAccount(): InjectedAccountWithMeta | undefined;
-    /**
-     * Set the selected account.
-     * @param address the address of the account to be selected.
-     */
-    setAccount(address: string): void;
-    unsetAccount(): void;
-    /**
-     * Get the last used account via the address held in local storage.
-     * @returns the account associated with the address held in storage.
-     */
-    getDefaultAccount(): InjectedAccountWithMeta | undefined;
-    /**
-     * Select the account using the last used account address held in local storage.
-     */
-    setDefaultAccount(): void;
-    createAccount(): Promise<undefined>;
+export default class ExtWeb3 extends Extension {
+    getAccount(config: ProcaptchaConfig): Promise<Account>;
 }
-export default ExtensionWeb3;
 //# sourceMappingURL=ExtensionWeb3.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ExtensionWeb3.d.ts","sourceRoot":"","sources":["../../src/api/ExtensionWeb3.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAE7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C;;GAEG;AACH,qBAAa,aAAc,SAAQ,YAAa,YAAW,mBAAmB;IAG1E,OAAO,CAAC,SAAS,CAAC,CAAoB;IAEtC,OAAO,CAAC,OAAO,CAAsC;IAErD,OAAO,CAAC,QAAQ,CAA4B;IAE5C,OAAO,CAAC,kBAAkB,CAAsB;IAEnC,IAAI;IAOJ,cAAc;IAW3B;;;OAGG;IACI,YAAY;IAInB;;OAEG;YACW,YAAY;IAY1B;;;OAGG;IACI,WAAW;IAIlB;;OAEG;YACW,WAAW;IAczB;;;OAGG;IACI,UAAU;IAIjB;;;OAGG;IACI,UAAU,CAAC,OAAO,EAAE,MAAM;IAY1B,YAAY;IAMnB;;;OAGG;IACI,iBAAiB;IAKxB;;OAEG;IACI,iBAAiB;IAOX,aAAa;CAY7B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ExtensionWeb3.d.ts","sourceRoot":"","sources":["../../src/api/ExtensionWeb3.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAGpD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAS;IAC7B,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAwBtE"}

package/dist/api/ExtensionWeb3.js

@@ -1,149 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtensionWeb3 = void 0;
 const tslib_1 = require("tslib");
-// Copyright (C) 2021-2022 Prosopo (UK) Ltd.
-// This file is part of procaptcha <https://github.com/prosopo/procaptcha>.
-//
-// procaptcha is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// procaptcha is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with procaptcha.  If not, see <http://www.gnu.org/licenses/>.
 const extension_dapp_1 = require("@polkadot/extension-dapp");
-const storage_1 = tslib_1.__importDefault(require("../modules/storage"));
-const AsyncFactory_1 = tslib_1.__importDefault(require("./AsyncFactory"));
-const contract_1 = require("@prosopo/contract");
+const Extension_1 = tslib_1.__importDefault(require("./Extension"));
+const errors_1 = require("./errors");
 /**
- * Class to discover web3 accounts from browser extensions
+ * Class for interfacing with web3 accounts.
  */
-class ExtensionWeb3 extends AsyncFactory_1.default {
-    // the extension for the currently selected account, if any
-    extension;
-    // the currently selected account, if any
-    account;
-    // the discovered accounts
-    accounts;
-    // the discovered extensions
-    injectedExtensions;
-    async init() {
-        await this.checkExtension();
-        await this.setAccounts();
-        await this.setExtension();
-        return this;
-    }
-    async checkExtension() {
-        try {
-            this.injectedExtensions = await (0, extension_dapp_1.web3Enable)('Prosopo');
-        }
-        catch (err) {
-            throw new contract_1.ProsopoEnvError(err);
-        }
-        if (!this.injectedExtensions.length) {
-            throw new contract_1.ProsopoEnvError("WIDGET.NO_EXTENSION_FOUND");
-        }
-    }
-    /**
-     * Get the extension for the selected account.
-     * @returns the extension holding the selected account. Undefined if no account selected.
-     */
-    getExtension() {
-        return this.extension;
-    }
-    /**
-     * Set the extension for the selected account.
-     */
-    async setExtension() {
-        try {
-            // https://polkadot.js.org/docs/extension/cookbook/
-            this.extension = await (0, extension_dapp_1.web3FromSource)(this.accounts[0].meta.source);
-        }
-        catch (err) {
-            throw new contract_1.ProsopoEnvError(err);
-        }
-        if (!this.extension) {
-            throw new contract_1.ProsopoEnvError("WIDGET.EXTENSION_NOT_FOUND");
-        }
-    }
-    /**
-     * Get all accounts across all extensions.
-     * @returns all accounts across all extensions.
-     */
-    getAccounts() {
-        return this.accounts;
-    }
-    /**
-     * Discover accounts across all extensions.
-     */
-    async setAccounts() {
-        this.accounts = await (0, extension_dapp_1.web3Accounts)();
-        // get the last used account address from storage
-        const lastUsedAccountAddress = storage_1.default.getAccount();
-        // lookup this account in the discovered accounts
-        const account = this.accounts.find(acc => acc.address === lastUsedAccountAddress);
-        // if found then set it
-        if (account) {
-            this.account = account;
-        }
-        else {
-            this.account = undefined;
-        }
-    }
-    /**
-     * Get the selected account.
-     * @returns the selected account.
-     */
-    getAccount() {
-        return this.account;
-    }
-    /**
-     * Set the selected account.
-     * @param address the address of the account to be selected.
-     */
-    setAccount(address) {
-        if (!this.accounts.length) {
-            throw new contract_1.ProsopoEnvError("WIDGET.NO_ACCOUNTS_FOUND");
-        }
-        const account = this.accounts.find(acc => acc.address === address);
-        if (!account) {
-            throw new contract_1.ProsopoEnvError("WIDGET.ACCOUNT_NOT_FOUND");
-        }
-        this.account = account;
-        storage_1.default.setAccount(account.address);
-    }
-    unsetAccount() {
-        this.account = undefined;
-        // update the last used account to empty
-        storage_1.default.setAccount("");
-    }
-    /**
-     * Get the last used account via the address held in local storage.
-     * @returns the account associated with the address held in storage.
-     */
-    getDefaultAccount() {
-        const defaultAccount = storage_1.default.getAccount();
-        return this.accounts.find(acc => acc.address === defaultAccount);
-    }
-    /**
-     * Select the account using the last used account address held in local storage.
-     */
-    setDefaultAccount() {
-        const defaultAccount = storage_1.default.getAccount();
-        if (defaultAccount) {
-            this.setAccount(defaultAccount);
-        }
-    }
-    async createAccount() {
-        return undefined;
+class ExtWeb3 extends Extension_1.default {
+    async getAccount(config) {
+        const { dappName, userAccountAddress: address } = config;
+        if (!address) {
+            throw new errors_1.AccountNotFoundError('No account address provided');
+        }
+        // enable access to all extensions
+        const extensions = await (0, extension_dapp_1.web3Enable)(dappName);
+        if (extensions.length === 0) {
+            throw new errors_1.ExtensionNotFoundError();
+        }
+        // search through all extensions for the one that has the account
+        for (const extension of extensions) {
+            const accounts = await extension.accounts.get();
+            const account = accounts.find((account) => account.address === address);
+            if (account) {
+                return { account, extension };
+            }
+        }
+        throw new errors_1.AccountNotFoundError('No account found matching ' + address);
     }
 }
-exports.ExtensionWeb3 = ExtensionWeb3;
-exports.default = ExtensionWeb3;
+exports.default = ExtWeb3;
 //# sourceMappingURL=ExtensionWeb3.js.map