@prosopo/procaptcha 0.1.4 → 0.1.6

package/README.md

@@ -6,7 +6,7 @@ Contains interfaces for accessing the Prosopo [protocol](https://github.com/pros
 
 The Dapp smart contract account must be [registered](https://github.com/prosopo-io/protocol/blob/5cb282a911522bfbf29d34d1830badee3eecec83/contracts/lib.rs#L698-L737) in the Prosopo [protocol](https://github.com/prosopo-io/protocol/) contract in order to interact with the Prosopo protocol. You can complete Dapp registration by navigating to [polkadot-js apps](https://polkadot.js.org/apps/) and using the contracts page.
 
-![contracts-page.png](img/contracts-page.png)
+![contracts-page.png](assets/contracts-page.png)
 
 ## Usage
 

package/dist/api/AccountCreator.d.ts

@@ -0,0 +1,16 @@
+import { ApiPromise } from "@polkadot/api";
+import { InjectedAccountWithMeta } from "@polkadot/extension-inject/types";
+import AsyncFactory from "./AsyncFactory";
+import { Keyring } from "@polkadot/keyring";
+import { KeyringPair } from "@polkadot/keyring/types";
+import { ProviderInterface } from "@polkadot/rpc-provider/types";
+export declare class AccountCreator extends AsyncFactory {
+    protected api: ApiPromise;
+    /**
+     * @param providerInterface
+     */
+    init(providerInterface: ProviderInterface): Promise<this>;
+    generateMnemonic(keyring: Keyring): Promise<KeyringPair>;
+    createAccount(keyring?: Keyring, address?: string): Promise<InjectedAccountWithMeta>;
+}
+//# sourceMappingURL=AccountCreator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AccountCreator.d.ts","sourceRoot":"","sources":["../../src/api/AccountCreator.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,uBAAuB,EAAC,MAAM,kCAAkC,CAAC;AACzE,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAA+B,OAAO,EAAC,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,qBAAa,cAAe,SAAQ,YAAY;IAE5C,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAE1B;;OAEG;IACU,IAAI,CAAC,iBAAiB,EAAE,iBAAiB;IAKzC,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IAMxD,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAuBpG"}

package/dist/api/AccountCreator.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountCreator = void 0;
+const tslib_1 = require("tslib");
+// Copyright (C) 2021-2022 Prosopo (UK) Ltd.
+// This file is part of procaptcha <https://github.com/prosopo-io/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 api_1 = require("@polkadot/api");
+const AsyncFactory_1 = tslib_1.__importDefault(require("./AsyncFactory"));
+const keyring_1 = require("@polkadot/keyring");
+const util_crypto_1 = require("@polkadot/util-crypto");
+class AccountCreator extends AsyncFactory_1.default {
+    api;
+    /**
+     * @param providerInterface
+     */
+    async init(providerInterface) {
+        this.api = await api_1.ApiPromise.create({ provider: providerInterface });
+        return this;
+    }
+    async generateMnemonic(keyring) {
+        await (0, util_crypto_1.cryptoWaitReady)();
+        const mnemonic = (0, util_crypto_1.mnemonicGenerate)();
+        return keyring.addFromMnemonic(mnemonic);
+    }
+    async createAccount(keyring, address) {
+        const source = 'procaptcha';
+        if (!keyring) {
+            keyring = new keyring_1.Keyring({ type: 'sr25519', ss58Format: this.api.registry.chainSS58 });
+        }
+        if (address) {
+            return { address: address, meta: { source, name: address } };
+        }
+        else {
+            const account = await this.generateMnemonic(keyring);
+            return {
+                address: account.address.length === 42
+                    ? account.address
+                    : (0, keyring_1.encodeAddress)((0, keyring_1.decodeAddress)(account.address), this.api.registry.chainSS58),
+                meta: { source, name: account.address },
+            };
+        }
+    }
+}
+exports.AccountCreator = AccountCreator;
+//# sourceMappingURL=AccountCreator.js.map

package/dist/api/AccountCreator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountCreator.js","sourceRoot":"","sources":["../../src/api/AccountCreator.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,uCAAyC;AAEzC,0EAA0C;AAC1C,+CAAwE;AAExE,uDAAwE;AAGxE,MAAa,cAAe,SAAQ,sBAAY;IAElC,GAAG,CAAa;IAE1B;;OAEG;IACI,KAAK,CAAC,IAAI,CAAC,iBAAoC;QAClD,IAAI,CAAC,GAAG,GAAG,MAAM,gBAAU,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,iBAAiB,EAAC,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAAgB;QAC1C,MAAM,IAAA,6BAAe,GAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,8BAAgB,GAAE,CAAC;QACpC,OAAO,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAiB,EAAE,OAAgB;QAC1D,MAAM,MAAM,GAAG,YAAY,CAAC;QAE5B,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,GAAG,IAAI,iBAAO,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAC,CAAC,CAAC;SACrF;QAGD,IAAI,OAAO,EAAE;YACT,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAC,EAAC,CAAA;SAC3D;aAAM;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACrD,OAAO;gBACH,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE;oBAClC,CAAC,CAAC,OAAO,CAAC,OAAO;oBACjB,CAAC,CAAC,IAAA,uBAAa,EAAC,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAChF,IAAI,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAC;aACxC,CAAA;SACJ;IAGL,CAAC;CAEJ;AAzCD,wCAyCC"}

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

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

package/dist/api/AsyncFactory.js

@@ -16,9 +16,10 @@ exports.AsyncFactory = void 0;
 //
 // You should have received a copy of the GNU General Public License
 // along with procaptcha.  If not, see <http://www.gnu.org/licenses/>.
+const contract_1 = require("@prosopo/contract");
 class AsyncFactory {
     constructor() {
-        throw new Error("Use `create` factory method");
+        throw new contract_1.ProsopoEnvError("Use `create` factory method");
     }
     static async create(...args) {
         return await Object.create(this.prototype).init(...args);

package/dist/api/AsyncFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"AsyncFactory.js","sourceRoot":"","sources":["../../src/api/AsyncFactory.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,MAAsB,YAAY;IAE9B;QACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,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,CAAC;IAC7D,CAAC;CAIJ;AAZD,oCAYC;AAED,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"AsyncFactory.js","sourceRoot":"","sources":["../../src/api/AsyncFactory.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,gDAAkD;AAElD,MAAsB,YAAY;IAE9B;QACI,MAAM,IAAI,0BAAe,CAAC,6BAA6B,CAAC,CAAC;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,CAAC;IAC7D,CAAC;CAIJ;AAZD,oCAYC;AAED,kBAAe,YAAY,CAAC"}

package/dist/api/ExtensionWeb2.d.ts

@@ -0,0 +1,24 @@
+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>;
+}
+export default ExtensionWeb2;
+//# sourceMappingURL=ExtensionWeb2.d.ts.map

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

@@ -0,0 +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"}

package/dist/api/ExtensionWeb2.js

@@ -0,0 +1,102 @@
+"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 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: () => () => {
+            }
+        };
+        async function sendMessage(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;
+    }
+    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("No accounts found");
+        }
+        const account = this.accounts.find(acc => acc.address === address);
+        if (!account) {
+            throw new contract_1.ProsopoEnvError("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() {
+        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;
+    }
+}
+exports.ExtensionWeb2 = ExtensionWeb2;
+exports.default = ExtensionWeb2;
+//# sourceMappingURL=ExtensionWeb2.js.map

package/dist/api/ExtensionWeb2.js.map

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

package/dist/api/{Extension.d.ts → ExtensionWeb3.d.ts}

@@ -1,7 +1,7 @@
 import { InjectedAccountWithMeta, InjectedExtension } from "@polkadot/extension-inject/types";
 import { IExtensionInterface } from "../types/client";
 import AsyncFactory from "./AsyncFactory";
-export declare class Extension extends AsyncFactory implements IExtensionInterface {
+export declare class ExtensionWeb3 extends AsyncFactory implements IExtensionInterface {
     private extension;
     private account;
     private accounts;
@@ -17,6 +17,7 @@ export declare class Extension extends AsyncFactory implements IExtensionInterfa
     unsetAccount(): void;
     getDefaultAccount(): InjectedAccountWithMeta | undefined;
     setDefaultAccount(): void;
+    createAccount(): Promise<undefined>;
 }
-export default Extension;
-//# sourceMappingURL=Extension.d.ts.map
+export default ExtensionWeb3;
+//# sourceMappingURL=ExtensionWeb3.d.ts.map

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

@@ -0,0 +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;AAI1C,qBAAa,aAAc,SAAQ,YAAa,YAAW,mBAAmB;IAE1E,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,kBAAkB,CAAsB;IAEnC,IAAI;IAOJ,cAAc;IAWpB,YAAY;YAIL,YAAY;IAYnB,WAAW;YAIJ,WAAW;IASlB,UAAU;IAIV,UAAU,CAAC,OAAO,EAAE,MAAM;IAY1B,YAAY;IAKZ,iBAAiB;IAKjB,iBAAiB;IAOX,aAAa;CAY7B;AAED,eAAe,aAAa,CAAC"}

package/dist/api/{Extension.js → ExtensionWeb3.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Extension = void 0;
+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-io/procaptcha>.
@@ -20,7 +20,8 @@ const tslib_1 = require("tslib");
 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"));
-class Extension extends AsyncFactory_1.default {
+const contract_1 = require("@prosopo/contract");
+class ExtensionWeb3 extends AsyncFactory_1.default {
     extension;
     account;
     accounts;
@@ -36,10 +37,10 @@ class Extension extends AsyncFactory_1.default {
             this.injectedExtensions = await (0, extension_dapp_1.web3Enable)('Prosopo');
         }
         catch (err) {
-            throw new Error(err);
+            throw new contract_1.ProsopoEnvError(err);
         }
         if (!this.injectedExtensions.length) {
-            throw new Error("No extension found");
+            throw new contract_1.ProsopoEnvError("No extension found");
         }
     }
     getExtension() {
@@ -51,10 +52,10 @@ class Extension extends AsyncFactory_1.default {
             this.extension = await (0, extension_dapp_1.web3FromSource)(this.accounts[0].meta.source);
         }
         catch (err) {
-            throw new Error(err);
+            throw new contract_1.ProsopoEnvError(err);
         }
         if (!this.extension) {
-            throw new Error("Extension not found");
+            throw new contract_1.ProsopoEnvError("Extension not found");
         }
     }
     getAccounts() {
@@ -65,7 +66,7 @@ class Extension extends AsyncFactory_1.default {
             this.accounts = await (0, extension_dapp_1.web3Accounts)();
         }
         catch (err) {
-            throw new Error(err);
+            throw new contract_1.ProsopoEnvError(err);
         }
         this.setDefaultAccount();
     }
@@ -74,11 +75,11 @@ class Extension extends AsyncFactory_1.default {
     }
     setAccount(address) {
         if (!this.accounts.length) {
-            throw new Error("No accounts found");
+            throw new contract_1.ProsopoEnvError("No accounts found");
         }
         const account = this.accounts.find(acc => acc.address === address);
         if (!account) {
-            throw new Error("Account not found");
+            throw new contract_1.ProsopoEnvError("Account not found");
         }
         this.account = account;
         storage_1.default.setAccount(account.address);
@@ -97,7 +98,10 @@ class Extension extends AsyncFactory_1.default {
             this.setAccount(defaultAccount);
         }
     }
+    async createAccount() {
+        return undefined;
+    }
 }
-exports.Extension = Extension;
-exports.default = Extension;
-//# sourceMappingURL=Extension.js.map
+exports.ExtensionWeb3 = ExtensionWeb3;
+exports.default = ExtensionWeb3;
+//# sourceMappingURL=ExtensionWeb3.js.map

package/dist/api/ExtensionWeb3.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"HttpClientBase.d.ts","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAeA,OAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE5D,qBAAa,cAAc;IAEzB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;gBAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAK;IAMxC,SAAS,CAAC,eAAe,aAAc,aAAa,SAGnD;IAED,SAAS,CAAC,YAAY,UAAW,GAAG,oBAAoC;CAEzE;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"HttpClientBase.d.ts","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":"AAeA,OAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE5D,qBAAa,cAAc;IAEvB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;gBAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAK;IAMxC,SAAS,CAAC,eAAe,aAAc,aAAa,SAGnD;IAED,SAAS,CAAC,YAAY,UAAW,GAAG,oBAAoC;CAE3E;AAED,eAAe,cAAc,CAAC"}

package/dist/api/HttpClientBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpClientBase.js","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,0DAA4D;AAE5D,MAAa,cAAc;IAEN,KAAK,CAAgB;IAExC,YAAY,OAAe,EAAE,MAAM,GAAG,EAAE;QACtC,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;IAES,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;QACtD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC,CAAA;IAES,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;CAEzE;AAjBD,wCAiBC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"HttpClientBase.js","sourceRoot":"","sources":["../../src/api/HttpClientBase.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,0DAA4D;AAE5D,MAAa,cAAc;IAEJ,KAAK,CAAgB;IAExC,YAAY,OAAe,EAAE,MAAM,GAAG,EAAE;QACpC,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAClF,CAAC;IAES,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;QACpD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC,CAAA;IAES,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;CAE3E;AAjBD,wCAiBC;AAED,kBAAe,cAAc,CAAC"}

package/dist/api/ProsopoContract.d.ts

@@ -7,7 +7,7 @@ export declare class ProsopoContract extends ProsopoContractBase {
     getRandomProvider(): Promise<ProsopoRandomProviderResponse>;
     getCaptchaSolutionCommitment(commitmentId: string): Promise<CaptchaSolutionCommitment>;
     dappUserCommit(signer: Signer, captchaDatasetId: string, userMerkleTreeRoot: string, providerAddress: string): Promise<TransactionResponse>;
-    dappOperatorIsHumanUser(threshold: number): Promise<ProsopoDappOperatorIsHumanUserResponse>;
+    dappOperatorIsHumanUser(solutionThreshold: number): Promise<ProsopoDappOperatorIsHumanUserResponse>;
 }
 export default ProsopoContract;
 //# sourceMappingURL=ProsopoContract.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProsopoContract.d.ts","sourceRoot":"","sources":["../../src/api/ProsopoContract.ts"],"names":[],"mappings":"AAgBA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,sCAAsC,EAAE,mBAAmB,EAAC,MAAM,UAAU,CAAC;AACrF,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,qBAAa,eAAgB,SAAQ,mBAAmB;IAEvC,iBAAiB,IAAI,OAAO,CAAC,6BAA6B,CAAC;IAI3D,4BAA4B,CAAC,YAAY,EAAE,MAAM;IAIjD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAI3I,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sCAAsC,CAAC;CAO3G;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ProsopoContract.d.ts","sourceRoot":"","sources":["../../src/api/ProsopoContract.ts"],"names":[],"mappings":"AAgBA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,sCAAsC,EAAE,mBAAmB,EAAC,MAAM,UAAU,CAAC;AACrF,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,qBAAa,eAAgB,SAAQ,mBAAmB;IAEvC,iBAAiB,IAAI,OAAO,CAAC,6BAA6B,CAAC;IAI3D,4BAA4B,CAAC,YAAY,EAAE,MAAM;IAIjD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAI3I,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,sCAAsC,CAAC;CAOnH;AAED,eAAe,eAAe,CAAC"}

package/dist/api/ProsopoContract.js

@@ -19,7 +19,6 @@ const tslib_1 = require("tslib");
 // along with procaptcha.  If not, see <http://www.gnu.org/licenses/>.
 // import {Hash} from '@polkadot/types/interfaces';
 const ProsopoContractBase_1 = tslib_1.__importDefault(require("./ProsopoContractBase"));
-// TODO: import return types from provider: separate types/common package.
 class ProsopoContract extends ProsopoContractBase_1.default {
     async getRandomProvider() {
         return await this.query('getRandomActiveProvider', [this.account.address, this.dappAddress]);
@@ -30,9 +29,8 @@ class ProsopoContract extends ProsopoContractBase_1.default {
     async dappUserCommit(signer, captchaDatasetId, userMerkleTreeRoot, providerAddress) {
         return await this.transaction(signer, 'dappUserCommit', [this.dappAddress, captchaDatasetId, userMerkleTreeRoot, providerAddress]);
     }
-    async dappOperatorIsHumanUser(threshold) {
-        // TODO get threshold from dapp contract using getStorage or allow override in UI and fallback on contract protection layer?
-        return await this.query('dappOperatorIsHumanUser', [this.account.address, threshold]);
+    async dappOperatorIsHumanUser(solutionThreshold) {
+        return await this.query('dappOperatorIsHumanUser', [this.account.address, solutionThreshold]);
     }
 }
 exports.ProsopoContract = ProsopoContract;

package/dist/api/ProsopoContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProsopoContract.js","sourceRoot":"","sources":["../../src/api/ProsopoContract.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,mDAAmD;AACnD,wFAAwD;AAMxD,0EAA0E;AAC1E,MAAa,eAAgB,SAAQ,6BAAmB;IAE7C,KAAK,CAAC,iBAAiB;QAC1B,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAkC,CAAC;IAClI,CAAC;IAEM,KAAK,CAAC,4BAA4B,CAAC,YAAoB;QAC1D,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,YAAY,CAAC,CAA8B,CAAC;IACzG,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,gBAAwB,EAAE,kBAA0B,EAAE,eAAuB;QACrH,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAC;IACvI,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,SAAiB;QAClD,4HAA4H;QAC5H,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAA2C,CAAC;IACpI,CAAC;CAIJ;AArBD,0CAqBC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"ProsopoContract.js","sourceRoot":"","sources":["../../src/api/ProsopoContract.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,mDAAmD;AACnD,wFAAwD;AAOxD,MAAa,eAAgB,SAAQ,6BAAmB;IAE7C,KAAK,CAAC,iBAAiB;QAC1B,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAkC,CAAC;IAClI,CAAC;IAEM,KAAK,CAAC,4BAA4B,CAAC,YAAoB;QAC1D,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,YAAY,CAAC,CAA8B,CAAC;IACzG,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,gBAAwB,EAAE,kBAA0B,EAAE,eAAuB;QACrH,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAC;IACvI,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,iBAAyB;QAE1D,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAA2C,CAAC;IAC5I,CAAC;CAIJ;AArBD,0CAqBC;AAED,kBAAe,eAAe,CAAC"}

package/dist/api/ProsopoContractBase.d.ts

@@ -14,16 +14,17 @@ export declare class ProsopoContractBase extends AsyncFactory {
     protected dappAddress: string;
     address: string;
     /**
-     * @param address
-     * @param dappAddress
-     * @param account
-     * @param providerInterface
-     */
+   * @param address
+   * @param dappAddress
+   * @param account
+   * @param providerInterface
+   */
     init(address: string, dappAddress: string, account: InjectedAccountWithMeta, providerInterface: ProviderInterface): Promise<this>;
     getApi(): ApiPromise;
     getContract(): ContractPromise;
     getAccount(): InjectedAccountWithMeta;
     getDappAddress(): string;
+    disconnect(): Promise<void>;
     query<T>(method: string, args: any[]): Promise<T | AnyJson | null>;
     transaction(signer: Signer, method: string, args: any[]): Promise<TransactionResponse>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ProsopoContractBase.d.ts","sourceRoot":"","sources":["../../src/api/ProsopoContractBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAqB,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,qBAAa,mBAAoB,SAAQ,YAAY;IAEnD,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IACnB,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC;IACpC,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAC3C,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAEvB,OAAO,EAAE,MAAM,CAAC;IAEvB;;;;;OAKG;IACU,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB;IAUvH,MAAM,IAAI,UAAU;IAIpB,WAAW,IAAI,eAAe;IAI9B,UAAU,IAAI,uBAAuB;IAIrC,cAAc,IAAI,MAAM;IAIlB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;IA0BlE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAwEpG;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"ProsopoContractBase.d.ts","sourceRoot":"","sources":["../../src/api/ProsopoContractBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAqB,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAK1C,qBAAa,mBAAoB,SAAQ,YAAY;IAEjD,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IACnB,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC;IACpC,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAC3C,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAEvB,OAAO,EAAE,MAAM,CAAC;IAEvB;;;;;KAKC;IACY,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB;IAUvH,MAAM,IAAI,UAAU;IAIpB,WAAW,IAAI,eAAe;IAI9B,UAAU,IAAI,uBAAuB;IAIrC,cAAc,IAAI,MAAM;IAIlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;IA0BlE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAwEtG;AAED,eAAe,mBAAmB,CAAC"}

package/dist/api/ProsopoContractBase.js

@@ -29,11 +29,11 @@ class ProsopoContractBase extends AsyncFactory_1.default {
     dappAddress;
     address;
     /**
-     * @param address
-     * @param dappAddress
-     * @param account
-     * @param providerInterface
-     */
+   * @param address
+   * @param dappAddress
+   * @param account
+   * @param providerInterface
+   */
     async init(address, dappAddress, account, providerInterface) {
         this.api = await api_1.ApiPromise.create({ provider: providerInterface });
         this.abi = new api_contract_1.Abi(contract_1.abiJson, this.api.registry.getChainProperties());
@@ -55,6 +55,9 @@ class ProsopoContractBase extends AsyncFactory_1.default {
     getDappAddress() {
         return this.dappAddress;
     }
+    async disconnect() {
+        await this.api.disconnect();
+    }
     async query(method, args) {
         try {
             const abiMessage = this.abi.findMessage(method);
@@ -80,7 +83,6 @@ class ProsopoContractBase extends AsyncFactory_1.default {
     // https://polkadot.js.org/docs/api/cookbook/tx/
     // https://polkadot.js.org/docs/api/start/api.tx.subs/
     async transaction(signer, method, args) {
-        // TODO if DEBUG==true || env.development
         const queryBeforeTx = await this.query(method, args);
         console.log("QUERY BEFORE TX....................", queryBeforeTx);
         const abiMessage = this.abi.findMessage(method);
@@ -112,7 +114,6 @@ class ProsopoContractBase extends AsyncFactory_1.default {
                     const blockHash = status.asInBlock.toHex();
                     resolve({ dispatchError, dispatchInfo, events, internalError, status, txHash, txIndex, blockHash });
                 }
-                // TODO
                 // Instant seal OFF.
                 // if (status?.isFinalized) {
                 //   const blockHash = status.asFinalized.toHex();

package/dist/api/ProsopoContractBase.js.map

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

package/dist/api/ProviderApi.d.ts

@@ -1,13 +1,9 @@
 import HttpClientBase from "./HttpClientBase";
-import { ProsopoCaptchaConfig, ProsopoRandomProviderResponse, GetCaptchaResponse, CaptchaSolution, CaptchaSolutionResponse } from '../types';
+import { ProsopoCaptchaConfig, ProsopoRandomProviderResponse, GetCaptchaResponse, CaptchaSolutionResponse } from '../types';
+import { CaptchaSolution } from "@prosopo/contract";
 export declare class ProviderApi extends HttpClientBase {
-    protected config: ProsopoCaptchaConfig;
+    private config;
     constructor(config: ProsopoCaptchaConfig);
-    /**
-     *
-     * @deprecated use ProsopoContract$getRandomProvider instead.
-     */
-    getRandomProvider(): Promise<import("axios").AxiosResponse<any, any>>;
     getProviders(): Promise<{
         accounts: string[];
     }>;
@@ -15,7 +11,7 @@ export declare class ProviderApi extends HttpClientBase {
         contractAddress: string;
     }>;
     getCaptchaChallenge(randomProvider: ProsopoRandomProviderResponse): Promise<GetCaptchaResponse>;
-    submitCaptchaSolution(blockHash: string, captchas: CaptchaSolution[], requestHash: string, txHash: string, userAccount: string): Promise<CaptchaSolutionResponse>;
+    submitCaptchaSolution(captchas: CaptchaSolution[], requestHash: string, userAccount: string, salt: string, blockHash?: string, txHash?: string, web2?: boolean): Promise<CaptchaSolutionResponse>;
 }
 export default ProviderApi;
 //# sourceMappingURL=ProviderApi.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":"AAeA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAE7I,qBAAa,WAAY,SAAQ,cAAc;IAE7C,SAAS,CAAC,MAAM,EAAE,oBAAoB,CAAC;gBAE3B,MAAM,EAAE,oBAAoB;IAKxC;;;OAGG;IACI,iBAAiB;IAKjB,YAAY,IAAI,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAC,CAAC;IAI7C,kBAAkB,IAAI,OAAO,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAC,CAAC;IAIxD,mBAAmB,CAAC,cAAc,EAAE,6BAA6B,GAAI,OAAO,CAAC,kBAAkB,CAAC;IAOhG,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAI,OAAO,CAAC,uBAAuB,CAAC;CAI1K;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"ProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":"AAeA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACH,oBAAoB,EACpB,6BAA6B,EAC7B,kBAAkB,EAClB,uBAAuB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,WAAY,SAAQ,cAAc;IAE3C,OAAO,CAAC,MAAM,CAAuB;gBAEzB,MAAM,EAAE,oBAAoB;IAKjC,YAAY,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAI/C,kBAAkB,IAAI,OAAO,CAAC;QAAE,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC;IAI1D,mBAAmB,CAAC,cAAc,EAAE,6BAA6B,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAQ/F,qBAAqB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAa3M;AAED,eAAe,WAAW,CAAC"}

package/dist/api/ProviderApi.js

@@ -25,14 +25,6 @@ class ProviderApi extends HttpClientBase_1.default {
         super(config['providerApi.baseURL'], config['providerApi.prefix']);
         this.config = config;
     }
-    /**
-     *
-     * @deprecated use ProsopoContract$getRandomProvider instead.
-     */
-    getRandomProvider() {
-        const userAccount = storage_1.default.getAccount();
-        return this.axios.get(`/random_provider/${userAccount}/${this.config['dappAccount']}`);
-    }
     getProviders() {
         return this.axios.get(`/providers`);
     }
@@ -40,13 +32,23 @@ class ProviderApi extends HttpClientBase_1.default {
         return this.axios.get(`/contract_address`);
     }
     getCaptchaChallenge(randomProvider) {
-        let { provider, blockNumber } = randomProvider;
-        blockNumber = blockNumber.replace(/,/g, ''); // TODO: middleware schema parser/validator.
+        const { provider } = randomProvider;
+        let { blockNumber } = randomProvider;
+        blockNumber = blockNumber.replace(/,/g, '');
         const userAccount = storage_1.default.getAccount();
         return this.axios.get(`/provider/captcha/${provider.captchaDatasetId}/${userAccount}/${this.config['dappAccount']}/${blockNumber}`);
     }
-    submitCaptchaSolution(blockHash, captchas, requestHash, txHash, userAccount) {
-        return this.axios.post(`/provider/solution`, { blockHash, captchas, requestHash, txHash, userAccount, dappAccount: this.config['dappAccount'] });
+    submitCaptchaSolution(captchas, requestHash, userAccount, salt, blockHash, txHash, web2) {
+        return this.axios.post(`/provider/solution`, {
+            blockHash,
+            captchas,
+            requestHash,
+            txHash,
+            userAccount,
+            dappAccount: this.config['dappAccount'],
+            web2,
+            salt
+        });
     }
 }
 exports.ProviderApi = ProviderApi;

package/dist/api/ProviderApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderApi.js","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,8EAA8C;AAC9C,yEAAyC;AAGzC,MAAa,WAAY,SAAQ,wBAAc;IAEnC,MAAM,CAAuB;IAEvC,YAAY,MAA4B;QACtC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;OAGG;IACI,iBAAiB;QACtB,MAAM,WAAW,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC7C,CAAC;IAEM,mBAAmB,CAAC,cAA6C;QACtE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC;QAC/C,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,4CAA4C;QACzF,MAAM,WAAW,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,qBAAqB,QAAQ,CAAC,gBAAgB,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IACtI,CAAC;IAEM,qBAAqB,CAAC,SAAiB,EAAE,QAA2B,EAAE,WAAmB,EAAE,MAAc,EAAE,WAAmB;QACnI,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAC,CAAC,CAAC;IACjJ,CAAC;CAEF;AArCD,kCAqCC;AAED,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"ProviderApi.js","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,8EAA8E;AAC9E,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,8EAA8C;AAC9C,yEAAyC;AASzC,MAAa,WAAY,SAAQ,wBAAc;IAEnC,MAAM,CAAuB;IAErC,YAAY,MAA4B;QACpC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC/C,CAAC;IAEM,mBAAmB,CAAC,cAA6C;QACpE,MAAM,EAAC,QAAQ,EAAC,GAAG,cAAc,CAAC;QAClC,IAAI,EAAC,WAAW,EAAC,GAAG,cAAc,CAAC;QACnC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,qBAAqB,QAAQ,CAAC,gBAAgB,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IACxI,CAAC;IAEM,qBAAqB,CAAC,QAA2B,EAAE,WAAmB,EAAE,WAAmB,EAAE,IAAY,EAAE,SAAkB,EAAE,MAAe,EAAE,IAAc;QACjK,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE;YACzC,SAAS;YACT,QAAQ;YACR,WAAW;YACX,MAAM;YACN,WAAW;YACX,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACvC,IAAI;YACJ,IAAI;SACP,CAAC,CAAC;IACP,CAAC;CAEJ;AAtCD,kCAsCC;AAED,kBAAe,WAAW,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../src/api/handlers.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;CAUrE"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../src/api/handlers.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;gBAC1B,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;CAUvE"}