@prosopo/provider 0.3.41 → 1.0.1

package/dist/cjs/api/verify.cjs

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const types = require("@prosopo/types");
+const typesReturns = require("@prosopo/captcha-contract/types-returns");
+const common = require("@prosopo/common");
+const tasks = require("../tasks/tasks.cjs");
+const contract = require("@prosopo/contract");
+const errorHandler = require("./errorHandler.cjs");
+const authMiddleware = require("./authMiddleware.cjs");
+const express = require("express");
+function prosopoVerifyRouter(env) {
+  const router = express.Router();
+  const tasks$1 = new tasks.Tasks(env);
+  async function verifyImageSolution(res, req, next, isDapp) {
+    const parsed = types.VerifySolutionBody.parse(req.body);
+    try {
+      const { dappUserSignature, token } = parsed;
+      const { user, dapp, blockNumber, commitmentId } = types.decodeProcaptchaOutput(token);
+      const keyPair = isDapp ? env.keyring.addFromAddress(dapp) : env.keyring.addFromAddress(user);
+      authMiddleware.verifySignature(dappUserSignature, blockNumber.toString(), keyPair);
+      const solution = await (commitmentId ? tasks$1.getDappUserCommitmentById(commitmentId) : tasks$1.getDappUserCommitmentByAccount(user));
+      if (!solution) {
+        tasks$1.logger.debug("Not verified - no solution found");
+        const noSolutionResponse = {
+          [types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_NO_SOLUTION"),
+          [types.ApiParams.verified]: false
+        };
+        return res.json(noSolutionResponse);
+      }
+      if (solution.status === typesReturns.CaptchaStatus.disapproved) {
+        const disapprovedResponse = {
+          [types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
+          [types.ApiParams.verified]: false
+        };
+        return res.json(disapprovedResponse);
+      }
+      if (parsed.maxVerifiedTime) {
+        const currentBlockNumber = await contract.getCurrentBlockNumber(tasks$1.contract.api);
+        const blockTimeMs = contract.getBlockTimeMs(tasks$1.contract.api);
+        const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
+        if (timeSinceCompletion > parsed.maxVerifiedTime) {
+          const expiredResponse = {
+            [types.ApiParams.status]: req.t("API.USER_NOT_VERIFIED_TIME_EXPIRED"),
+            [types.ApiParams.verified]: false
+          };
+          tasks$1.logger.debug("Not verified - time run out");
+          return res.json(expiredResponse);
+        }
+      }
+      const isApproved = solution.status === typesReturns.CaptchaStatus.approved;
+      const response = {
+        [types.ApiParams.status]: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
+        [types.ApiParams.verified]: isApproved,
+        [types.ApiParams.commitmentId]: solution.id.toString(),
+        [types.ApiParams.blockNumber]: solution.requestedAt
+      };
+      return res.json(response);
+    } catch (err) {
+      return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
+    }
+  }
+  router.post(types.ApiPaths.VerifyImageCaptchaSolutionDapp, async (req, res, next) => {
+    try {
+      await verifyImageSolution(res, req, next, true);
+    } catch (err) {
+      return next(new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", { context: { code: 400, error: err } }));
+    }
+  });
+  router.post(types.ApiPaths.VerifyImageCaptchaSolutionUser, async (req, res, next) => {
+    try {
+      await verifyImageSolution(res, req, next, false);
+    } catch (err) {
+      return next(new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", { context: { code: 400, error: err } }));
+    }
+  });
+  router.post(types.ApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
+    try {
+      const { token, dappSignature, verifiedTimeout } = types.ServerPowCaptchaVerifyRequestBody.parse(req.body);
+      const { dapp, blockNumber, challenge } = types.decodeProcaptchaOutput(token);
+      if (!challenge) {
+        const unverifiedResponse = {
+          status: req.t("API.USER_NOT_VERIFIED"),
+          [types.ApiParams.verified]: false
+        };
+        return res.json(unverifiedResponse);
+      }
+      const dappPair = env.keyring.addFromAddress(dapp);
+      authMiddleware.verifySignature(dappSignature, blockNumber.toString(), dappPair);
+      const approved = await tasks$1.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
+      const verificationResponse = {
+        status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
+        [types.ApiParams.verified]: approved
+      };
+      return res.json(verificationResponse);
+    } catch (err) {
+      tasks$1.logger.error(err);
+      return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { code: 400, error: err } }));
+    }
+  });
+  router.use(errorHandler.handleErrors);
+  return router;
+}
+exports.prosopoVerifyRouter = prosopoVerifyRouter;

package/dist/cjs/batch/commitments.cjs

@@ -5,6 +5,7 @@ const types = require("@prosopo/types");
 const common = require("@prosopo/common");
 const contract = require("@prosopo/contract");
 const util = require("../util.cjs");
+const tx = require("@prosopo/tx");
 const random = require("@polkadot/util-crypto/random");
 const BN_TEN_THOUSAND = new bn.BN(1e4);
 const CONTRACT_METHOD_NAME = "providerCommitMany";
@@ -66,9 +67,9 @@ class BatchCommitmentsTask {
     const txs = [];
     const fragment = this.contract.abi.findMessage(CONTRACT_METHOD_NAME);
     const batchedCommitmentIds = [];
-    let totalRefTime = new bn.BN(0);
-    let totalProofSize = new bn.BN(0);
-    let totalFee = new bn.BN(0);
+    let totalRefTime = bn.BN_ZERO;
+    let totalProofSize = bn.BN_ZERO;
+    let totalFee = bn.BN_ZERO;
     const maxBlockWeight = this.contract.api.consts.system.blockWeights.maxBlock;
     const commitmentArray = [];
     let extrinsic;
@@ -87,7 +88,7 @@ class BatchCommitmentsTask {
         paymentInfo = (await extrinsic.paymentInfo(this.contract.pair)).partialFee.toBn();
         this.logger.debug(`${CONTRACT_METHOD_NAME} paymentInfo:`, paymentInfo.toNumber());
       } catch (e) {
-        paymentInfo = new bn.BN(0);
+        paymentInfo = bn.BN_ZERO;
       }
       totalRefTime = totalRefTime.add(
         this.contract.api.registry.createType("WeightV2", options.gasLimit).refTime.toBn()
@@ -100,13 +101,13 @@ class BatchCommitmentsTask {
       this.logger.debug(
         "Free balance",
         "`",
-        (await this.contract.api.query.system.account(this.contract.pair.address)).data.free.toBn().div(contract.oneUnit(this.contract.api)).toString(),
+        (await this.contract.api.query.system.account(this.contract.pair.address)).data.free.toBn().div(tx.oneUnit(this.contract.api)).toString(),
         "`",
         "UNIT"
       );
       this.logger.debug(
         "Total Fee `",
-        totalFee.div(contract.oneUnit(this.contract.api)).toString(),
+        totalFee.div(tx.oneUnit(this.contract.api)).toString(),
         "`",
         "UNIT"
       );

package/dist/cjs/index.cjs

@@ -4,6 +4,7 @@ require("./tasks/index.cjs");
 const util = require("./util.cjs");
 require("./batch/index.cjs");
 const captcha = require("./api/captcha.cjs");
+const verify = require("./api/verify.cjs");
 const admin = require("./api/admin.cjs");
 const errorHandler = require("./api/errorHandler.cjs");
 const tasks = require("./tasks/tasks.cjs");
@@ -14,6 +15,7 @@ exports.parseBlockNumber = util.parseBlockNumber;
 exports.promiseQueue = util.promiseQueue;
 exports.shuffleArray = util.shuffleArray;
 exports.prosopoRouter = captcha.prosopoRouter;
+exports.prosopoVerifyRouter = verify.prosopoVerifyRouter;
 exports.prosopoAdminRouter = admin.prosopoAdminRouter;
 exports.handleErrors = errorHandler.handleErrors;
 exports.Tasks = tasks.Tasks;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './tasks/index.js';
 export * from './util.js';
 export * from './batch/index.js';
 export * from './api/captcha.js';
+export * from './api/verify.js';
 export * from './api/admin.js';
 export * from './api/errorHandler.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}

package/dist/index.js

@@ -2,6 +2,7 @@ export * from './tasks/index.js';
 export * from './util.js';
 export * from './batch/index.js';
 export * from './api/captcha.js';
+export * from './api/verify.js';
 export * from './api/admin.js';
 export * from './api/errorHandler.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}

package/dist/tests/contract/helpers.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.test.d.ts","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAO9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
+{"version":3,"file":"helpers.test.d.ts","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAO9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}

package/dist/tests/contract/helpers.test.js

@@ -1,10 +1,9 @@
-import { BN } from '@polkadot/util/bn';
 import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
 import { MockEnvironment } from '@prosopo/env';
 import { TypeDefInfo } from '@polkadot/types-create/types';
 import { at } from '@prosopo/util';
 import { beforeEach, describe, expect, test } from 'vitest';
-import { encodeStringArgs, getPairAsync, wrapQuery } from '@prosopo/contract';
+import { encodeStringArgs, getPairAsync } from '@prosopo/contract';
 import { getTestConfig } from '@prosopo/config';
 import { hexToU8a } from '@polkadot/util/hex';
 describe('CONTRACT HELPERS', function () {
@@ -21,8 +20,6 @@ describe('CONTRACT HELPERS', function () {
             throw new ProsopoEnvError(e);
         }
         context.env = env;
-        const promiseStakeDefault = wrapQuery(context.env.getContractInterface().query.getProviderStakeThreshold, context.env.getContractInterface().query)();
-        context.providerStakeThreshold = new BN((await promiseStakeDefault).toNumber());
         return () => {
             env.db?.close();
         };

package/dist/tests/contract/helpers.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.test.js","sourceRoot":"","sources":["../../../src/tests/contract/helpers.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAO7C,QAAQ,CAAC,kBAAkB,EAAE;IACzB,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAEjD,UAAU,CAAC,KAAK,WAAW,OAAO;QAC9B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACxD,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,aAAa,EAAE,EAAE,SAAS,CAAC,CAAA;QAC3D,IAAI;YACA,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;SACtB;QAAC,OAAO,CAAC,EAAE;YAER,MAAM,IAAI,eAAe,CAAC,CAAU,CAAC,CAAA;SACxC;QACD,OAAO,CAAC,GAAG,GAAG,GAAG,CAAA;QACjB,OAAO,GAAG,EAAE;YACR,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,CAAA;QACnB,CAAC,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,wDAAwD,EAAE,KAAK,WAAW,EAAE,GAAG,EAAE;QAClF,IAAI;YACA,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACrB,MAAM,IAAI,GAAG,CAAC,wBAAwB,CAAC,CAAA;YACvC,MAAM,SAAS,GAAG;gBACd,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBACpE,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE;oBACL,OAAO,EAAoB,CAAA;gBAC/B,CAAC;gBACD,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,CAAC,EAAE,CAAC;gBACV,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAqB;gBACpD,KAAK,EAAE;oBACH,OAAO,EAAgB,CAAA;gBAC3B,CAAC;aACJ,CAAA;YACD,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAChG,QAAQ,CAAC,oEAAoE,CAAC,CAAC,QAAQ,EAAE,CAC5F,CAAA;YACD,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;SAC1B;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;SAC7B;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/dist/tests/dataUtils/DatabasePopulator.d.ts

@@ -67,7 +67,6 @@ declare class DatabasePopulator implements IDatabaseAccounts, IDatabasePopulator
     registerDappWithStake(fund: boolean): Promise<TestAccount>;
     registerDappUser(fund: boolean): Promise<TestAccount>;
     private randomUrl;
-    private submitTx;
     createError(err: Error, functionName: string): ProsopoEnvError;
 }
 export default DatabasePopulator;

package/dist/tests/dataUtils/DatabasePopulator.d.ts.map

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

package/dist/tests/dataUtils/DatabasePopulator.js

@@ -1,9 +1,9 @@
-import { BN } from '@polkadot/util/bn';
+import { BN, BN_ZERO } from '@polkadot/util/bn';
 import { ContractDeployer, getPairAsync, wrapQuery } from '@prosopo/contract';
 import { DappPayee, Payee } from '@prosopo/captcha-contract/types-returns';
 import { ProsopoContractError, ProsopoEnvError, getLogLevel, getLogger } from '@prosopo/common';
 import { Tasks } from '../../tasks/index.js';
-import { TransactionQueue } from '@prosopo/tx';
+import { TransactionQueue, submitTx } from '@prosopo/tx';
 import { sendFunds as _sendFunds, getSendAmount, getStakeAmount } from './funds.js';
 import { accountAddress, accountContract, accountMnemonic } from '../accounts.js';
 import { createType } from '@polkadot/types/create';
@@ -35,23 +35,22 @@ class DatabasePopulator {
         this._registeredDappsWithStake = [];
         this._registeredDappUsers = [];
         this._registeredProviderUrls = new Set();
-        this.providerStakeDefault = 0;
-        this.stakeAmount = 0;
-        this.sendAmount = 0;
+        this.providerStakeDefault = BN_ZERO;
+        this.stakeAmount = BN_ZERO;
+        this.sendAmount = BN_ZERO;
         this.mockEnv = env;
         this.dappAbiMetadata = dappAbiMetadata;
         this.dappWasm = dappWasm;
         this.logger = getLogger(getLogLevel(logLevel), 'DatabasePopulator');
-        this._isReady = this.mockEnv.isReady().then(() => {
+        this._isReady = this.mockEnv.isReady().then(async () => {
             try {
                 this._transactionQueue = new TransactionQueue(this.mockEnv.getApi(), this.mockEnv.getPair(), this.logger.getLogLevel());
                 const tasks = new Tasks(this.mockEnv);
                 const promiseStakeDefault = wrapQuery(tasks.contract.query.getProviderStakeThreshold, tasks.contract.query)();
-                return promiseStakeDefault.then((res) => {
-                    this.providerStakeDefault = new BN(res.toNumber());
-                    this.stakeAmount = getStakeAmount(env, this.providerStakeDefault);
-                    this.sendAmount = getSendAmount(env, this.stakeAmount);
-                });
+                const res = await promiseStakeDefault;
+                this.providerStakeDefault = new BN(res.rawNumber);
+                this.stakeAmount = getStakeAmount(env, this.providerStakeDefault);
+                this.sendAmount = getSendAmount(env, this.stakeAmount);
             }
             catch (e) {
                 throw new Error(String(e));
@@ -145,7 +144,7 @@ class DatabasePopulator {
             const pair = await this.mockEnv.getSigner();
             const tasks = new Tasks(this.mockEnv);
             const args = [_url, PROVIDER_FEE, PROVIDER_PAYEE];
-            const result = await this.submitTx(tasks, 'providerRegister', args, this.stakeAmount, pair);
+            const result = await submitTx(this.transactionQueue, tasks.contract, 'providerRegister', args, this.stakeAmount, pair);
             this.logger.info('Provider registered with account', accountAddress(account), 'url', urlString, result.toHuman());
             const _provider = (await tasks.contract.query.getProvider(accountAddress(account))).value.unwrap().unwrap();
             const providerTestAccount = {
@@ -172,7 +171,7 @@ class DatabasePopulator {
                 PROVIDER_PAYEE,
             ];
             this.logger.info('Updating provider', account.address, account.contractValue);
-            await this.submitTx(tasks, 'providerUpdate', args, 0, pair);
+            await submitTx(this.transactionQueue, tasks.contract, 'providerUpdate', args, BN_ZERO, pair);
             this.logger.info('Provider updated', account.address);
             return (await tasks.contract.query.getProvider(accountAddress(account))).value.unwrap().unwrap();
         }
@@ -252,7 +251,7 @@ class DatabasePopulator {
                 throw new ProsopoContractError(new Error(error));
             }
             this.logger.debug('Submitting TX to queue using account', tasks.contract.pair.address);
-            const txResult = await this.submitTx(tasks, 'dappRegister', [contractAddress, DappPayee.dapp], 0, tasks.contract.pair);
+            const txResult = await submitTx(this.transactionQueue, tasks.contract, 'dappRegister', [contractAddress, DappPayee.dapp], BN_ZERO, tasks.contract.pair);
             this.logger.info('App registered', contractAddress, txResult.toHuman());
             if (txResult.isError) {
                 throw new ProsopoContractError(new Error(txResult.isError.toString()));
@@ -276,7 +275,7 @@ class DatabasePopulator {
         await this.changeSigner(account);
         const tasks = new Tasks(this.mockEnv);
         this.logger.info('Funding app', accountContract(account), 'from account', tasks.contract.pair.address);
-        await this.submitTx(tasks, 'dappFund', [accountContract(account)], this.stakeAmount, tasks.contract.pair);
+        await submitTx(this.transactionQueue, tasks.contract, 'dappFund', [accountContract(account)], this.stakeAmount, tasks.contract.pair);
         this.logger.info('App funded');
         return (await tasks.contract.query.getDapp(accountContract(account))).value.unwrap().unwrap();
     }
@@ -313,27 +312,6 @@ class DatabasePopulator {
         this._registeredProviderUrls.add(url);
         return url;
     }
-    async submitTx(tasks, method, args, value, pair) {
-        return new Promise((resolve, reject) => {
-            if (tasks.contract.nativeContract.tx &&
-                method in tasks.contract.nativeContract.tx &&
-                tasks.contract.nativeContract.tx[method] !== undefined) {
-                try {
-                    tasks.contract.dryRunContractMethod(method, args, value).then((extrinsic) => {
-                        this.transactionQueue.add(extrinsic, (result) => {
-                            resolve(result);
-                        }, pair, method);
-                    });
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }
-            else {
-                reject(new ProsopoContractError('CONTRACT.INVALID_METHOD'));
-            }
-        });
-    }
     createError(err, functionName) {
         const e = {
             error: err,

package/dist/tests/dataUtils/DatabasePopulator.js.map

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

package/dist/tests/dataUtils/funds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AAGtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAiB9C,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyFf;AAUD,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAoB9G;AAQD,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}
+{"version":3,"file":"funds.d.ts","sourceRoot":"","sources":["../../../src/tests/dataUtils/funds.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AAGtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAW,MAAM,aAAa,CAAA;AAiBvD,wBAAsB,SAAS,CAC3B,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyFf;AAUD,wBAAgB,cAAc,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,EAAE,CAuB9G;AAQD,wBAAgB,aAAa,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAS1E"}

package/dist/tests/dataUtils/funds.js

@@ -1,7 +1,8 @@
 import { BN } from '@polkadot/util/bn';
 import { ProsopoEnvError } from '@prosopo/common';
+import { oneUnit } from '@prosopo/tx';
 import { at } from '@prosopo/util';
-import { dispatchErrorHandler, oneUnit } from '@prosopo/contract';
+import { dispatchErrorHandler } from '@prosopo/contract';
 const devMnemonics = ['//Alice', '//Bob', '//Charlie', '//Dave', '//Eve', '//Ferdie'];
 let current = -1;
 const MAX_ACCOUNT_FUND = 10000;
@@ -84,12 +85,13 @@ export async function sendFunds(env, address, who, amount, txQueue) {
 export function getStakeAmount(env, providerStakeDefault, stakeMultiplier) {
     const unit = oneUnit(env.getApi());
     const stake100 = BN.max(providerStakeDefault.muln(stakeMultiplier || 100), env.getApi().consts.balances.existentialDeposit.toBn());
-    const maxStake = env.getApi().consts.balances.existentialDeposit.toBn().muln(MAX_ACCOUNT_FUND);
+    const existentialDeposit = env.getApi().consts.balances.existentialDeposit.toBn();
+    const maxStake = BN.max(env.getApi().consts.balances.existentialDeposit.toBn().muln(MAX_ACCOUNT_FUND), unit.muln(MAX_ACCOUNT_FUND));
     if (stake100.lt(maxStake)) {
-        env.logger.debug('Setting stake amount to', stake100.div(unit).toNumber(), 'UNIT');
+        env.logger.debug('Setting stake amount to', stake100.div(unit).toString(), 'UNIT');
         return stake100;
     }
-    env.logger.debug('Setting stake amount to', maxStake.div(unit).toNumber(), 'UNIT');
+    env.logger.debug('Setting stake amount to', maxStake.div(unit).toString(), 'UNIT');
     return maxStake;
 }
 export function getSendAmount(env, stakeAmount) {

package/dist/tests/dataUtils/funds.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"tasks.test.d.ts","sourceRoot":"","sources":["../../../src/tests/tasks/tasks.test.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AA4C9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}
+{"version":3,"file":"tasks.test.d.ts","sourceRoot":"","sources":["../../../src/tests/tasks/tasks.test.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AA2C9C,OAAO,QAAQ,QAAQ,CAAC;IAEpB,UAAiB,WAAY,SAAQ,eAAe;KAAG;CAC1D"}

package/dist/tests/tasks/tasks.test.js

@@ -11,7 +11,6 @@ import { ProsopoContractError, ProsopoEnvError, hexHash, i18n } from '@prosopo/c
 import { ScheduledTaskNames } from '@prosopo/types';
 import { assert, beforeEach, describe, expect, test } from 'vitest';
 import { at, get } from '@prosopo/util';
-import { createType } from '@polkadot/types/create';
 import { datasetWithIndexSolutions } from '@prosopo/datasets';
 import { getDispatchError } from '@prosopo/tx';
 import { getSendAmount, getStakeAmount, sendFunds } from '../dataUtils/funds.js';
@@ -54,7 +53,9 @@ describe.sequential('CONTRACT TASKS', async function () {
         }
         context.env = env;
         const promiseStakeDefault = wrapQuery(context.env.getContractInterface().query.getProviderStakeThreshold, context.env.getContractInterface().query)();
-        context.providerStakeThreshold = new BN((await promiseStakeDefault).toNumber());
+        const dappStakeDefault = wrapQuery(context.env.getContractInterface().query.getDappStakeThreshold, context.env.getContractInterface().query)();
+        context.providerStakeThreshold = (await promiseStakeDefault).rawNumber;
+        context.dappStakeThreshold = (await promiseStakeDefault).rawNumber;
         return () => {
             env.db?.close();
         };
@@ -215,10 +216,10 @@ describe.sequential('CONTRACT TASKS', async function () {
         console.log(JSON.stringify(result.error, null, 4));
         expect(result?.error).to.be.undefined;
     });
-    test('Provider update', async ({ env }) => {
+    test('Provider update', async ({ env, providerStakeThreshold }) => {
         const providerAccount = await getUser(env, AccountKey.providers);
         const tasks = await getSignedTasks(env, providerAccount);
-        const value = new BN((await tasks.contract.query.getProviderStakeThreshold()).value.unwrap().toNumber());
+        const value = providerStakeThreshold;
         const result = (await tasks.contract.tx.providerUpdate(Array.from(stringToU8a(PROVIDER.url + randomAsHex().slice(0, 8))), PROVIDER.fee, PROVIDER_PAYEE, { value })).result;
         if (result?.isError && result?.dispatchError) {
             const dispatchError = getDispatchError(result?.dispatchError);
@@ -397,7 +398,7 @@ describe.sequential('CONTRACT TASKS', async function () {
         const result = (await tasks.contract.query.getAllProviderAccounts()).value.unwrap().unwrap();
         expect(result).to.be.an('array');
     });
-    test('Dapp registration', async ({ env, providerStakeThreshold }) => {
+    test('Dapp registration', async ({ env, providerStakeThreshold, dappStakeThreshold }) => {
         const newAccount = env.createAccountAndAddToKeyring() || ['', ''];
         const tasks = await getSignedTasks(env, newAccount);
         const stakeAmount = getStakeAmount(env, providerStakeThreshold);
@@ -428,16 +429,15 @@ describe.sequential('CONTRACT TASKS', async function () {
         const result = (await tasks.contract.query.getDapp(accountContract(dappAccount))).value.unwrap().unwrap();
         expect(result).to.have.a.property('status');
     });
-    test('Dapp fund', async ({ env }) => {
+    test('Dapp fund', async ({ env, dappStakeThreshold }) => {
         const dappAccount = await getUser(env, AccountKey.dappsWithStake);
         const tasks = await getSignedTasks(env, dappAccount);
-        const value = createType(env.getContractInterface().abi.registry, 'u128', '10');
         const dappContractAddress = accountContract(dappAccount);
         const dappBefore = (await tasks.contract.query.getDapp(dappContractAddress)).value.unwrap().unwrap();
-        const result = (await tasks.contract.tx.dappFund(dappContractAddress, { value })).result;
+        const result = (await tasks.contract.tx.dappFund(dappContractAddress, { value: dappStakeThreshold })).result;
         expect(result?.isError).to.be.false;
         const dappAfter = (await tasks.contract.query.getDapp(dappContractAddress)).value.unwrap().unwrap();
-        expect(dappBefore.balance.toNumber() + value.toNumber()).to.equal(dappAfter.balance.toNumber());
+        expect(dappBefore.balance.rawNumber.add(dappStakeThreshold).toString()).to.equal(dappAfter.balance.rawNumber.toString());
     });
     test('Captchas are correctly formatted before being passed to the API layer', async ({ env }) => {
         const dappUserAccount = await getUser(env, AccountKey.dappUsers);