@prosopo/procaptcha 0.1.9 → 0.1.10

package/dist/modules/Manager.js

@@ -0,0 +1,346 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Manager = exports.defaultState = void 0;
+const tslib_1 = require("tslib");
+const ProsopoContract_1 = tslib_1.__importDefault(require("../api/ProsopoContract"));
+const rpc_provider_1 = require("@polkadot/rpc-provider");
+const storage_1 = tslib_1.__importDefault(require("./storage"));
+const api_1 = require("@prosopo/api");
+const util_1 = require("@polkadot/util");
+const ProsopoCaptchaApi_1 = tslib_1.__importDefault(require("./ProsopoCaptchaApi"));
+const utils_1 = require("../utils/utils");
+const ExtensionWeb2_1 = tslib_1.__importDefault(require("../api/ExtensionWeb2"));
+const ExtensionWeb3_1 = tslib_1.__importDefault(require("../api/ExtensionWeb3"));
+const util_crypto_1 = require("@polkadot/util-crypto");
+const defaultState = () => {
+    return {
+        // note order matters! see buildUpdateState. These fields are set in order, so disable modal first, then set loading to false, etc.
+        showModal: false,
+        loading: false,
+        challenge: undefined,
+        solutions: [],
+        index: -1,
+        isHuman: false,
+        captchaApi: undefined,
+        account: undefined,
+    };
+};
+exports.defaultState = defaultState;
+const buildUpdateState = (state, onStateUpdate) => {
+    const updateCurrentState = (nextState) => {
+        // mutate the current state. Note that this is in order of properties in the nextState object.
+        // e.g. given {b: 2, c: 3, a: 1}, b will be set, then c, then a. This is because JS stores fields in insertion order by default, unless you override it with a class or such by changing the key enumeration order.
+        for (const key in nextState) {
+            state[key] = nextState[key];
+        }
+        // then call the update function for the frontend to do the same
+        onStateUpdate(nextState);
+        console.log('Procaptcha state update:', nextState, '\nResult:', state);
+    };
+    return updateCurrentState;
+};
+/**
+ * The state operator. This is used to mutate the state of Procaptcha during the captcha process. State updates are published via the onStateUpdate callback. This should be used by frontends, e.g. react, to maintain the state of Procaptcha across renders.
+ */
+const Manager = (configOptional, state, onStateUpdate, callbacks) => {
+    // events are emitted at various points during the captcha process. These each have default behaviours below which can be overridden by the frontend using callbacks.
+    const events = Object.assign({
+        onAccountNotFound: (address) => {
+            alert(`Account ${address} not found`);
+        },
+        onError: (error) => {
+            alert(error ? error.message : 'An error occurred');
+        },
+        onHuman: (output) => {
+            console.log('onHuman event triggered', output);
+        },
+        onExtensionNotFound: () => {
+            alert('No extension found');
+        },
+    }, callbacks);
+    // mapping of type of error to relevant event callback
+    const errorToEventMap = {
+        AccountNotFoundError: events.onAccountNotFound,
+        ExtensionNotFoundError: events.onExtensionNotFound,
+        Error: events.onError,
+    };
+    // get the state update mechanism
+    const updateState = buildUpdateState(state, onStateUpdate);
+    /**
+     * Build the config on demand, using the optional config passed in from the outside. State may override various config values depending on the state of the captcha process. E.g. if the process has been started using account "ABC" and then the user changes account to "DEF" via the optional config prop, the account in use will not change. This is because the captcha process has already been started using account "ABC".
+     * @returns the config for procaptcha
+     */
+    const getConfig = () => {
+        const config = {
+            web2: false,
+            userAccountAddress: '',
+            ...configOptional,
+        };
+        // overwrite the account in use with the one in state if it exists. Reduces likelihood of bugs where the user changes account in the middle of the captcha process.
+        if (state.account) {
+            config.userAccountAddress = state.account.account.address;
+        }
+        return config;
+    };
+    /**
+     * Called on start of user verification. This is when the user ticks the box to claim they are human.
+     */
+    const start = async () => {
+        try {
+            if (state.loading) {
+                console.log('Procaptcha already loading');
+                return;
+            }
+            if (state.isHuman) {
+                console.log('already human');
+                return;
+            }
+            resetState();
+            // set the loading flag to true (allow UI to show some sort of loading / pending indicator while we get the captcha process going)
+            updateState({ loading: true });
+            // snapshot the config into the state
+            const config = getConfig();
+            console.log('Starting procaptcha using config:', config);
+            // allow UI to catch up with the loading state
+            await (0, utils_1.sleep)(100);
+            // check accounts / setup accounts
+            const account = await loadAccount();
+            // account has been found, check if account is already marked as human
+            // first, ask the smart contract
+            const contract = await loadContract();
+            // We don't need to show CAPTCHA challenges if the user is determined as human by the contract
+            const contractIsHuman = await contract.dappOperatorIsHumanUser(config.solutionThreshold);
+            if (contractIsHuman) {
+                updateState({ isHuman: true, loading: false });
+                events.onHuman({
+                    userAccountAddress: account.account.address,
+                });
+                return;
+            }
+            // Check if there is a provider in local storage or get a random one from the contract
+            const providerUrlFromStorage = storage_1.default.getProviderUrl();
+            let providerApi;
+            if (providerUrlFromStorage) {
+                providerApi = await loadProviderApi(providerUrlFromStorage);
+                // if the provider was already in storage, the user may have already solved some captchas but they have not been put on chain yet
+                // so contact the provider to check if this is the case
+                try {
+                    const verifyDappUserResponse = await providerApi.verifyDappUser(account.account.address);
+                    if (verifyDappUserResponse.solutionApproved) {
+                        updateState({ isHuman: true, loading: false });
+                        events.onHuman({
+                            providerUrl: providerUrlFromStorage,
+                            userAccountAddress: account.account.address,
+                            commitmentId: verifyDappUserResponse.commitmentId,
+                        });
+                        return;
+                    }
+                }
+                catch (err) {
+                    // if the provider is down, we should continue with the process of selecting a random provider
+                    console.error('Error contacting provider from storage', providerUrlFromStorage);
+                    // continue as if the provider was not in storage
+                }
+            }
+            // get a random provider
+            const provider = await loadRandomProvider(contract);
+            console.log('provider', provider);
+            const providerUrl = provider.provider.serviceOrigin;
+            // get the provider api inst
+            providerApi = await loadProviderApi(providerUrl);
+            console.log('providerApi', providerApi);
+            // get the captcha challenge and begin the challenge
+            const captchaApi = await loadCaptchaApi(contract, provider, providerApi);
+            console.log('captchaApi', captchaApi);
+            const challenge = await captchaApi.getCaptchaChallenge();
+            if (challenge.captchas.length <= 0) {
+                throw new Error('No captchas returned from provider');
+            }
+            // update state with new challenge
+            updateState({
+                index: 0,
+                solutions: challenge.captchas.map(() => []),
+                challenge,
+                showModal: true,
+            });
+        }
+        catch (err) {
+            console.error(err);
+            // dispatch relevant error event
+            const event = errorToEventMap[err.constructor] || events.onError;
+            event(err);
+            // hit an error, disallow user's claim to be human
+            updateState({ isHuman: false, showModal: false, loading: false });
+        }
+    };
+    const loadRandomProvider = async (contract) => {
+        const provider = await contract.getRandomProvider();
+        console.log('Got random provider', provider);
+        if (!provider || !provider.provider || !provider.provider.serviceOrigin) {
+            throw new Error('No provider found: ' + JSON.stringify(provider));
+        }
+        provider.provider.serviceOrigin = trimProviderUrl(provider.provider.serviceOrigin);
+        // record provider in localstorage for subsequent human checks (i.e. if the user has already solved some captchas but they have not been put on chain yet, contact the provider in the local storage to verify)
+        storage_1.default.setProviderUrl(provider.provider.serviceOrigin);
+        return provider;
+    };
+    const submit = async () => {
+        try {
+            console.log('submitting solutions');
+            if (!state.challenge) {
+                throw new Error('cannot submit, no challenge found');
+            }
+            // hide the modal, no further input required from user
+            updateState({ showModal: false });
+            const challenge = state.challenge;
+            const salt = (0, util_crypto_1.randomAsHex)();
+            // append solution to each captcha in the challenge
+            const captchaSolution = state.challenge.captchas.map((captcha, index) => {
+                const solution = state.solutions[index];
+                return {
+                    captchaId: captcha.captcha.captchaId,
+                    captchaContentId: captcha.captcha.captchaContentId,
+                    salt,
+                    solution,
+                };
+            });
+            const account = getAccount();
+            const signer = account.extension.signer;
+            if (!challenge.captchas[0].captcha.datasetId) {
+                throw new Error('No datasetId set for challenge');
+            }
+            const captchaApi = getCaptchaApi();
+            // send the commitment to the provider
+            const submission = await captchaApi.submitCaptchaSolution(signer, challenge.requestHash, challenge.captchas[0].captcha.datasetId, captchaSolution, salt);
+            // update the state with the result of the submission
+            updateState({
+                submission,
+                // mark as is human if solution has been approved
+                isHuman: submission[0].solutionApproved,
+                loading: false,
+            });
+            if (state.isHuman) {
+                events.onHuman({
+                    providerUrl: captchaApi.provider.provider.serviceOrigin,
+                    userAccountAddress: account.account.address,
+                    commitmentId: submission[1],
+                });
+            }
+        }
+        catch (err) {
+            // dispatch relevant error event
+            const event = errorToEventMap[err.constructor] || events.onError;
+            event(err);
+            // hit an error, disallow user's claim to be human
+            updateState({ isHuman: false, showModal: false, loading: false });
+        }
+    };
+    const cancel = async () => {
+        console.log('cancel');
+        // abandon the captcha process
+        resetState();
+    };
+    /**
+     * (De)Select an image from the solution for the current round. If the hash is already in the solutions list, it will be removed (deselected) and if not it will be added (selected).
+     * @param hash the hash of the image
+     */
+    const select = (hash) => {
+        if (!state.challenge) {
+            throw new Error('cannot select, no challenge found');
+        }
+        if (state.index >= state.challenge.captchas.length || state.index < 0) {
+            throw new Error('cannot select, round index out of range');
+        }
+        const index = state.index;
+        const solutions = state.solutions;
+        const solution = solutions[index];
+        if (solution.includes(hash)) {
+            console.log('deselecting', hash);
+            // remove the hash from the solution
+            solution.splice(solution.indexOf(hash), 1);
+        }
+        else {
+            console.log('selecting', hash);
+            // add the hash to the solution
+            solution.push(hash);
+        }
+        updateState({ solutions });
+    };
+    /**
+     * Proceed to the next round of the challenge.
+     */
+    const nextRound = () => {
+        if (!state.challenge) {
+            throw new Error('cannot proceed to next round, no challenge found');
+        }
+        if (state.index + 1 >= state.challenge.captchas.length) {
+            throw new Error('cannot proceed to next round, already at last round');
+        }
+        console.log('proceeding to next round');
+        updateState({ index: state.index + 1 });
+    };
+    const loadCaptchaApi = async (contract, provider, providerApi) => {
+        const config = getConfig();
+        // setup the captcha api to carry out a challenge
+        const captchaApi = new ProsopoCaptchaApi_1.default(getAccount().account.address, contract, provider, providerApi, config.web2);
+        updateState({ captchaApi });
+        return getCaptchaApi();
+    };
+    const loadProviderApi = async (providerUrl) => {
+        const config = getConfig();
+        const providerApi = new api_1.ProviderApi(config.network, providerUrl);
+        return providerApi;
+    };
+    const resetState = () => {
+        updateState((0, exports.defaultState)());
+    };
+    const getCaptchaApi = () => {
+        if (!state.captchaApi) {
+            throw new Error('Captcha api not set');
+        }
+        return state.captchaApi;
+    };
+    /**
+     * Load the account using address specified in config, or generate new address if not found in local storage for web2 mode.
+     */
+    const loadAccount = async () => {
+        const config = getConfig();
+        // check if account has been provided in config (doesn't matter in web2 mode)
+        if (!config.web2 && !config.userAccountAddress) {
+            throw new Error('Account address has not been set for web3 mode');
+        }
+        // check if account exists in extension
+        const ext = config.web2 ? new ExtensionWeb2_1.default() : new ExtensionWeb3_1.default();
+        const account = await ext.getAccount(config);
+        console.log('Using account:', account);
+        updateState({ account });
+        return getAccount();
+    };
+    const getAccount = () => {
+        if (!state.account) {
+            throw new Error('Account not loaded');
+        }
+        const account = state.account;
+        return account;
+    };
+    /**
+     * Load the contract instance using addresses from config.
+     */
+    const loadContract = async () => {
+        const config = getConfig();
+        const contract = await ProsopoContract_1.default.create(config.network.prosopoContract.address, config.network.dappContract.address, getAccount().account.address, new rpc_provider_1.WsProvider(config.network.endpoint));
+        return contract;
+    };
+    return {
+        start,
+        cancel,
+        submit,
+        select,
+        nextRound,
+    };
+};
+exports.Manager = Manager;
+const trimProviderUrl = (url) => {
+    return (0, util_1.hexToString)(url).replace(/\0/g, '');
+};
+//# sourceMappingURL=Manager.js.map

package/dist/modules/Manager.js.map

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

package/dist/modules/ProsopoCaptchaApi.d.ts

@@ -1,21 +1,19 @@
-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 { CaptchaSolution } from '@prosopo/datasets';
+import { Signer } from '@polkadot/api/types';
+import { GetCaptchaResponse, ProsopoRandomProviderResponse } from '../types/api';
+import { ProviderApi } from '@prosopo/api';
+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);
+    userAccount: string;
+    contract: ProsopoContract;
+    provider: ProsopoRandomProviderResponse;
+    providerApi: ProviderApi;
+    private web2;
+    constructor(userAccount: string, 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>;
+    submitCaptchaSolution(signer: Signer, requestHash: string, datasetId: string, solutions: CaptchaSolution[], salt: string): Promise<TCaptchaSubmitResult>;
 }
 export default ProsopoCaptchaApi;
 //# sourceMappingURL=ProsopoCaptchaApi.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"ProsopoCaptchaApi.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaApi.ts"],"names":[],"mappings":"AAeA,OAAO,EAAqB,eAAe,EAA0C,MAAM,mBAAmB,CAAA;AAC9G,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAA2B,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAGzG,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,eAAe,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAKtD,qBAAa,iBAAiB;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,eAAe,CAAA;IACzB,QAAQ,EAAE,6BAA6B,CAAA;IACvC,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,IAAI,CAAS;gBAGjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,6BAA6B,EACvC,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,OAAO;IASJ,mBAAmB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IASxD,6BAA6B,CAChC,QAAQ,EAAE,6BAA6B,EACvC,gBAAgB,EAAE,kBAAkB,GACrC,IAAI;IAuBM,qBAAqB,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,eAAe,EAAE,EAC5B,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,oBAAoB,CAAC;CAuDnC;AAED,eAAe,iBAAiB,CAAA"}

package/dist/modules/ProsopoCaptchaApi.js

@@ -16,31 +16,26 @@ exports.ProsopoCaptchaApi = 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 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");
+const datasets_3 = require("@prosopo/datasets");
 class ProsopoCaptchaApi {
+    userAccount;
     contract;
     provider;
     providerApi;
-    submitCaptchaFn;
-    constructor(contract, provider, providerApi, web2) {
+    web2;
+    constructor(userAccount, contract, provider, providerApi, web2) {
+        this.userAccount = userAccount;
         this.contract = contract;
         this.provider = provider;
         this.providerApi = providerApi;
-        this.submitCaptchaFn = web2 ? this.submitCaptchaSolutionWeb2 : this.submitCaptchaSolutionWeb3;
+        this.web2 = web2;
     }
     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);
-        }
+        const captchaChallenge = await this.providerApi.getCaptchaChallenge(this.userAccount, this.provider);
+        this.verifyCaptchaChallengeContent(this.provider, captchaChallenge);
         return captchaChallenge;
     }
     verifyCaptchaChallengeContent(provider, captchaChallenge) {
@@ -49,70 +44,55 @@ class ProsopoCaptchaApi {
         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");
+            throw new datasets_2.ProsopoEnvError('CAPTCHA.INVALID_DATASET_CONTENT_ID');
         }
         for (const captchaWithProof of captchaChallenge.captchas) {
+            //TODO calculate the captchaId from the captcha content
+            // if (!verifyCaptchaData(captchaWithProof.captcha, captchaWithProof.proof)) {
+            //     throw new ProsopoEnvError('CAPTCHA.INVALID_CAPTCHA_CHALLENGE')
+            // }
             if (!(0, datasets_1.verifyProof)(captchaWithProof.captcha.captchaContentId, captchaWithProof.proof)) {
-                throw new contract_1.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE");
+                throw new datasets_2.ProsopoEnvError('CAPTCHA.INVALID_CAPTCHA_CHALLENGE');
             }
         }
-        console.log("CAPTCHA.CHALLENGE_VERIFIED");
+        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)();
+    async submitCaptchaSolution(signer, requestHash, datasetId, solutions, salt) {
         const tree = new datasets_1.CaptchaMerkleTree();
-        const captchaSolutionsSalted = solutions.map((captcha) => ({
-            ...captcha,
-            salt,
-        }));
-        const captchasHashed = captchaSolutionsSalted.map((captcha) => (0, datasets_2.computeCaptchaSolutionHash)(captcha));
+        const captchasHashed = solutions.map((captcha) => (0, datasets_3.computeCaptchaSolutionHash)(captcha));
         tree.build(captchasHashed);
         const commitmentId = tree.root.hash;
-        console.log("solveCaptchaChallenge commitmentId", commitmentId);
+        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 tx = undefined;
+        if (!this.web2) {
+            try {
+                tx = await this.contract.dappUserCommit(signer, datasetId, commitmentId, this.provider.providerId);
+            }
+            catch (err) {
+                throw new datasets_2.ProsopoEnvError(err);
+            }
         }
         let result;
         try {
-            result = await this.providerApi.submitCaptchaSolution(captchaSolutionsSalted, requestHash, this.contract.getAccount().address, salt, tx.blockHash, tx.txHash.toString());
+            result = await this.providerApi.submitCaptchaSolution(solutions, requestHash, this.contract.userAccountAddress, salt, tx ? tx?.blockHash : undefined, tx ? tx?.txHash.toString() : undefined, this.web2);
         }
         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);
+        let commitment = undefined;
+        if (!this.web2) {
+            try {
+                commitment = await this.contract.getCaptchaSolutionCommitment(commitmentId);
+            }
+            catch (err) {
+                throw new datasets_2.ProsopoEnvError(err);
+            }
         }
-        return [result, tx, commitment];
+        return [result, commitmentId, tx, commitment];
     }
 }
 exports.ProsopoCaptchaApi = ProsopoCaptchaApi;

package/dist/modules/ProsopoCaptchaApi.js.map

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

package/dist/modules/ProsopoCaptchaStateClient.d.ts

@@ -1,18 +1 @@
-import { ICaptchaStateReducer, TCaptchaSubmitResult } from "../types/client";
-import { GetCaptchaResponse } from "../types/api";
-import { ProsopoCaptchaClient } from "./ProsopoCaptchaClient";
-import { CaptchaSolution } from '@prosopo/datasets';
-export declare class ProsopoCaptchaStateClient {
-    context: ProsopoCaptchaClient;
-    manager: ICaptchaStateReducer;
-    constructor(context: ProsopoCaptchaClient, manager: ICaptchaStateReducer);
-    onLoadCaptcha(): Promise<void>;
-    onCancel(): void;
-    onSubmit(): Promise<void>;
-    onSolved(submitResult: TCaptchaSubmitResult): Promise<void>;
-    onChange(hash: string): void;
-    dismissCaptcha(): void;
-    parseSolution(captchaChallenge: GetCaptchaResponse, captchaSolution: string[][]): CaptchaSolution[];
-}
-export default ProsopoCaptchaStateClient;
 //# sourceMappingURL=ProsopoCaptchaStateClient.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProsopoCaptchaStateClient.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaStateClient.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EACH,eAAe,EAElB,MAAM,mBAAmB,CAAC;AAG3B,qBAAa,yBAAyB;IAE3B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,oBAAoB,CAAC;gBAEzB,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,oBAAoB;IAK3D,aAAa;IAqBnB,QAAQ;IAOF,QAAQ;IA0DR,QAAQ,CAAC,YAAY,EAAE,oBAAoB;IAajD,QAAQ,CAAC,IAAI,EAAE,MAAM;IAerB,cAAc;IAKd,aAAa,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,GAAG,eAAe,EAAE;CAc7G;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"ProsopoCaptchaStateClient.d.ts","sourceRoot":"","sources":["../../src/modules/ProsopoCaptchaStateClient.ts"],"names":[],"mappings":""}