@prosopo/server 0.2.13 → 0.2.15

package/README.md

@@ -22,7 +22,7 @@ async function getProsopoServer() {
     const config = getProsopoConfig()
     const pairType = (process.env.PAIR_TYPE as KeypairType) || ('sr25519' as KeypairType)
     const ss58Format = parseInt(process.env.SS58_FORMAT || '') || 42
-    const pair = await getPair(pairType, ss58Format, process.env.REACT_APP_SERVER_MNEMONIC)
+    const pair = await getPair(pairType, ss58Format, process.env.PROSOPO_SITE_PRIVATE_KEY)
     const prosopoServer = new ProsopoServer(pair, config)
 }
 

package/dist/cjs/config.cjs

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const types = require("@prosopo/types");
 const getServerConfig = () => types.ProsopoServerConfigSchema.parse({
-  defaultEnvironment: process.env.DEFAULT_ENVIRONMENT,
+  defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
   // enviromental variables
-  defaultNetwork: process.env.DEFAULT_NETWORK,
+  defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK,
   serverUrl: (
     // https://github.com/prosopo/captcha/issues/701
-    process.env.REACT_APP_SERVER_URL && process.env.REACT_APP_SERVER_PORT ? `${process.env.REACT_APP_SERVER_URL}:${process.env.REACT_APP_SERVER_PORT}` : "http://localhost:9228"
+    process.env.PROSOPO_SERVER_URL && process.env.PROSOPO_SERVER_PORT ? `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT}` : "http://localhost:9228"
   ),
-  dappName: process.env.REACT_APP_DAPP_NAME || "client-example-server",
+  dappName: process.env.PROSOPO_DAPP_NAME || "client-example-server",
   account: {
     password: "",
-    address: process.env.REACT_APP_SERVER_ACCOUNT_ADDRESS || ""
+    address: process.env.PROSOPO_SITE_KEY || ""
   }
 });
 exports.getServerConfig = getServerConfig;

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 {
@@ -65,7 +70,13 @@ class ProsopoServer {
     }
     return this.contract;
   }
-  async isVerified(payload) {
+  /**
+   *
+   * @param payload Info output by procaptcha on completion of the captcha process
+   * @param maxVerifiedTime Maximum time in milliseconds since the blockNumber
+   * @returns
+   */
+  async isVerified(payload, maxVerifiedTime) {
     const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
     const contractApi = await this.getContractApi();
     const block = await this.getApi().rpc.chain.getBlockHash(blockNumber);
@@ -81,9 +92,14 @@ class ProsopoServer {
     console.log("providerUrlTrimmed", providerUrlTrimmed, "commitmentId", commitmentId);
     if (providerUrlTrimmed) {
       const providerApi = await this.getProviderApi(providerUrl);
-      const result = await providerApi.verifyDappUser(user, commitmentId);
+      const result = await providerApi.verifyDappUser(user, commitmentId, maxVerifiedTime);
       return result.solutionApproved;
     } else {
+      const blockTime = contractApi.api.consts.babe.expectedBlockTime.toNumber();
+      const blocksSinceLastCorrectCaptcha = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value.unwrap().unwrap().before.valueOf();
+      if (maxVerifiedTime && blockTime * blocksSinceLastCorrectCaptcha > maxVerifiedTime) {
+        return false;
+      }
       return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
     }
   }

package/dist/config.js

@@ -1,29 +1,14 @@
-// Copyright 2021-2022 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 { ProsopoServerConfigSchema } from '@prosopo/types';
 export const getServerConfig = () => ProsopoServerConfigSchema.parse({
-    defaultEnvironment: process.env.DEFAULT_ENVIRONMENT,
-    defaultNetwork: process.env.DEFAULT_NETWORK,
-    serverUrl: 
-    // https://github.com/prosopo/captcha/issues/701
-    process.env.REACT_APP_SERVER_URL && process.env.REACT_APP_SERVER_PORT
-        ? `${process.env.REACT_APP_SERVER_URL}:${process.env.REACT_APP_SERVER_PORT}`
+    defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
+    defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK,
+    serverUrl: process.env.PROSOPO_SERVER_URL && process.env.PROSOPO_SERVER_PORT
+        ? `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT}`
         : 'http://localhost:9228',
-    dappName: process.env.REACT_APP_DAPP_NAME || 'client-example-server',
+    dappName: process.env.PROSOPO_DAPP_NAME || 'client-example-server',
     account: {
         password: '',
-        address: process.env.REACT_APP_SERVER_ACCOUNT_ADDRESS || '',
+        address: process.env.PROSOPO_SITE_KEY || '',
     },
 });
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.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,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAChC,yBAAyB,CAAC,KAAK,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACnD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC3C,SAAS;IACL,gDAAgD;IAChD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACjE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QAC5E,CAAC,CAAC,uBAAuB;IACjC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,uBAAuB;IACpE,OAAO,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;KAC9D;CACJ,CAAC,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAChC,yBAAyB,CAAC,KAAK,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACnD,SAAS,EAEL,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC7D,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACxE,CAAC,CAAC,uBAAuB;IACjC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,uBAAuB;IAClE,OAAO,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;KAC9C;CACJ,CAAC,CAAA"}

package/dist/index.js

@@ -3,7 +3,6 @@ export { ProsopoServer } from './server.js';
 export { getServerConfig } from './config.js';
 import { getPairAsync } from '@prosopo/contract';
 export const PublicProsopoServer = async (config) => {
-    // if site key is '' then it will burn address
     const pair = await getPairAsync(config.networks[config.defaultNetwork], undefined, config.account.address);
     return new ProsopoServer(config, pair);
 };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiC,EAAE,EAAE;IAC3E,8CAA8C;IAC9C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1G,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiC,EAAE,EAAE;IAE3E,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1G,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}

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,11 +22,12 @@ 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;
     getContract(): ProsopoCaptchaContract;
-    isVerified(payload: ProcaptchaOutput): Promise<boolean>;
+    isVerified(payload: ProcaptchaOutput, maxVerifiedTime?: number): Promise<boolean>;
     getContractApi(): Promise<ProsopoCaptchaContract>;
 }
 //# sourceMappingURL=server.d.ts.map

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;IAaxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqCjF,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}

package/dist/server.js

@@ -1,24 +1,11 @@
-// 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 { 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,20 +16,26 @@ 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({
-            type: 'sr25519', // TODO get this from the chain
+            type: 'sr25519',
         });
         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 +46,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 {
@@ -76,9 +69,8 @@ export class ProsopoServer {
         }
         return this.contract;
     }
-    async isVerified(payload) {
+    async isVerified(payload, maxVerifiedTime) {
         const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
-        // first check if the provider was actually chosen at blockNumber
         const contractApi = await this.getContractApi();
         const block = (await this.getApi().rpc.chain.getBlockHash(blockNumber));
         const getRandomProviderResponse = await this.getContract().queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
@@ -89,10 +81,18 @@ export class ProsopoServer {
         console.log('providerUrlTrimmed', providerUrlTrimmed, 'commitmentId', commitmentId);
         if (providerUrlTrimmed) {
             const providerApi = await this.getProviderApi(providerUrl);
-            const result = await providerApi.verifyDappUser(user, commitmentId);
+            const result = await providerApi.verifyDappUser(user, commitmentId, maxVerifiedTime);
             return result.solutionApproved;
         }
         else {
+            const blockTime = contractApi.api.consts.babe.expectedBlockTime.toNumber();
+            const blocksSinceLastCorrectCaptcha = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value
+                .unwrap()
+                .unwrap()
+                .before.valueOf();
+            if (maxVerifiedTime && blockTime * blocksSinceLastCorrectCaptcha > maxVerifiedTime) {
+                return false;
+            }
             return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
                 .unwrap()
                 .unwrap();

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.15",
     "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.15",
+        "@prosopo/contract": "0.2.15",
+        "@prosopo/procaptcha": "0.2.15",
+        "@prosopo/captcha-contract": "0.2.15",
+        "@prosopo/types": "0.2.15"
     },
     "devDependencies": {
         "tslib": "2.6.2",