@prosopo/procaptcha 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/modules/Manager.cjs

@@ -4,6 +4,7 @@ const errors = require("../api/errors.cjs");
 const api$1 = require("@polkadot/api");
 const api = require("@prosopo/api");
 const contract = require("@prosopo/contract");
+require("../contracts/captcha/dist/index.cjs");
 const rpcProvider = require("@polkadot/rpc-provider");
 const util$1 = require("@prosopo/util");
 const utilCrypto = require("@polkadot/util-crypto");
@@ -14,14 +15,15 @@ const ExtensionWeb2 = require("../api/ExtensionWeb2.cjs");
 const ExtensionWeb3 = require("../api/ExtensionWeb3.cjs");
 const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
 const storage = require("./storage.cjs");
+const captcha = require("../contracts/captcha/dist/contract-info/captcha.cjs");
 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,
+    index: 0,
     challenge: void 0,
-    solutions: [],
-    index: -1,
+    solutions: void 0,
     isHuman: false,
     captchaApi: void 0,
     account: void 0
@@ -158,7 +160,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         contract$1.query.getRandomActiveProvider,
         contract$1.query
       )(account.account.address, config.account.address);
-      const blockNumber = getRandomProviderResponse.blockNumber;
+      const blockNumber = parseInt(getRandomProviderResponse.blockNumber.toString());
       console.log("provider", getRandomProviderResponse);
       const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
       providerApi = await loadProviderApi(providerUrl);
@@ -170,7 +172,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       if (challenge.captchas.length <= 0) {
         throw new Error("No captchas returned from provider");
       }
-      const timeMillis = challenge.captchas.map((captcha) => captcha.captcha.timeLimitMs || 30 * 1e3).reduce((a, b) => a + b);
+      const timeMillis = challenge.captchas.map((captcha2) => captcha2.captcha.timeLimitMs || 30 * 1e3).reduce((a, b) => a + b);
       const timeout = setTimeout(() => {
         console.log("challenge expired after " + timeMillis + "ms");
         events.onExpired();
@@ -196,11 +198,11 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       updateState({ showModal: false });
       const challenge = state.challenge;
       const salt = utilCrypto.randomAsHex();
-      const captchaSolution = state.challenge.captchas.map((captcha, index) => {
+      const captchaSolution = state.challenge.captchas.map((captcha2, index) => {
         const solution = util$1.at(state.solutions, index);
         return {
-          captchaId: captcha.captcha.captchaId,
-          captchaContentId: captcha.captcha.captchaContentId,
+          captchaId: captcha2.captcha.captchaId,
+          captchaContentId: captcha2.captcha.captchaContentId,
           salt,
           solution
         };
@@ -349,7 +351,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     const keyring = new api$1.Keyring({ type, ss58Format: api2.registry.chainSS58 });
     return new contract.ProsopoCaptchaContract(
       api2,
-      contract.abiJson,
+      JSON.parse(captcha.ContractAbi),
       network.contract.address,
       keyring.addFromAddress(getAccount().account.address),
       "prosopo",

package/dist/cjs/modules/ProsopoCaptchaApi.cjs

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-require("../datasets/dist/index.cjs");
+require("../packages/datasets/dist/index.cjs");
 const handlers = require("../api/handlers.cjs");
 const common = require("@prosopo/common");
 const util = require("@prosopo/util");
 const util$1 = require("@polkadot/util");
-const merkle = require("../datasets/dist/captcha/merkle.cjs");
-const captcha = require("../datasets/dist/captcha/captcha.cjs");
+const merkle = require("../packages/datasets/dist/captcha/merkle.cjs");
+const captcha = require("../packages/datasets/dist/captcha/captcha.cjs");
 class ProsopoCaptchaApi {
   constructor(userAccount, contract, provider, providerApi, web2, dappAccount) {
     this.userAccount = userAccount;

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

@@ -1 +1 @@
-{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,mBAAmB,EACnB,wBAAwB,EAExB,eAAe,EACf,uBAAuB,EAC1B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAIH,mBAAmB,EAEtB,MAAM,gBAAgB,CAAA;AAgBvB,eAAO,MAAM,YAAY,QAAO,QAAQ,eAAe,CAatD,CAAA;AAgBD,eAAO,MAAM,UAAU,WAAY,mBAAmB;;;;;;;CAMrD,CAAA;AAED;;GAEG;AACH,wBAAgB,OAAO,CACnB,cAAc,EAAE,wBAAwB,EACxC,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAoSR,MAAM;;EA4J/B"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,mBAAmB,EACnB,wBAAwB,EAExB,eAAe,EACf,uBAAuB,EAC1B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAA2C,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAiB7F,eAAO,MAAM,YAAY,QAAO,QAAQ,eAAe,CAatD,CAAA;AAgBD,eAAO,MAAM,UAAU,WAAY,mBAAmB;;;;;;;CAMrD,CAAA;AAED;;GAEG;AACH,wBAAgB,OAAO,CACnB,cAAc,EAAE,wBAAwB,EACxC,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAoSR,MAAM;;EA4J/B"}

package/dist/modules/Manager.js

@@ -1,7 +1,8 @@
 import { AccountNotFoundError } from '../api/errors.js';
 import { ApiPromise, Keyring } from '@polkadot/api';
 import { ProviderApi } from '@prosopo/api';
-import { ProsopoCaptchaContract, abiJson, wrapQuery } from '@prosopo/contract';
+import { ProsopoCaptchaContract, wrapQuery } from '@prosopo/contract';
+import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
 import { WsProvider } from '@polkadot/rpc-provider';
 import { at } from '@prosopo/util';
 import { randomAsHex } from '@polkadot/util-crypto';
@@ -17,9 +18,9 @@ export const defaultState = () => {
         // 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,
+        index: 0,
         challenge: undefined,
-        solutions: [],
-        index: -1,
+        solutions: undefined,
         isHuman: false,
         captchaApi: undefined,
         account: undefined,
@@ -191,7 +192,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
             console.log('Signature:', signed);
             // get a random provider
             const getRandomProviderResponse = await wrapQuery(contract.query.getRandomActiveProvider, contract.query)(account.account.address, config.account.address);
-            const blockNumber = getRandomProviderResponse.blockNumber;
+            const blockNumber = parseInt(getRandomProviderResponse.blockNumber.toString());
             console.log('provider', getRandomProviderResponse);
             const providerUrl = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
             // get the provider api inst
@@ -408,7 +409,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         // TODO create a shared keyring that's stored somewhere
         const type = 'sr25519';
         const keyring = new Keyring({ type, ss58Format: api.registry.chainSS58 });
-        return new ProsopoCaptchaContract(api, abiJson, network.contract.address, keyring.addFromAddress(getAccount().account.address), 'prosopo', 0);
+        return new ProsopoCaptchaContract(api, JSON.parse(abiJson), network.contract.address, keyring.addFromAddress(getAccount().account.address), 'prosopo', 0);
     };
     return {
         start,