@prosopo/procaptcha 0.1.7 → 0.1.9

package/dist/api/ProsopoContract.d.ts

@@ -0,0 +1,13 @@
+import ProsopoContractBase from "./ProsopoContractBase";
+import { Signer } from '@polkadot/api/types';
+import { ProsopoDappOperatorIsHumanUserResponse, TransactionResponse } from '../types';
+import { ProsopoRandomProviderResponse } from "../types";
+import { CaptchaSolutionCommitment } from "@prosopo/datasets";
+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(solutionThreshold: number): Promise<ProsopoDappOperatorIsHumanUserResponse>;
+}
+export default ProsopoContract;
+//# sourceMappingURL=ProsopoContract.d.ts.map

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

@@ -0,0 +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;AAE9D,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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProsopoContract = 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/>.
+// import {Hash} from '@polkadot/types/interfaces';
+const ProsopoContractBase_1 = tslib_1.__importDefault(require("./ProsopoContractBase"));
+class ProsopoContract extends ProsopoContractBase_1.default {
+    async getRandomProvider() {
+        return await this.query('getRandomActiveProvider', [this.account.address, this.dappAddress]);
+    }
+    async getCaptchaSolutionCommitment(commitmentId) {
+        return await this.query('getCaptchaSolutionCommitment', [commitmentId]);
+    }
+    async dappUserCommit(signer, captchaDatasetId, userMerkleTreeRoot, providerAddress) {
+        return await this.transaction(signer, 'dappUserCommit', [this.dappAddress, captchaDatasetId, userMerkleTreeRoot, providerAddress]);
+    }
+    async dappOperatorIsHumanUser(solutionThreshold) {
+        return await this.query('dappOperatorIsHumanUser', [this.account.address, solutionThreshold]);
+    }
+}
+exports.ProsopoContract = ProsopoContract;
+exports.default = ProsopoContract;
+//# sourceMappingURL=ProsopoContract.js.map

package/dist/api/ProsopoContract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProsopoContract.js","sourceRoot":"","sources":["../../src/api/ProsopoContract.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,mDAAmD;AACnD,wFAAwD;AAMxD,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

@@ -0,0 +1,32 @@
+import { ApiPromise } from "@polkadot/api";
+import { Abi, ContractPromise } from "@polkadot/api-contract";
+import { InjectedAccountWithMeta } from "@polkadot/extension-inject/types";
+import { AnyJson } from "@polkadot/types/types/codec";
+import { ProviderInterface } from "@polkadot/rpc-provider/types";
+import { Signer } from "@polkadot/api/types";
+import { TransactionResponse } from '../types';
+import AsyncFactory from "./AsyncFactory";
+export declare class ProsopoContractBase extends AsyncFactory {
+    protected api: ApiPromise;
+    protected abi: Abi;
+    protected contract: ContractPromise;
+    protected account: InjectedAccountWithMeta;
+    protected dappAddress: string;
+    address: string;
+    /**
+   * @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>;
+}
+export default ProsopoContractBase;
+//# sourceMappingURL=ProsopoContractBase.d.ts.map

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

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

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProsopoContractBase = 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 api_1 = require("@polkadot/api");
+const api_contract_1 = require("@polkadot/api-contract");
+const contract_1 = require("@prosopo/contract");
+const AsyncFactory_1 = tslib_1.__importDefault(require("./AsyncFactory"));
+class ProsopoContractBase extends AsyncFactory_1.default {
+    api;
+    abi;
+    contract;
+    account;
+    dappAddress;
+    address;
+    /**
+   * @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());
+        this.contract = new api_contract_1.ContractPromise(this.api, this.abi, address);
+        this.address = address;
+        this.dappAddress = dappAddress;
+        this.account = account;
+        return this;
+    }
+    getApi() {
+        return this.api;
+    }
+    getContract() {
+        return this.contract;
+    }
+    getAccount() {
+        return this.account;
+    }
+    getDappAddress() {
+        return this.dappAddress;
+    }
+    async disconnect() {
+        await this.api.disconnect();
+    }
+    async query(method, args) {
+        try {
+            const abiMessage = this.abi.findMessage(method);
+            const response = await this.contract.query[method](this.account.address, {}, ...(0, contract_1.encodeStringArgs)(abiMessage, args));
+            console.log("QUERY RESPONSE", method, args, response);
+            if (response.result.isOk) {
+                if (response.output) {
+                    return (0, contract_1.unwrap)(response.output.toHuman());
+                }
+                else {
+                    return null;
+                }
+            }
+            else {
+                throw new contract_1.ProsopoContractError(response.result.asErr);
+            }
+        }
+        catch (e) {
+            console.error("ERROR", e);
+            return null;
+        }
+    }
+    // https://polkadot.js.org/docs/api/cookbook/tx/
+    // https://polkadot.js.org/docs/api/start/api.tx.subs/
+    async transaction(signer, method, args) {
+        const queryBeforeTx = await this.query(method, args);
+        console.log("QUERY BEFORE TX....................", queryBeforeTx);
+        const abiMessage = this.abi.findMessage(method);
+        const extrinsic = this.contract.tx[method]({}, ...(0, contract_1.encodeStringArgs)(abiMessage, args));
+        // this.api.setSigner(signer);
+        // const response = await buildTx(this.api.registry, extrinsic, this.account.address, { signer });
+        // console.log("buildTx RESPONSE", response);
+        // return;
+        return new Promise((resolve, reject) => {
+            extrinsic.signAndSend(this.account.address, { signer }, (result) => {
+                const { dispatchError, dispatchInfo, events, internalError, status, txHash, txIndex } = result;
+                console.log("TX STATUS", status.type);
+                console.log("IS FINALIZED", status?.isFinalized);
+                console.log("IN BLOCK", status?.isInBlock);
+                console.log("EVENTS", events);
+                if (internalError) {
+                    console.error("internalError", internalError);
+                    reject(internalError);
+                    return;
+                }
+                if (dispatchError) {
+                    console.error("dispatchError", dispatchError);
+                    reject(dispatchError);
+                    return;
+                }
+                // [Ready, InBlock, Finalized...]
+                // Instant seal ON.
+                if (status?.isInBlock) {
+                    const blockHash = status.asInBlock.toHex();
+                    resolve({ dispatchError, dispatchInfo, events, internalError, status, txHash, txIndex, blockHash });
+                }
+                // Instant seal OFF.
+                // if (status?.isFinalized) {
+                //   const blockHash = status.asFinalized.toHex();
+                //   resolve({ dispatchError, dispatchInfo, events, internalError, status, txHash, txIndex, blockHash });
+                // }
+            })
+                .catch((e) => {
+                console.error("signAndSend ERROR", e);
+                reject(e);
+            });
+        });
+    }
+}
+exports.ProsopoContractBase = ProsopoContractBase;
+exports.default = ProsopoContractBase;
+//# sourceMappingURL=ProsopoContractBase.js.map

package/dist/api/ProsopoContractBase.js.map

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

package/dist/api/ProviderApi.d.ts

@@ -0,0 +1,14 @@
+import HttpClientBase from "./HttpClientBase";
+import { CaptchaSolutionResponse, GetCaptchaResponse, ProsopoCaptchaConfig, ProsopoRandomProviderResponse } from '../types';
+import { CaptchaSolution } from "@prosopo/datasets";
+export declare class ProviderApi extends HttpClientBase {
+    private config;
+    constructor(config: ProsopoCaptchaConfig);
+    getProviders(): Promise<{
+        accounts: string[];
+    }>;
+    getCaptchaChallenge(randomProvider: ProsopoRandomProviderResponse): Promise<GetCaptchaResponse>;
+    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

@@ -0,0 +1 @@
+{"version":3,"file":"ProviderApi.d.ts","sourceRoot":"","sources":["../../src/api/ProviderApi.ts"],"names":[],"mappings":"AAeA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACH,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,6BAA6B,EAChC,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,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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderApi = 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 HttpClientBase_1 = tslib_1.__importDefault(require("./HttpClientBase"));
+const storage_1 = tslib_1.__importDefault(require("../modules/storage"));
+class ProviderApi extends HttpClientBase_1.default {
+    config;
+    constructor(config) {
+        super(config['providerApi.baseURL'], config['providerApi.prefix']);
+        this.config = config;
+    }
+    getProviders() {
+        return this.axios.get(`/providers`);
+    }
+    getCaptchaChallenge(randomProvider) {
+        const { provider } = randomProvider;
+        let { blockNumber } = randomProvider;
+        blockNumber = blockNumber.replace(/,/g, '');
+        const userAccount = storage_1.default.getAccount();
+        return this.axios.get(`/provider/captcha/${provider.datasetId}/${userAccount}/${this.config['dappAccount']}/${blockNumber}`);
+    }
+    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;
+exports.default = ProviderApi;
+//# sourceMappingURL=ProviderApi.js.map

package/dist/api/ProviderApi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProviderApi.js","sourceRoot":"","sources":["../../src/api/ProviderApi.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,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,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,SAAS,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IACjI,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;AAlCD,kCAkCC;AAED,kBAAe,WAAW,CAAC"}

package/dist/api/handlers.d.ts

@@ -0,0 +1,5 @@
+import { AxiosResponse } from "axios";
+export declare class ProsopoApiError extends Error {
+    constructor(error: AxiosResponse, context?: string, ...params: any[]);
+}
+//# sourceMappingURL=handlers.d.ts.map

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

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

package/dist/api/handlers.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProsopoApiError = void 0;
+class ProsopoApiError extends Error {
+    constructor(error, context, ...params) {
+        if ("data" in error) {
+            super(error.data.message);
+        }
+        else if ("statusText" in error) {
+            super(error.statusText);
+        }
+        else {
+            super(error.toString());
+        }
+        this.name = context && `${ProsopoApiError.name}@${context}` || ProsopoApiError.name;
+        console.error('\n********************* ERROR *********************\n');
+        console.error(this.cause, this.stack, ...params);
+    }
+}
+exports.ProsopoApiError = ProsopoApiError;
+//# sourceMappingURL=handlers.js.map

package/dist/api/handlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/api/handlers.ts"],"names":[],"mappings":";;;AAkBA,MAAa,eAAgB,SAAQ,KAAK;IACtC,YAAY,KAAoB,EAAE,OAAgB,EAAE,GAAG,MAAa;QAChE,IAAG,MAAM,IAAI,KAAK,EAAE;YAChB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAC5B;aAAM,IAAI,YAAY,IAAI,KAAK,EAAE;YAC9B,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;SAC1B;aAAM;YACH,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC1B;QAED,IAAI,CAAC,IAAI,GAAG,OAAO,IAAI,GAAG,eAAe,CAAC,IAAI,IAAI,OAAO,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC;QAGpF,OAAO,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACvE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;IACrD,CAAC;CACJ;AAhBD,0CAgBC"}

package/dist/api/index.d.ts

@@ -0,0 +1,8 @@
+export * from './AsyncFactory';
+export * from './ExtensionWeb3';
+export * from './ExtensionWeb2';
+export * from './HttpClientBase';
+export * from './ProsopoContract';
+export * from './ProsopoContractBase';
+export * from './ProviderApi';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAeA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC"}

package/dist/api/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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/>.
+tslib_1.__exportStar(require("./AsyncFactory"), exports);
+tslib_1.__exportStar(require("./ExtensionWeb3"), exports);
+tslib_1.__exportStar(require("./ExtensionWeb2"), exports);
+tslib_1.__exportStar(require("./HttpClientBase"), exports);
+tslib_1.__exportStar(require("./ProsopoContract"), exports);
+tslib_1.__exportStar(require("./ProsopoContractBase"), exports);
+tslib_1.__exportStar(require("./ProviderApi"), exports);
+//# sourceMappingURL=index.js.map

package/dist/api/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.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,yDAA+B;AAC/B,0DAAgC;AAChC,0DAAgC;AAChC,2DAAiC;AACjC,4DAAkC;AAClC,gEAAsC;AACtC,wDAA8B"}

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from './api';
+export * from './modules';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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/>.
+tslib_1.__exportStar(require("./api"), exports);
+tslib_1.__exportStar(require("./modules"), exports);
+tslib_1.__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.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,gDAAsB;AACtB,oDAA0B;AAC1B,kDAAwB"}

package/dist/modules/ProsopoCaptchaApi.d.ts

@@ -0,0 +1,21 @@
+import { CaptchaSolution } from "@prosopo/datasets";
+import { Signer } from "@polkadot/api/types";
+import { GetCaptchaResponse, ProsopoRandomProviderResponse } from "../types/api";
+import ProviderApi from "../api/ProviderApi";
+import ProsopoContract from "../api/ProsopoContract";
+import { TCaptchaSubmitResult } from '../types/client';
+export declare type SubmitFunction = typeof ProsopoCaptchaApi.prototype.submitCaptchaSolutionWeb3 | typeof ProsopoCaptchaApi.prototype.submitCaptchaSolutionWeb2;
+export declare class ProsopoCaptchaApi {
+    protected contract: ProsopoContract;
+    protected provider: ProsopoRandomProviderResponse;
+    protected providerApi: ProviderApi;
+    protected submitCaptchaFn: SubmitFunction;
+    constructor(contract: ProsopoContract, provider: ProsopoRandomProviderResponse, providerApi: ProviderApi, web2: boolean);
+    getCaptchaChallenge(): Promise<GetCaptchaResponse>;
+    verifyCaptchaChallengeContent(provider: ProsopoRandomProviderResponse, captchaChallenge: GetCaptchaResponse): void;
+    submitCaptchaSolution(signer: Signer, requestHash: string, datasetId: string, solutions: CaptchaSolution[]): Promise<TCaptchaSubmitResult>;
+    submitCaptchaSolutionWeb2(signer: Signer, requestHash: string, datasetId: string, solutions: CaptchaSolution[]): Promise<TCaptchaSubmitResult>;
+    submitCaptchaSolutionWeb3(signer: Signer, requestHash: string, datasetId: string, solutions: CaptchaSolution[]): Promise<TCaptchaSubmitResult>;
+}
+export default ProsopoCaptchaApi;
+//# sourceMappingURL=ProsopoCaptchaApi.d.ts.map

package/dist/modules/ProsopoCaptchaApi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProsopoCaptchaApi.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,eAAe,EAElB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAA2B,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAG1G,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,eAAe,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAMrD,oBAAY,cAAc,GACtB,OAAO,iBAAiB,CAAC,SAAS,CAAC,yBAAyB,GAC1D,OAAO,iBAAiB,CAAC,SAAS,CAAC,yBAAyB,CAAC;AAEnE,qBAAa,iBAAiB;IAE1B,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC;IACpC,SAAS,CAAC,QAAQ,EAAE,6BAA6B,CAAC;IAClD,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,eAAe,EAAE,cAAc,CAAA;gBAE7B,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,6BAA6B,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAO1G,mBAAmB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAWxD,6BAA6B,CAAC,QAAQ,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,kBAAkB,GAAG,IAAI;IAkB5G,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAIjJ,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmBvI,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAI,OAAO,CAAC,oBAAoB,CAAC;CA+C/J;AAED,eAAe,iBAAiB,CAAC"}

package/dist/modules/ProsopoCaptchaApi.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProsopoCaptchaApi = 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 util_crypto_1 = require("@polkadot/util-crypto");
+const datasets_1 = require("@prosopo/datasets");
+const handlers_1 = require("../api/handlers");
+const contract_1 = require("@prosopo/contract");
+const datasets_2 = require("@prosopo/datasets");
+class ProsopoCaptchaApi {
+    contract;
+    provider;
+    providerApi;
+    submitCaptchaFn;
+    constructor(contract, provider, providerApi, web2) {
+        this.contract = contract;
+        this.provider = provider;
+        this.providerApi = providerApi;
+        this.submitCaptchaFn = web2 ? this.submitCaptchaSolutionWeb2 : this.submitCaptchaSolutionWeb3;
+    }
+    async getCaptchaChallenge() {
+        let captchaChallenge;
+        try {
+            captchaChallenge = await this.providerApi.getCaptchaChallenge(this.provider);
+            this.verifyCaptchaChallengeContent(this.provider, captchaChallenge);
+        }
+        catch (err) {
+            throw new contract_1.ProsopoEnvError(err);
+        }
+        return captchaChallenge;
+    }
+    verifyCaptchaChallengeContent(provider, captchaChallenge) {
+        // TODO make sure root is equal to root on the provider
+        const proofLength = captchaChallenge.captchas[0].proof.length;
+        console.log(provider.provider);
+        console.log(provider.provider.datasetIdContent, captchaChallenge.captchas[0].proof[proofLength - 1][0]);
+        if (provider.provider.datasetIdContent !== captchaChallenge.captchas[0].proof[proofLength - 1][0]) {
+            throw new contract_1.ProsopoEnvError("CAPTCHA.INVALID_DATASET_CONTENT_ID");
+        }
+        for (const captchaWithProof of captchaChallenge.captchas) {
+            if (!(0, datasets_1.verifyProof)(captchaWithProof.captcha.captchaContentId, captchaWithProof.proof)) {
+                throw new contract_1.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE");
+            }
+        }
+        console.log("CAPTCHA.CHALLENGE_VERIFIED");
+        return;
+    }
+    async submitCaptchaSolution(signer, requestHash, datasetId, solutions) {
+        return this.submitCaptchaFn(signer, requestHash, datasetId, solutions);
+    }
+    async submitCaptchaSolutionWeb2(signer, requestHash, datasetId, solutions) {
+        const salt = (0, util_crypto_1.randomAsHex)();
+        const captchaSolutionsSalted = solutions.map((captcha) => ({
+            ...captcha,
+            salt,
+        }));
+        let result;
+        try {
+            result = await this.providerApi.submitCaptchaSolution(captchaSolutionsSalted, requestHash, this.contract.getAccount().address, salt, undefined, undefined, true);
+        }
+        catch (err) {
+            throw new handlers_1.ProsopoApiError(err);
+        }
+        return [result, undefined, undefined];
+    }
+    async submitCaptchaSolutionWeb3(signer, requestHash, datasetId, solutions) {
+        const salt = (0, util_crypto_1.randomAsHex)();
+        const tree = new datasets_1.CaptchaMerkleTree();
+        const captchaSolutionsSalted = solutions.map((captcha) => ({
+            ...captcha,
+            salt,
+        }));
+        const captchasHashed = captchaSolutionsSalted.map((captcha) => (0, datasets_2.computeCaptchaSolutionHash)(captcha));
+        tree.build(captchasHashed);
+        const commitmentId = tree.root.hash;
+        console.log("solveCaptchaChallenge commitmentId", commitmentId);
+        // console.log("solveCaptchaChallenge USER ACCOUNT", this.contract.getAccount().address);
+        // console.log("solveCaptchaChallenge DAPP ACCOUNT", this.contract.getDappAddress());
+        // console.log("solveCaptchaChallenge CONTRACT ADDRESS", this.contract.getContract().address.toString());
+        let tx;
+        try {
+            tx = await this.contract.dappUserCommit(signer, datasetId, commitmentId, this.provider.providerId);
+        }
+        catch (err) {
+            throw new contract_1.ProsopoEnvError(err);
+        }
+        let result;
+        try {
+            result = await this.providerApi.submitCaptchaSolution(captchaSolutionsSalted, requestHash, this.contract.getAccount().address, salt, tx.blockHash, tx.txHash.toString());
+        }
+        catch (err) {
+            throw new handlers_1.ProsopoApiError(err);
+        }
+        let commitment;
+        try {
+            commitment = await this.contract.getCaptchaSolutionCommitment(commitmentId);
+        }
+        catch (err) {
+            throw new contract_1.ProsopoEnvError(err);
+        }
+        return [result, tx, commitment];
+    }
+}
+exports.ProsopoCaptchaApi = ProsopoCaptchaApi;
+exports.default = ProsopoCaptchaApi;
+//# sourceMappingURL=ProsopoCaptchaApi.js.map

package/dist/modules/ProsopoCaptchaApi.js.map

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

package/dist/modules/ProsopoCaptchaClient.d.ts

@@ -0,0 +1,26 @@
+import { CaptchaEventCallbacks, ICaptchaContextReducer, ICaptchaStatusReducer, IExtensionInterface, TExtensionAccount } from "../types/client";
+import { ProsopoRandomProviderResponse } from "../types/api";
+import { ProsopoContract } from "../api/ProsopoContract";
+import { ProviderApi } from "../api/ProviderApi";
+import { ProsopoCaptchaApi } from "./ProsopoCaptchaApi";
+export declare class ProsopoCaptchaClient {
+    manager: ICaptchaContextReducer;
+    status: ICaptchaStatusReducer;
+    callbacks: CaptchaEventCallbacks | undefined;
+    providerApi: ProviderApi;
+    private static extension;
+    private static contract;
+    private static provider;
+    private static captchaApi;
+    constructor(manager: ICaptchaContextReducer, status: ICaptchaStatusReducer, callbacks?: CaptchaEventCallbacks);
+    getExtension(): IExtensionInterface;
+    setExtension(extension: IExtensionInterface): void;
+    getContract(): ProsopoContract | undefined;
+    getProvider(): ProsopoRandomProviderResponse | undefined;
+    getCaptchaApi(): ProsopoCaptchaApi | undefined;
+    onLoad(createAccount?: boolean): Promise<void>;
+    onAccountChange(account?: TExtensionAccount): Promise<void>;
+    onAccountUnset(): void;
+}
+export default ProsopoCaptchaClient;
+//# sourceMappingURL=ProsopoCaptchaClient.d.ts.map

package/dist/modules/ProsopoCaptchaClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProsopoCaptchaClient.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaClient.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,6BAA6B,EAAC,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAGtD,qBAAa,oBAAoB;IAEtB,OAAO,EAAE,sBAAsB,CAAC;IAChC,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC7C,WAAW,EAAE,WAAW,CAAC;IAEhC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAsB;IAC9C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA8B;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA4C;IACnE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAgC;gBAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,qBAAqB,EAAE,SAAS,CAAC,EAAE,qBAAqB;IAOtG,YAAY;IAIZ,YAAY,CAAC,SAAS,EAAE,mBAAmB;IAI3C,WAAW;IAIX,WAAW;IAIX,aAAa;IAIP,MAAM,CAAC,aAAa,CAAC,EAAE,OAAO;IAsC9B,eAAe,CAAC,OAAO,CAAC,EAAE,iBAAiB;IA2CjD,cAAc;CAYxB;AAED,eAAe,oBAAoB,CAAC"}