@prosopo/provider 0.2.2 → 0.2.5

package/dist/cjs/contracts/captcha/dist/tx-sign-and-send/captcha.cjs

@@ -0,0 +1,426 @@
+"use strict";
+const typechainTypes = require("@727-ventures/typechain-types");
+const utils = require("../shared/utils.cjs");
+const captcha = require("../event-data/captcha.json.cjs");
+class Methods {
+  constructor(apiPromise, nativeContract, keyringPair) {
+    this.__apiPromise = apiPromise;
+    this.__nativeContract = nativeContract;
+    this.__keyringPair = keyringPair;
+  }
+  /**
+   * getGitCommitId
+   *
+   */
+  getGitCommitId(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getGitCommitId", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getAdmin
+   *
+   */
+  getAdmin(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getAdmin", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getPayees
+   *
+   */
+  getPayees(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getPayees", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getDappPayees
+   *
+   */
+  getDappPayees(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getDappPayees", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getStatuses
+   *
+   */
+  getStatuses(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getStatuses", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getProviderStakeThreshold
+   *
+   */
+  getProviderStakeThreshold(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getProviderStakeThreshold", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getDappStakeThreshold
+   *
+   */
+  getDappStakeThreshold(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getDappStakeThreshold", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getMaxProviderFee
+   *
+   */
+  getMaxProviderFee(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getMaxProviderFee", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getMinNumActiveProviders
+   *
+   */
+  getMinNumActiveProviders(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getMinNumActiveProviders", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getBlockTime
+   *
+   */
+  getBlockTime(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getBlockTime", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getMaxUserHistoryAgeSeconds
+   *
+   */
+  getMaxUserHistoryAgeSeconds(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getMaxUserHistoryAgeSeconds", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getMaxUserHistoryLen
+   *
+   */
+  getMaxUserHistoryLen(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getMaxUserHistoryLen", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getMaxUserHistoryAgeBlocks
+   *
+   */
+  getMaxUserHistoryAgeBlocks(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getMaxUserHistoryAgeBlocks", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * providerRegister
+   *
+   * @param { Array<(number | string | BN)> } url,
+   * @param { (number | string | BN) } fee,
+   * @param { ArgumentTypes.Payee } payee,
+   */
+  providerRegister(url, fee, payee, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerRegister", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [url, fee, payee], __options);
+  }
+  /**
+   * providerUpdate
+   *
+   * @param { Array<(number | string | BN)> } url,
+   * @param { (number | string | BN) } fee,
+   * @param { ArgumentTypes.Payee } payee,
+   */
+  providerUpdate(url, fee, payee, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerUpdate", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [url, fee, payee], __options);
+  }
+  /**
+   * providerDeactivate
+   *
+   */
+  providerDeactivate(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerDeactivate", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * providerDeregister
+   *
+   */
+  providerDeregister(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerDeregister", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getProvider
+   *
+   * @param { ArgumentTypes.AccountId } account,
+   */
+  getProvider(account, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getProvider", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [account], __options);
+  }
+  /**
+   * providerFund
+   *
+   */
+  providerFund(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerFund", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * providerSetDataset
+   *
+   * @param { ArgumentTypes.Hash } datasetId,
+   * @param { ArgumentTypes.Hash } datasetIdContent,
+   */
+  providerSetDataset(datasetId, datasetIdContent, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerSetDataset", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [datasetId, datasetIdContent], __options);
+  }
+  /**
+   * getDapp
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   */
+  getDapp(contract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getDapp", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract], __options);
+  }
+  /**
+   * dappRegister
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   * @param { ArgumentTypes.DappPayee } payee,
+   */
+  dappRegister(contract, payee, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappRegister", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract, payee], __options);
+  }
+  /**
+   * dappUpdate
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   * @param { ArgumentTypes.DappPayee } payee,
+   * @param { ArgumentTypes.AccountId } owner,
+   */
+  dappUpdate(contract, payee, owner, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappUpdate", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract, payee, owner], __options);
+  }
+  /**
+   * dappFund
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   */
+  dappFund(contract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappFund", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract], __options);
+  }
+  /**
+   * dappDeregister
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   */
+  dappDeregister(contract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappDeregister", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract], __options);
+  }
+  /**
+   * dappDeactivate
+   *
+   * @param { ArgumentTypes.AccountId } contract,
+   */
+  dappDeactivate(contract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappDeactivate", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [contract], __options);
+  }
+  /**
+   * getUserHistorySummary
+   *
+   * @param { ArgumentTypes.AccountId } userAccount,
+   */
+  getUserHistorySummary(userAccount, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getUserHistorySummary", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [userAccount], __options);
+  }
+  /**
+   * providerCommit
+   *
+   * @param { ArgumentTypes.Commit } commit,
+   */
+  providerCommit(commit, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerCommit", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [commit], __options);
+  }
+  /**
+   * providerCommitMany
+   *
+   * @param { Array<ArgumentTypes.Commit> } commits,
+   */
+  providerCommitMany(commits, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "providerCommitMany", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [commits], __options);
+  }
+  /**
+   * dappOperatorIsHumanUser
+   *
+   * @param { ArgumentTypes.AccountId } userAccount,
+   * @param { (number | string | BN) } threshold,
+   */
+  dappOperatorIsHumanUser(userAccount, threshold, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappOperatorIsHumanUser", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [userAccount, threshold], __options);
+  }
+  /**
+   * dappOperatorLastCorrectCaptcha
+   *
+   * @param { ArgumentTypes.AccountId } userAccount,
+   */
+  dappOperatorLastCorrectCaptcha(userAccount, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "dappOperatorLastCorrectCaptcha", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [userAccount], __options);
+  }
+  /**
+   * getCaptchaData
+   *
+   * @param { ArgumentTypes.Hash } datasetId,
+   */
+  getCaptchaData(datasetId, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getCaptchaData", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [datasetId], __options);
+  }
+  /**
+   * getUser
+   *
+   * @param { ArgumentTypes.AccountId } userAccount,
+   */
+  getUser(userAccount, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getUser", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [userAccount], __options);
+  }
+  /**
+   * getCommit
+   *
+   * @param { ArgumentTypes.Hash } commitId,
+   */
+  getCommit(commitId, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getCommit", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [commitId], __options);
+  }
+  /**
+   * listProvidersByAccounts
+   *
+   * @param { Array<ArgumentTypes.AccountId> } providerAccounts,
+   */
+  listProvidersByAccounts(providerAccounts, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "listProvidersByAccounts", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [providerAccounts], __options);
+  }
+  /**
+   * listProvidersByStatus
+   *
+   * @param { Array<ArgumentTypes.GovernanceStatus> } statuses,
+   */
+  listProvidersByStatus(statuses, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "listProvidersByStatus", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [statuses], __options);
+  }
+  /**
+   * getRandomActiveProvider
+   *
+   * @param { ArgumentTypes.AccountId } userAccount,
+   * @param { ArgumentTypes.AccountId } dappContract,
+   */
+  getRandomActiveProvider(userAccount, dappContract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getRandomActiveProvider", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [userAccount, dappContract], __options);
+  }
+  /**
+   * getAllProviderAccounts
+   *
+   */
+  getAllProviderAccounts(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getAllProviderAccounts", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * getRandomNumber
+   *
+   * @param { (string | number | BN) } len,
+   * @param { ArgumentTypes.AccountId } userAccount,
+   * @param { ArgumentTypes.AccountId } dappContract,
+   */
+  getRandomNumber(len, userAccount, dappContract, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "getRandomNumber", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [len, userAccount, dappContract], __options);
+  }
+  /**
+   * terminate
+   *
+   */
+  terminate(__options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "terminate", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [], __options);
+  }
+  /**
+   * withdraw
+   *
+   * @param { (string | number | BN) } amount,
+   */
+  withdraw(amount, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "withdraw", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [amount], __options);
+  }
+  /**
+   * setCodeHash
+   *
+   * @param { Array<(number | string | BN)> } codeHash,
+   */
+  setCodeHash(codeHash, __options) {
+    return typechainTypes.txSignAndSend(this.__apiPromise, this.__nativeContract, this.__keyringPair, "setCodeHash", (events) => {
+      return utils.decodeEvents(events, this.__nativeContract, captcha);
+    }, [codeHash], __options);
+  }
+}
+module.exports = Methods;

package/dist/cjs/contracts/captcha/dist/types-arguments/captcha.cjs

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+exports.Error = void 0;
+(function(Error) {
+  Error["notAuthorised"] = "NotAuthorised";
+  Error["transferFailed"] = "TransferFailed";
+  Error["setCodeHashFailed"] = "SetCodeHashFailed";
+  Error["invalidDestination"] = "InvalidDestination";
+  Error["unknownMessage"] = "UnknownMessage";
+  Error["providerAccountExists"] = "ProviderAccountExists";
+  Error["providerExists"] = "ProviderExists";
+  Error["providerAccountDoesNotExist"] = "ProviderAccountDoesNotExist";
+  Error["providerDoesNotExist"] = "ProviderDoesNotExist";
+  Error["providerInsufficientFunds"] = "ProviderInsufficientFunds";
+  Error["providerInactive"] = "ProviderInactive";
+  Error["providerUrlUsed"] = "ProviderUrlUsed";
+  Error["dappExists"] = "DappExists";
+  Error["dappDoesNotExist"] = "DappDoesNotExist";
+  Error["dappInactive"] = "DappInactive";
+  Error["dappInsufficientFunds"] = "DappInsufficientFunds";
+  Error["captchaDataDoesNotExist"] = "CaptchaDataDoesNotExist";
+  Error["commitDoesNotExist"] = "CommitDoesNotExist";
+  Error["dappUserDoesNotExist"] = "DappUserDoesNotExist";
+  Error["noActiveProviders"] = "NoActiveProviders";
+  Error["datasetIdSolutionsSame"] = "DatasetIdSolutionsSame";
+  Error["codeNotFound"] = "CodeNotFound";
+  Error["unknown"] = "Unknown";
+  Error["invalidContract"] = "InvalidContract";
+  Error["invalidPayee"] = "InvalidPayee";
+  Error["invalidCaptchaStatus"] = "InvalidCaptchaStatus";
+  Error["noCorrectCaptcha"] = "NoCorrectCaptcha";
+  Error["notEnoughActiveProviders"] = "NotEnoughActiveProviders";
+  Error["providerFeeTooHigh"] = "ProviderFeeTooHigh";
+  Error["commitAlreadyExists"] = "CommitAlreadyExists";
+  Error["notAuthor"] = "NotAuthor";
+})(exports.Error || (exports.Error = {}));
+exports.LangError = void 0;
+(function(LangError) {
+  LangError["couldNotReadInput"] = "CouldNotReadInput";
+})(exports.LangError || (exports.LangError = {}));
+exports.Payee = void 0;
+(function(Payee) {
+  Payee["provider"] = "Provider";
+  Payee["dapp"] = "Dapp";
+})(exports.Payee || (exports.Payee = {}));
+exports.DappPayee = void 0;
+(function(DappPayee) {
+  DappPayee["provider"] = "Provider";
+  DappPayee["dapp"] = "Dapp";
+  DappPayee["any"] = "Any";
+})(exports.DappPayee || (exports.DappPayee = {}));
+exports.GovernanceStatus = void 0;
+(function(GovernanceStatus) {
+  GovernanceStatus["active"] = "Active";
+  GovernanceStatus["inactive"] = "Inactive";
+})(exports.GovernanceStatus || (exports.GovernanceStatus = {}));
+exports.CaptchaStatus = void 0;
+(function(CaptchaStatus) {
+  CaptchaStatus["pending"] = "Pending";
+  CaptchaStatus["approved"] = "Approved";
+  CaptchaStatus["disapproved"] = "Disapproved";
+})(exports.CaptchaStatus || (exports.CaptchaStatus = {}));

package/dist/cjs/tasks/tasks.cjs

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const types = require("@prosopo/types");
 const datasets = require("@prosopo/datasets");
+require("../contracts/captcha/dist/index.cjs");
 const common = require("@prosopo/common");
 const contract = require("@prosopo/contract");
 const util$2 = require("@prosopo/util");
 const util$1 = require("@polkadot/util");
 const utilCrypto = require("@polkadot/util-crypto");
 const util = require("../util.cjs");
+const captcha = require("../contracts/captcha/dist/types-arguments/captcha.cjs");
 class Tasks {
   constructor(env) {
     if (!env.contractInterface) {
@@ -35,7 +36,7 @@ class Tasks {
     if (datasetRaw.captchas.length < this.config.captchas.solved.count + this.config.captchas.unsolved.count) {
       throw new common.ProsopoEnvError("DATASET.CAPTCHAS_COUNT_LESS_THAN_CONFIGURED", this.providerSetDataset.name);
     }
-    const solutions = datasetRaw.captchas.map((captcha) => captcha.solution ? 1 : 0).reduce((partialSum, b) => partialSum + b, 0);
+    const solutions = datasetRaw.captchas.map((captcha2) => captcha2.solution ? 1 : 0).reduce((partialSum, b) => partialSum + b, 0);
     if (solutions < this.config.captchas.solved.count) {
       throw new common.ProsopoEnvError("DATASET.SOLUTIONS_COUNT_LESS_THAN_CONFIGURED", this.providerSetDataset.name);
     }
@@ -64,15 +65,15 @@ class Tasks {
     const captchaDocs = await this.db.getRandomCaptcha(solved, datasetId, size);
     if (captchaDocs) {
       const captchas = [];
-      for (const captcha of captchaDocs) {
+      for (const captcha2 of captchaDocs) {
         const datasetDetails = await this.db.getDatasetDetails(datasetId);
         const tree = new datasets.CaptchaMerkleTree();
         if (datasetDetails.contentTree) {
           tree.layers = datasetDetails.contentTree;
-          const proof = tree.proof(captcha.captchaContentId);
-          delete captcha.solution;
-          captcha.items = util.shuffleArray(captcha.items);
-          captchas.push({ captcha, proof });
+          const proof = tree.proof(captcha2.captchaContentId);
+          delete captcha2.solution;
+          captcha2.items = util.shuffleArray(captcha2.items);
+          captchas.push({ captcha: captcha2, proof });
         }
       }
       return captchas;
@@ -124,7 +125,7 @@ class Tasks {
         dappContract: dappAccount,
         providerAccount: this.contract.pair.address,
         datasetId: provider.datasetId.toString(),
-        status: types.CaptchaStatus.pending,
+        status: captcha.CaptchaStatus.pending,
         userSignature: Array.from(userSignature),
         requestedAt: pendingRecord.requestedAtBlock,
         // TODO is this correct or should it be block number?
@@ -181,7 +182,7 @@ class Tasks {
    */
   async validateReceivedCaptchasAgainstStoredCaptchas(captchas) {
     const receivedCaptchas = datasets.parseAndSortCaptchaSolutions(captchas);
-    const captchaIds = receivedCaptchas.map((captcha) => captcha.captchaId);
+    const captchaIds = receivedCaptchas.map((captcha2) => captcha2.captchaId);
     const storedCaptchas = await this.db.getCaptchaById(captchaIds);
     if (!storedCaptchas || receivedCaptchas.length !== storedCaptchas.length) {
       throw new common.ProsopoEnvError(
@@ -191,7 +192,7 @@ class Tasks {
         captchas
       );
     }
-    if (!storedCaptchas.every((captcha) => captcha.datasetId === util$2.at(storedCaptchas, 0).datasetId)) {
+    if (!storedCaptchas.every((captcha2) => captcha2.datasetId === util$2.at(storedCaptchas, 0).datasetId)) {
       throw new common.ProsopoEnvError(
         "CAPTCHA.DIFFERENT_DATASET_IDS",
         this.validateReceivedCaptchasAgainstStoredCaptchas.name,
@@ -209,7 +210,7 @@ class Tasks {
   async buildTreeAndGetCommitmentId(captchaSolutions) {
     var _a;
     const tree = new datasets.CaptchaMerkleTree();
-    const solutionsHashed = captchaSolutions.map((captcha) => datasets.computeCaptchaSolutionHash(captcha));
+    const solutionsHashed = captchaSolutions.map((captcha2) => datasets.computeCaptchaSolutionHash(captcha2));
     tree.build(solutionsHashed);
     const commitmentId = (_a = tree.root) == null ? void 0 : _a.hash;
     if (!commitmentId) {
@@ -269,7 +270,7 @@ class Tasks {
       salt
     );
     const currentTime = Date.now();
-    const timeLimit = captchas.map((captcha) => captcha.captcha.timeLimitMs || 3e4).reduce((a, b) => a + b, 0);
+    const timeLimit = captchas.map((captcha2) => captcha2.captcha.timeLimitMs || 3e4).reduce((a, b) => a + b, 0);
     const deadlineTs = timeLimit + currentTime;
     const currentBlockNumber = await contract.getBlockNumber(this.contract.api);
     await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentBlockNumber.toNumber());
@@ -377,7 +378,7 @@ class Tasks {
     const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(userAccount);
     if (dappUserSolutions.length > 0) {
       for (const dappUserSolution of dappUserSolutions) {
-        if (dappUserSolution.status === types.ArgumentTypes.CaptchaStatus.approved) {
+        if (dappUserSolution.status === captcha.CaptchaStatus.approved) {
           return dappUserSolution;
         }
       }

package/dist/cjs/util.cjs

@@ -16,8 +16,8 @@ function encodeStringAddress(address) {
 function shuffleArray(array) {
   for (let arrayIndex = array.length - 1; arrayIndex > 0; arrayIndex--) {
     const randIndex = Math.floor(Math.random() * (arrayIndex + 1));
-    const tmp = util$1.at(array, randIndex, { required: false });
-    array[randIndex] = util$1.at(array, arrayIndex, { required: false });
+    const tmp = util$1.at(array, randIndex, { optional: true });
+    array[randIndex] = util$1.at(array, arrayIndex, { optional: true });
     array[arrayIndex] = tmp;
   }
   return array;

package/dist/tasks/tasks.d.ts

@@ -1,6 +1,7 @@
-import { ArgumentTypes, Captcha, CaptchaConfig, CaptchaSolution, CaptchaSolutionConfig, CaptchaWithProof, DappUserSolutionResult, DatasetRaw, DatasetWithIds, Hash, PendingCaptchaRequest, ProsopoConfig, Provider, ProviderRegistered } from '@prosopo/types';
 import { Header } from '@polkadot/types/interfaces';
+import { Captcha, CaptchaConfig, CaptchaSolution, CaptchaSolutionConfig, CaptchaWithProof, DappUserSolutionResult, DatasetRaw, DatasetWithIds, Hash, PendingCaptchaRequest, ProsopoConfig, ProviderRegistered } from '@prosopo/types';
 import { CaptchaMerkleTree } from '@prosopo/datasets';
+import { Provider } from '@prosopo/captcha-contract';
 import { ContractPromise } from '@polkadot/api-contract';
 import { Database, UserCommitmentRecord } from '@prosopo/types-database';
 import { Logger } from '@prosopo/common';
@@ -26,7 +27,7 @@ export declare class Tasks {
      * @param {boolean}  solved    `true` when captcha is solved
      * @param {number}   size       the number of records to be returned
      */
-    getCaptchaWithProof(datasetId: ArgumentTypes.Hash, solved: boolean, size: number): Promise<CaptchaWithProof[]>;
+    getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<CaptchaWithProof[]>;
     /**
      * Validate and store the text captcha solution(s) from the Dapp User in a web2 environment
      * @param {string} userAccount

package/dist/tasks/tasks.d.ts.map

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

package/dist/tasks/tasks.js

@@ -1,18 +1,5 @@
-// Copyright 2021-2023 Prosopo (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-import { ArgumentTypes, CaptchaStatus, } from '@prosopo/types';
 import { CaptchaMerkleTree, buildDataset, compareCaptchaSolutions, computeCaptchaSolutionHash, computePendingRequestHash, parseAndSortCaptchaSolutions, parseCaptchaDataset, } from '@prosopo/datasets';
+import { CaptchaStatus } from '@prosopo/captcha-contract';
 import { ProsopoEnvError, getLogger } from '@prosopo/common';
 import { getBlockNumber, wrapQuery } from '@prosopo/contract';
 import { at } from '@prosopo/util';
@@ -346,7 +333,7 @@ export class Tasks {
         const dappUserSolutions = await this.db.getDappUserCommitmentByAccount(userAccount);
         if (dappUserSolutions.length > 0) {
             for (const dappUserSolution of dappUserSolutions) {
-                if (dappUserSolution.status === ArgumentTypes.CaptchaStatus.approved) {
+                if (dappUserSolution.status === CaptchaStatus.approved) {
                     return dappUserSolution;
                 }
             }