@prosopo/server 0.2.13 → 0.2.14

package/dist/cjs/server.cjs

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const api$1 = require("@polkadot/api");
+const Api = require("@polkadot/api/promise/Api");
 const types = require("@prosopo/types");
 const keyring = require("@polkadot/keyring");
 const common = require("@prosopo/common");
 const contract = require("@prosopo/contract");
 const api = require("@prosopo/api");
-require("./contracts/captcha/dist/index.cjs");
-const rpcProvider = require("@polkadot/rpc-provider");
+const ws = require("@polkadot/rpc-provider/ws");
+const contractInfo = require("@prosopo/captcha-contract/contract-info");
 const util = require("@prosopo/util");
-const captcha = require("./contracts/captcha/dist/contract-info/captcha.cjs");
 class ProsopoServer {
   constructor(config, pair) {
     this.config = config;
@@ -17,23 +16,29 @@ class ProsopoServer {
     this.defaultEnvironment = this.config.defaultEnvironment;
     const networkName = types.NetworkNamesSchema.parse(this.config.defaultNetwork);
     this.network = util.get(this.config.networks, networkName);
-    this.wsProvider = new rpcProvider.WsProvider(this.network.endpoint);
+    this.wsProvider = new ws.WsProvider(this.network.endpoint);
     this.prosopoContractAddress = this.network.contract.address;
-    this.dappContractAddress = this.config.account.address || contract.getZeroAddress().toString();
+    this.dappContractAddress = this.config.account.address;
     this.contractName = this.network.contract.name;
     this.logger = common.getLogger(this.config.logLevel, "@prosopo/server");
     this.keyring = new keyring.Keyring({
       type: "sr25519"
       // TODO get this from the chain
     });
-    this.abi = JSON.parse(captcha.ContractAbi);
+    this.abi = JSON.parse(contractInfo.ContractAbi);
   }
   async getProviderApi(providerUrl) {
-    return new api.ProviderApi(this.network, providerUrl, this.dappContractAddress);
+    return new api.ProviderApi(this.network, providerUrl, this.getDappContractAddress());
+  }
+  getDappContractAddress() {
+    if (!this.dappContractAddress) {
+      return contract.getZeroAddress(this.getApi()).toString();
+    }
+    return this.dappContractAddress;
   }
   async isReady() {
     try {
-      this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
+      this.api = await Api.ApiPromise.create({ provider: this.wsProvider, initWasm: false });
       await this.getSigner();
       await this.getContractApi();
     } catch (err) {
@@ -43,7 +48,7 @@ class ProsopoServer {
   async getSigner() {
     if (this.pair) {
       if (!this.api) {
-        this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
+        this.api = await Api.ApiPromise.create({ provider: this.wsProvider, initWasm: false });
       }
       await this.api.isReadyOrError;
       try {

package/dist/server.d.ts

@@ -1,16 +1,16 @@
-import { ApiPromise } from '@polkadot/api';
+import { ApiPromise } from '@polkadot/api/promise/Api';
 import { ContractAbi, NetworkConfig, ProcaptchaOutput, ProsopoServerConfigOutput } from '@prosopo/types';
 import { Keyring } from '@polkadot/keyring';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
 import { ProsopoCaptchaContract } from '@prosopo/contract';
 import { ProviderApi } from '@prosopo/api';
-import { WsProvider } from '@polkadot/rpc-provider';
+import { WsProvider } from '@polkadot/rpc-provider/ws';
 export declare class ProsopoServer {
     config: ProsopoServerConfigOutput;
     contract: ProsopoCaptchaContract | undefined;
     prosopoContractAddress: string;
-    dappContractAddress: string;
+    dappContractAddress: string | undefined;
     defaultEnvironment: string;
     contractName: string;
     abi: ContractAbi;
@@ -22,6 +22,7 @@ export declare class ProsopoServer {
     network: NetworkConfig;
     constructor(config: ProsopoServerConfigOutput, pair?: KeyringPair);
     getProviderApi(providerUrl: string): Promise<ProviderApi>;
+    getDappContractAddress(): string;
     isReady(): Promise<void>;
     getSigner(): Promise<void>;
     getApi(): ApiPromise;

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EACH,WAAW,EACX,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC5B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA+C,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAkB,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAiBpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EACH,WAAW,EACX,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC5B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA+C,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAkB,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAItD,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAiBpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIxC,sBAAsB,IAAI,MAAM;IAOjC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}

package/dist/server.js

@@ -11,14 +11,14 @@
 // 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 { ApiPromise } from '@polkadot/api';
+import { ApiPromise } from '@polkadot/api/promise/Api';
 import { NetworkNamesSchema, } from '@prosopo/types';
 import { Keyring } from '@polkadot/keyring';
 import { ProsopoEnvError, getLogger, trimProviderUrl } from '@prosopo/common';
 import { ProsopoCaptchaContract, getZeroAddress } from '@prosopo/contract';
 import { ProviderApi } from '@prosopo/api';
-import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
-import { WsProvider } from '@polkadot/rpc-provider';
+import { WsProvider } from '@polkadot/rpc-provider/ws';
+import { ContractAbi as abiJson } from '@prosopo/captcha-contract/contract-info';
 import { get } from '@prosopo/util';
 export class ProsopoServer {
     constructor(config, pair) {
@@ -29,7 +29,7 @@ export class ProsopoServer {
         this.network = get(this.config.networks, networkName);
         this.wsProvider = new WsProvider(this.network.endpoint);
         this.prosopoContractAddress = this.network.contract.address;
-        this.dappContractAddress = this.config.account.address || getZeroAddress().toString();
+        this.dappContractAddress = this.config.account.address;
         this.contractName = this.network.contract.name;
         this.logger = getLogger(this.config.logLevel, '@prosopo/server');
         this.keyring = new Keyring({
@@ -38,11 +38,17 @@ export class ProsopoServer {
         this.abi = JSON.parse(abiJson);
     }
     async getProviderApi(providerUrl) {
-        return new ProviderApi(this.network, providerUrl, this.dappContractAddress);
+        return new ProviderApi(this.network, providerUrl, this.getDappContractAddress());
+    }
+    getDappContractAddress() {
+        if (!this.dappContractAddress) {
+            return getZeroAddress(this.getApi()).toString();
+        }
+        return this.dappContractAddress;
     }
     async isReady() {
         try {
-            this.api = await ApiPromise.create({ provider: this.wsProvider });
+            this.api = await ApiPromise.create({ provider: this.wsProvider, initWasm: false });
             await this.getSigner();
             await this.getContractApi();
         }
@@ -53,7 +59,7 @@ export class ProsopoServer {
     async getSigner() {
         if (this.pair) {
             if (!this.api) {
-                this.api = await ApiPromise.create({ provider: this.wsProvider });
+                this.api = await ApiPromise.create({ provider: this.wsProvider, initWasm: false });
             }
             await this.api.isReadyOrError;
             try {

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAGH,kBAAkB,GAGrB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE3C,OAAO,EAAoB,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAkB,WAAW,IAAI,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAEnC,MAAM,OAAO,aAAa;IAetB,YAAY,MAAiC,EAAE,IAAkB;QAC7D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAA;QACxD,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACxE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QACrD,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACvD,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAA;QAC3D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAA;QACrF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;QAC9C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAA+B,EAAE,iBAAiB,CAAC,CAAA;QACvF,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC;YACvB,IAAI,EAAE,SAAS,EAAE,+BAA+B;SACnD,CAAC,CAAA;QACF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAAmB;QAC3C,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;IAC/E,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI;YACA,IAAI,CAAC,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;YACjE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACtB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,eAAe,CAAC,GAAY,EAAE,+BAA+B,CAAC,CAAA;SAC3E;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACX,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACX,IAAI,CAAC,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;aACpE;YACD,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAA;YAC7B,IAAI;gBACA,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAC9C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;aACvF;SACJ;IACL,CAAC;IAED,MAAM;QACF,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;SACxD;QACD,OAAO,IAAI,CAAC,GAAG,CAAA;IACnB,CAAC;IAED,WAAW;QACP,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;SAC7D;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAyB;QAC7C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;QACtE,iEAAiE;QACjE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAC/C,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAc,CAAA;QACpF,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,YAAY,CACnE,KAAK,EACL,yBAAyB,EACzB,CAAC,IAAI,EAAE,IAAI,CAAC,CACf,CAAA;QACD,MAAM,kBAAkB,GAAG,eAAe,CAAC,yBAAyB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7F,IAAI,kBAAkB,KAAK,WAAW,EAAE;YACpC,OAAO,KAAK,CAAA;SACf;QACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;QACnF,IAAI,kBAAkB,EAAE;YACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;YAC1D,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;YACnE,OAAO,MAAM,CAAC,gBAAgB,CAAA;SACjC;aAAM;YACH,OAAO,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK;iBAC9F,MAAM,EAAE;iBACR,MAAM,EAAE,CAAA;SAChB;IACL,CAAC;IAEM,KAAK,CAAC,cAAc;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CACtC,IAAI,CAAC,MAAM,EAAE,EACb,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,YAAY,EACjB,CAAC,EACD,IAAI,CAAC,IAAI,CACZ,CAAA;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;CACJ"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/server",
-    "version": "0.2.13",
+    "version": "0.2.14",
     "description": "NodeJS package for server side communication with the prosopo captcha client",
     "main": "./dist/index.js",
     "type": "module",
@@ -37,11 +37,11 @@
         "@polkadot/keyring": "12.5.1",
         "@polkadot/rpc-provider": "10.10.1",
         "@polkadot/types": "10.10.1",
-        "@prosopo/api": "0.2.13",
-        "@prosopo/contract": "0.2.13",
-        "@prosopo/procaptcha": "0.2.13",
-        "@prosopo/captcha-contract": "0.2.13",
-        "@prosopo/types": "0.2.13"
+        "@prosopo/api": "0.2.14",
+        "@prosopo/contract": "0.2.14",
+        "@prosopo/procaptcha": "0.2.14",
+        "@prosopo/captcha-contract": "0.2.14",
+        "@prosopo/types": "0.2.14"
     },
     "devDependencies": {
         "tslib": "2.6.2",

package/dist/cjs/contracts/captcha/dist/build-extrinsic/captcha.cjs

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