@prosopo/server 1.0.1 → 2.0.0

package/dist/cjs/index.cjs

@@ -4,7 +4,11 @@ const server = require("./server.cjs");
 const config = require("./config.cjs");
 const contract = require("@prosopo/contract");
 const PublicProsopoServer = async (config2) => {
-  const pair = await contract.getPairAsync(config2.networks[config2.defaultNetwork], void 0, config2.account.address);
+  const pair = await contract.getPairAsync(
+    config2.networks[config2.defaultNetwork],
+    void 0,
+    config2.account.address
+  );
   return new server.ProsopoServer(config2, pair);
 };
 exports.ProsopoServer = server.ProsopoServer;

package/dist/cjs/server.cjs

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-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 util$1 = require("@polkadot/util");
 const api = require("@prosopo/api");
-const ws = require("@polkadot/rpc-provider/ws");
-const contractInfo = require("@prosopo/captcha-contract/contract-info");
+const common = require("@prosopo/common");
+const types = require("@prosopo/types");
 const util = require("@prosopo/util");
-const util$1 = require("@polkadot/util");
 class ProsopoServer {
   constructor(config, pair) {
     this.config = config;
@@ -17,113 +13,24 @@ 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 ws.WsProvider(this.network.endpoint);
     this.prosopoContractAddress = this.network.contract.address;
     this.dappContractAddress = this.config.account.address;
     this.contractName = this.network.contract.name;
-    this.logger = common.getLogger(this.config.logLevel, "@prosopo/server");
+    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(contractInfo.ContractAbi);
-  }
-  async getProviderApi(providerUrl) {
-    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.ApiPromise.create({ provider: this.wsProvider, initWasm: false, noInitWarn: true });
-      await this.getSigner();
-      await this.getContractApi();
-    } catch (error) {
-      throw new common.ProsopoEnvError("GENERAL.ENVIRONMENT_NOT_READY", { context: { error } });
-    }
-  }
-  async getSigner() {
-    if (this.pair) {
-      if (!this.api) {
-        this.api = await Api.ApiPromise.create({ provider: this.wsProvider, initWasm: false, noInitWarn: true });
-      }
-      await this.api.isReadyOrError;
-      try {
-        this.pair = this.keyring.addPair(this.pair);
-      } catch (error) {
-        throw new common.ProsopoEnvError("CONTRACT.SIGNER_UNDEFINED", {
-          context: { failedFuncName: this.getSigner.name, error }
-        });
-      }
-    }
-  }
-  getApi() {
-    if (this.api === void 0) {
-      throw new common.ProsopoEnvError(new Error("api undefined"));
-    }
-    return this.api;
-  }
-  getContract() {
-    if (this.contract === void 0) {
-      throw new common.ProsopoEnvError(new Error("contract undefined"));
-    }
-    return this.contract;
-  }
-  /**
-   * Check if the provider was actually chosen at blockNumber.
-   * - If no blockNumber is provided, check the last `n` blocks where `n` is the number of blocks that fit in
-   *   `maxVerifiedTime`.
-   * - If no `maxVerifiedTime` is provided, use the default of 1 minute.
-   * @param user
-   * @param dapp
-   * @param providerUrl
-   * @param blockNumber
-   * @returns
-   */
-  async checkRandomProvider(user, dapp, providerUrl, blockNumber) {
-    const block = await this.getApi().rpc.chain.getBlockHash(blockNumber);
-    const getRandomProviderResponse = await this.getContract().queryAtBlock(
-      block,
-      "getRandomActiveProvider",
-      [user, dapp]
+  getProviderApi(providerUrl) {
+    return new api.ProviderApi(
+      this.network,
+      providerUrl,
+      this.dappContractAddress || ""
     );
-    if (common.trimProviderUrl(getRandomProviderResponse.provider.url.toString()) === providerUrl) {
-      return getRandomProviderResponse.provider;
-    }
-    return void 0;
-  }
-  /**
-   * Verify the user with the contract. We check the contract to see if the user has completed a captcha in the
-   * past. If they have, we check the time since the last correct captcha is within the maxVerifiedTime and we check
-   * whether the user is marked as human within the contract.
-   * @param user
-   * @param maxVerifiedTime
-   */
-  async verifyContract(user, maxVerifiedTime) {
-    try {
-      const contractApi = await this.getContractApi();
-      this.logger.info("Provider URL not provided. Verifying with contract.");
-      const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value.unwrap().unwrap().before.valueOf();
-      const recent = await contract.verifyRecency(
-        (await this.getContractApi()).api,
-        correctCaptchaBlockNumber,
-        maxVerifiedTime
-      );
-      if (!recent) {
-        this.logger.info("User has not completed a captcha recently");
-        return false;
-      }
-      const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
-      this.logger.info("isHuman", isHuman);
-      return isHuman;
-    } catch (error) {
-      this.logger.error(error);
-      return false;
-    }
   }
   /**
    * Verify the user with the provider URL passed in. If a challenge is provided, we use the challenge to verify the
@@ -132,26 +39,45 @@ class ProsopoServer {
    * @param blockNumber
    * @param timeouts
    * @param providerUrl
+   * @param timestamp
    * @param challenge
    */
-  async verifyProvider(token, blockNumber, timeouts, providerUrl, challenge) {
+  async verifyProvider(token, blockNumber, timeouts, providerUrl, timestamp, challenge) {
     this.logger.info("Verifying with provider.");
     const blockNumberString = blockNumber.toString();
     const dappUserSignature = this.pair?.sign(blockNumberString);
     if (!dappUserSignature) {
-      throw new common.ProsopoContractError("CAPTCHA.INVALID_BLOCK_NO", { context: { error: "Block number not found" } });
+      throw new common.ProsopoContractError("CAPTCHA.INVALID_BLOCK_NO", {
+        context: { error: "Block number not found" }
+      });
     }
     const signatureHex = util$1.u8aToHex(dappUserSignature);
     const providerApi = await this.getProviderApi(providerUrl);
     if (challenge) {
-      const result2 = await providerApi.submitPowCaptchaVerify(token, signatureHex, timeouts.pow.cachedTimeout);
+      const powTimeout = this.config.timeouts.pow.cachedTimeout;
+      const recent2 = timestamp ? Date.now() - timestamp < powTimeout : false;
+      if (!recent2) {
+        this.logger.error("PoW captcha is not recent");
+        return false;
+      }
+      const result2 = await providerApi.submitPowCaptchaVerify(
+        token,
+        signatureHex,
+        timeouts.pow.cachedTimeout
+      );
       return result2.verified;
     }
-    const recent = await contract.verifyRecency((await this.getContractApi()).api, blockNumber, timeouts.image.cachedTimeout);
+    const imageTimeout = this.config.timeouts.image.cachedTimeout;
+    const recent = timestamp ? Date.now() - timestamp < imageTimeout : false;
     if (!recent) {
+      this.logger.error("Image captcha is not recent");
       return false;
     }
-    const result = await providerApi.verifyDappUser(token, signatureHex, timeouts.image.cachedTimeout);
+    const result = await providerApi.verifyDappUser(
+      token,
+      signatureHex,
+      timeouts.image.cachedTimeout
+    );
     return result.verified;
   }
   /**
@@ -165,23 +91,20 @@ class ProsopoServer {
       return false;
     }
     const payload = types.decodeProcaptchaOutput(token);
-    const { user, providerUrl, blockNumber, challenge } = types.ProcaptchaOutputSchema.parse(payload);
-    if (providerUrl && blockNumber) {
-      return await this.verifyProvider(token, blockNumber, this.config.timeouts, providerUrl, challenge);
-    } else {
-      return await this.verifyContract(user, this.config.timeouts.contract.maxVerifiedTime);
+    const { providerUrl, blockNumber, challenge, timestamp } = types.ProcaptchaOutputSchema.parse(payload);
+    if (providerUrl) {
+      return await this.verifyProvider(
+        token,
+        blockNumber,
+        this.config.timeouts,
+        providerUrl,
+        Number(timestamp),
+        challenge
+      );
     }
-  }
-  async getContractApi() {
-    this.contract = new contract.ProsopoCaptchaContract(
-      this.getApi(),
-      this.abi,
-      this.prosopoContractAddress,
-      this.contractName,
-      0,
-      this.pair
-    );
-    return this.contract;
+    throw new common.ProsopoApiError("API.BAD_REQUEST", {
+      context: { message: "No provider URL" }
+    });
   }
 }
 exports.ProsopoServer = ProsopoServer;

package/dist/config.d.ts

@@ -24,11 +24,11 @@ export declare const getServerConfig: () => {
         password?: string | undefined;
     };
     networks: Record<"development" | "rococo" | "shiden" | "astar", {
-        endpoint: string[];
         contract: {
-            address: string;
             name: string;
+            address: string;
         };
+        endpoint: string[];
         pairType: "sr25519" | "ed25519" | "ecdsa" | "ethereum";
         ss58Format: number;
     }>;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAWtB,CAAA;AAEN,eAAO,MAAM,YAAY,QAAO,MAQ/B,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAWzB,CAAC;AAEJ,eAAO,MAAM,YAAY,QAAO,MAQ/B,CAAC"}

package/dist/config.js

@@ -1,13 +1,13 @@
-import { ProsopoServerConfigSchema } from '@prosopo/types';
+import { ProsopoServerConfigSchema } from "@prosopo/types";
 export const getServerConfig = () => ProsopoServerConfigSchema.parse({
     defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
     defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK,
     serverUrl: getServerUrl(),
-    dappName: process.env.PROSOPO_DAPP_NAME || 'client-example-server',
+    dappName: process.env.PROSOPO_DAPP_NAME || "client-example-server",
     account: {
-        password: '',
-        address: process.env.PROSOPO_SITE_KEY || '',
-        secret: process.env.PROSOPO_SITE_PRIVATE_KEY || '',
+        password: "",
+        address: process.env.PROSOPO_SITE_KEY || "",
+        secret: process.env.PROSOPO_SITE_PRIVATE_KEY || "",
     },
 });
 export const getServerUrl = () => {
@@ -17,6 +17,6 @@ export const getServerUrl = () => {
         }
         return `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT || 9228}`;
     }
-    return 'http://localhost:9228';
+    return "http://localhost:9228";
 };
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"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,EAAE,YAAY,EAAE;IACzB,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;QAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;KACrD;CACJ,CAAC,CAAA;AAEN,MAAM,CAAC,MAAM,YAAY,GAAG,GAAW,EAAE;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC9C,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;SACxC;QACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAA;KACxF;IACD,OAAO,uBAAuB,CAAA;AAClC,CAAC,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CACnC,yBAAyB,CAAC,KAAK,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACnD,SAAS,EAAE,YAAY,EAAE;IACzB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,uBAAuB;IAClE,OAAO,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;QAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;KAClD;CACD,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG,GAAW,EAAE;IACxC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QACnC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACjD,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;SACtC;QACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;KACtF;IACD,OAAO,uBAAuB,CAAC;AAChC,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { ProsopoServer } from './server.js';
-export { ProsopoServer } from './server.js';
-export { getServerConfig, getServerUrl } from './config.js';
-import { ProsopoServerConfigOutput } from '@prosopo/types';
+import { ProsopoServer } from "./server.js";
+export { ProsopoServer } from "./server.js";
+export { getServerConfig, getServerUrl } from "./config.js";
+import type { ProsopoServerConfigOutput } from "@prosopo/types";
 export declare const PublicProsopoServer: (config: ProsopoServerConfigOutput) => Promise<ProsopoServer>;
 //# 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,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,WAAkB,yBAAyB,2BAI1E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAChE,eAAO,MAAM,mBAAmB,WACvB,yBAAyB,2BASjC,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
-import { ProsopoServer } from './server.js';
-export { ProsopoServer } from './server.js';
-export { getServerConfig, getServerUrl } from './config.js';
-import { getPairAsync } from '@prosopo/contract';
+import { ProsopoServer } from "./server.js";
+export { ProsopoServer } from "./server.js";
+export { getServerConfig, getServerUrl } from "./config.js";
+import { getPairAsync } from "@prosopo/contract";
 export const PublicProsopoServer = async (config) => {
     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,YAAY,EAAE,MAAM,aAAa,CAAA;AAE3D,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACvC,MAAiC,EAChC,EAAE;IAEH,MAAM,IAAI,GAAG,MAAM,YAAY,CAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EACtC,SAAS,EACT,MAAM,CAAC,OAAO,CAAC,OAAO,CACtB,CAAC;IACF,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC"}

package/dist/server.d.ts

@@ -1,36 +1,21 @@
-import { ApiPromise } from '@polkadot/api/promise/Api';
-import { CaptchaTimeoutOutput, ContractAbi, NetworkConfig, ProcaptchaToken, 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/ws';
+import { Keyring } from "@polkadot/keyring";
+import type { KeyringPair } from "@polkadot/keyring/types";
+import { ProviderApi } from "@prosopo/api";
+import { type Logger } from "@prosopo/common";
+import { type CaptchaTimeoutOutput, type NetworkConfig, type ProcaptchaToken, type ProsopoServerConfigOutput } from "@prosopo/types";
 export declare class ProsopoServer {
     config: ProsopoServerConfigOutput;
-    contract: ProsopoCaptchaContract | undefined;
     prosopoContractAddress: string;
     dappContractAddress: string | undefined;
     defaultEnvironment: string;
     contractName: string;
-    abi: ContractAbi;
     logger: Logger;
-    wsProvider: WsProvider;
     keyring: Keyring;
     pair: KeyringPair | undefined;
-    api: ApiPromise | undefined;
     network: NetworkConfig;
     constructor(config: ProsopoServerConfigOutput, pair?: KeyringPair);
-    getProviderApi(providerUrl: string): Promise<ProviderApi>;
-    getDappContractAddress(): string;
-    isReady(): Promise<void>;
-    getSigner(): Promise<void>;
-    getApi(): ApiPromise;
-    getContract(): ProsopoCaptchaContract;
-    checkRandomProvider(user: string, dapp: string, providerUrl: string, blockNumber: number): Promise<import("@prosopo/captcha-contract/types-returns").Provider | undefined>;
-    verifyContract(user: string, maxVerifiedTime: number): Promise<boolean>;
-    verifyProvider(token: string, blockNumber: number, timeouts: CaptchaTimeoutOutput, providerUrl: string, challenge?: string): Promise<boolean>;
+    getProviderApi(providerUrl: string): ProviderApi;
+    verifyProvider(token: string, blockNumber: number, timeouts: CaptchaTimeoutOutput, providerUrl: string, timestamp: number, challenge?: string): Promise<boolean>;
     isVerified(token: ProcaptchaToken): 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,2BAA2B,CAAA;AACtD,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,aAAa,EAGb,eAAe,EACf,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,EAAqE,MAAM,iBAAiB,CAAA;AACrH,OAAO,EAAE,sBAAsB,EAAiC,MAAM,mBAAmB,CAAA;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAMtD,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;IAgBhC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAkB/B,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAsBjF,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAsCpD,cAAc,CACvB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM;IAgCT,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BpD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAEL,KAAK,MAAM,EAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,oBAAoB,EAEzB,KAAK,aAAa,EAGlB,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC/B,MAAM,gBAAgB,CAAC;AAIxB,qBAAa,aAAa;IACxB,MAAM,EAAE,yBAAyB,CAAC;IAClC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;gBAEX,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAkBjE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;IAkBnC,cAAc,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM;IA8CP,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BlE"}

package/dist/server.js

@@ -1,14 +1,10 @@
-import { ApiPromise } from '@polkadot/api/promise/Api';
-import { NetworkNamesSchema, ProcaptchaOutputSchema, } from '@prosopo/types';
-import { Keyring } from '@polkadot/keyring';
-import { ProsopoContractError, ProsopoEnvError, getLogger, trimProviderUrl } from '@prosopo/common';
-import { ProsopoCaptchaContract, getZeroAddress, verifyRecency } from '@prosopo/contract';
-import { ProviderApi } from '@prosopo/api';
-import { WsProvider } from '@polkadot/rpc-provider/ws';
-import { ContractAbi as abiJson } from '@prosopo/captcha-contract/contract-info';
-import { decodeProcaptchaOutput } from '@prosopo/types';
-import { get } from '@prosopo/util';
-import { isHex, u8aToHex } from '@polkadot/util';
+import { Keyring } from "@polkadot/keyring";
+import { isHex, u8aToHex } from "@polkadot/util";
+import { ProviderApi } from "@prosopo/api";
+import { ProsopoApiError, ProsopoContractError, getLogger, } from "@prosopo/common";
+import { NetworkNamesSchema, ProcaptchaOutputSchema, } from "@prosopo/types";
+import { decodeProcaptchaOutput } from "@prosopo/types";
+import { get } from "@prosopo/util";
 export class ProsopoServer {
     constructor(config, pair) {
         this.config = config;
@@ -16,110 +12,42 @@ export class ProsopoServer {
         this.defaultEnvironment = this.config.defaultEnvironment;
         const networkName = NetworkNamesSchema.parse(this.config.defaultNetwork);
         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;
         this.contractName = this.network.contract.name;
-        this.logger = getLogger(this.config.logLevel, '@prosopo/server');
+        this.logger = getLogger(this.config.logLevel, "@prosopo/server");
         this.keyring = new Keyring({
-            type: 'sr25519',
+            type: "sr25519",
         });
-        this.abi = JSON.parse(abiJson);
     }
-    async getProviderApi(providerUrl) {
-        return new ProviderApi(this.network, providerUrl, this.getDappContractAddress());
+    getProviderApi(providerUrl) {
+        return new ProviderApi(this.network, providerUrl, this.dappContractAddress || "");
     }
-    getDappContractAddress() {
-        if (!this.dappContractAddress) {
-            return getZeroAddress(this.getApi()).toString();
-        }
-        return this.dappContractAddress;
-    }
-    async isReady() {
-        try {
-            this.api = await ApiPromise.create({ provider: this.wsProvider, initWasm: false, noInitWarn: true });
-            await this.getSigner();
-            await this.getContractApi();
-        }
-        catch (error) {
-            throw new ProsopoEnvError('GENERAL.ENVIRONMENT_NOT_READY', { context: { error } });
-        }
-    }
-    async getSigner() {
-        if (this.pair) {
-            if (!this.api) {
-                this.api = await ApiPromise.create({ provider: this.wsProvider, initWasm: false, noInitWarn: true });
-            }
-            await this.api.isReadyOrError;
-            try {
-                this.pair = this.keyring.addPair(this.pair);
-            }
-            catch (error) {
-                throw new ProsopoEnvError('CONTRACT.SIGNER_UNDEFINED', {
-                    context: { failedFuncName: this.getSigner.name, error },
-                });
-            }
-        }
-    }
-    getApi() {
-        if (this.api === undefined) {
-            throw new ProsopoEnvError(new Error('api undefined'));
-        }
-        return this.api;
-    }
-    getContract() {
-        if (this.contract === undefined) {
-            throw new ProsopoEnvError(new Error('contract undefined'));
-        }
-        return this.contract;
-    }
-    async checkRandomProvider(user, dapp, providerUrl, blockNumber) {
-        const block = await this.getApi().rpc.chain.getBlockHash(blockNumber);
-        const getRandomProviderResponse = await this.getContract().queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
-        if (trimProviderUrl(getRandomProviderResponse.provider.url.toString()) === providerUrl) {
-            return getRandomProviderResponse.provider;
-        }
-        return undefined;
-    }
-    async verifyContract(user, maxVerifiedTime) {
-        try {
-            const contractApi = await this.getContractApi();
-            this.logger.info('Provider URL not provided. Verifying with contract.');
-            const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value
-                .unwrap()
-                .unwrap()
-                .before.valueOf();
-            const recent = await verifyRecency((await this.getContractApi()).api, correctCaptchaBlockNumber, maxVerifiedTime);
-            if (!recent) {
-                this.logger.info('User has not completed a captcha recently');
-                return false;
-            }
-            const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
-                .unwrap()
-                .unwrap();
-            this.logger.info('isHuman', isHuman);
-            return isHuman;
-        }
-        catch (error) {
-            this.logger.error(error);
-            return false;
-        }
-    }
-    async verifyProvider(token, blockNumber, timeouts, providerUrl, challenge) {
-        this.logger.info('Verifying with provider.');
+    async verifyProvider(token, blockNumber, timeouts, providerUrl, timestamp, challenge) {
+        this.logger.info("Verifying with provider.");
         const blockNumberString = blockNumber.toString();
         const dappUserSignature = this.pair?.sign(blockNumberString);
         if (!dappUserSignature) {
-            throw new ProsopoContractError('CAPTCHA.INVALID_BLOCK_NO', { context: { error: 'Block number not found' } });
+            throw new ProsopoContractError("CAPTCHA.INVALID_BLOCK_NO", {
+                context: { error: "Block number not found" },
+            });
         }
         const signatureHex = u8aToHex(dappUserSignature);
         const providerApi = await this.getProviderApi(providerUrl);
         if (challenge) {
+            const powTimeout = this.config.timeouts.pow.cachedTimeout;
+            const recent = timestamp ? Date.now() - timestamp < powTimeout : false;
+            if (!recent) {
+                this.logger.error("PoW captcha is not recent");
+                return false;
+            }
             const result = await providerApi.submitPowCaptchaVerify(token, signatureHex, timeouts.pow.cachedTimeout);
             return result.verified;
         }
-        const recent = await verifyRecency((await this.getContractApi()).api, blockNumber, timeouts.image.cachedTimeout);
+        const imageTimeout = this.config.timeouts.image.cachedTimeout;
+        const recent = timestamp ? Date.now() - timestamp < imageTimeout : false;
         if (!recent) {
+            this.logger.error("Image captcha is not recent");
             return false;
         }
         const result = await providerApi.verifyDappUser(token, signatureHex, timeouts.image.cachedTimeout);
@@ -127,21 +55,17 @@ export class ProsopoServer {
     }
     async isVerified(token) {
         if (!isHex(token)) {
-            this.logger.error('Invalid token - not hex', token);
+            this.logger.error("Invalid token - not hex", token);
             return false;
         }
         const payload = decodeProcaptchaOutput(token);
-        const { user, providerUrl, blockNumber, challenge } = ProcaptchaOutputSchema.parse(payload);
-        if (providerUrl && blockNumber) {
-            return await this.verifyProvider(token, blockNumber, this.config.timeouts, providerUrl, challenge);
+        const { providerUrl, blockNumber, challenge, timestamp } = ProcaptchaOutputSchema.parse(payload);
+        if (providerUrl) {
+            return await this.verifyProvider(token, blockNumber, this.config.timeouts, providerUrl, Number(timestamp), challenge);
         }
-        else {
-            return await this.verifyContract(user, this.config.timeouts.contract.maxVerifiedTime);
-        }
-    }
-    async getContractApi() {
-        this.contract = new ProsopoCaptchaContract(this.getApi(), this.abi, this.prosopoContractAddress, this.contractName, 0, this.pair);
-        return this.contract;
+        throw new ProsopoApiError("API.BAD_REQUEST", {
+            context: { message: "No provider URL" },
+        });
     }
 }
 //# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAIH,kBAAkB,EAClB,sBAAsB,GAGzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE3C,OAAO,EAAoB,oBAAoB,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACrH,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,WAAW,IAAI,OAAO,EAAE,MAAM,yCAAyC,CAAA;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEhD,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,CAAA;QACtD,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;SAClB,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,sBAAsB,EAAE,CAAC,CAAA;IACpF,CAAC;IAEM,sBAAsB;QACzB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC3B,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;SAClD;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI;YACA,IAAI,CAAC,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;YACpG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACtB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;SAC9B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,eAAe,CAAC,+BAA+B,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;SACrF;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,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;aACvG;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,KAAK,EAAE;gBACZ,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE;oBACnD,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;iBAC1D,CAAC,CAAA;aACL;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;IAaD,KAAK,CAAC,mBAAmB,CAAC,IAAY,EAAE,IAAY,EAAE,WAAmB,EAAE,WAAmB;QAC1F,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAErE,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,YAAY,CACnE,KAAK,EACL,yBAAyB,EACzB,CAAC,IAAI,EAAE,IAAI,CAAC,CACf,CAAA;QACD,IAAI,eAAe,CAAC,yBAAyB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,WAAW,EAAE;YACpF,OAAO,yBAAyB,CAAC,QAAQ,CAAA;SAC5C;QAED,OAAO,SAAS,CAAA;IACpB,CAAC;IASM,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,eAAuB;QAC7D,IAAI;YACA,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAA;YACvE,MAAM,yBAAyB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;iBACjG,MAAM,EAAE;iBACR,MAAM,EAAE;iBACR,MAAM,CAAC,OAAO,EAAE,CAAA;YACrB,MAAM,MAAM,GAAG,MAAM,aAAa,CAC9B,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,EACjC,yBAAyB,EACzB,eAAe,CAClB,CAAA;YACD,IAAI,CAAC,MAAM,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;gBAC7D,OAAO,KAAK,CAAA;aACf;YACD,MAAM,OAAO,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK;iBACvG,MAAM,EAAE;iBACR,MAAM,EAAE,CAAA;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACpC,OAAO,OAAO,CAAA;SACjB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAExB,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAWM,KAAK,CAAC,cAAc,CACvB,KAAa,EACb,WAAmB,EACnB,QAA8B,EAC9B,WAAmB,EACnB,SAAkB;QAElB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;QAC5C,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAA;QAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAC5D,IAAI,CAAC,iBAAiB,EAAE;YACpB,MAAM,IAAI,oBAAoB,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,EAAE,CAAC,CAAA;SAC/G;QACD,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAA;QAEhD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAC1D,IAAI,SAAS,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAExG,OAAO,MAAM,CAAC,QAAQ,CAAA;SACzB;QACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAEhH,IAAI,CAAC,MAAM,EAAE;YAET,OAAO,KAAK,CAAA;SACf;QACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAElG,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAOM,KAAK,CAAC,UAAU,CAAC,KAAsB;QAC1C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;YACnD,OAAO,KAAK,CAAA;SACf;QAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAA;QAE7C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAE3F,IAAI,WAAW,IAAI,WAAW,EAAE;YAc5B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;SACrG;aAAM;YAEH,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;SACxF;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":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAGL,eAAe,EACf,oBAAoB,EAEpB,SAAS,GACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,kBAAkB,EAClB,sBAAsB,GAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,MAAM,OAAO,aAAa;IAWxB,YAAY,MAAiC,EAAE,IAAkB;QAC/D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACzD,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC5D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/C,IAAI,CAAC,MAAM,GAAG,SAAS,CACrB,IAAI,CAAC,MAAM,CAAC,QAA+B,EAC3C,iBAAiB,CAClB,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC;YACzB,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,WAAW,CACpB,IAAI,CAAC,OAAO,EACZ,WAAW,EACX,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAC/B,CAAC;IACJ,CAAC;IAYM,KAAK,CAAC,cAAc,CACzB,KAAa,EACb,WAAmB,EACnB,QAA8B,EAC9B,WAAmB,EACnB,SAAiB,EACjB,SAAkB;QAElB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,oBAAoB,CAAC,0BAA0B,EAAE;gBACzD,OAAO,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE;aAC7C,CAAC,CAAC;SACJ;QACD,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAEjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,SAAS,EAAE;YACb,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC;YAC1D,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;YACvE,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBAC/C,OAAO,KAAK,CAAC;aACd;YACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,sBAAsB,CACrD,KAAK,EACL,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,aAAa,CAC3B,CAAC;YACF,OAAO,MAAM,CAAC,QAAQ,CAAC;SACxB;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC;QAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACzE,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjD,OAAO,KAAK,CAAC;SACd;QACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,CAC7C,KAAK,EACL,YAAY,EACZ,QAAQ,CAAC,KAAK,CAAC,aAAa,CAC7B,CAAC;QACF,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAOM,KAAK,CAAC,UAAU,CAAC,KAAsB;QAC5C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YACpD,OAAO,KAAK,CAAC;SACd;QAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAE9C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,GACtD,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAExC,IAAI,WAAW,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,cAAc,CAC9B,KAAK,EACL,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,QAAQ,EACpB,WAAW,EACX,MAAM,CAAC,SAAS,CAAC,EACjB,SAAS,CACV,CAAC;SACH;QAED,MAAM,IAAI,eAAe,CAAC,iBAAiB,EAAE;YAC3C,OAAO,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE;SACxC,CAAC,CAAC;IACL,CAAC;CACF"}

package/package.json

@@ -1,55 +1,51 @@
 {
-    "name": "@prosopo/server",
-    "version": "1.0.1",
-    "description": "NodeJS package for server side communication with the prosopo captcha client",
-    "main": "./dist/index.js",
-    "type": "module",
-    "engines": {
-        "node": ">=18",
-        "npm": ">=9"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/cjs/index.cjs"
-        }
-    },
-    "scripts": {
-        "test": "echo \"No test specified\"",
-        "clean": "tsc --build --clean",
-        "build": "tsc --build --verbose tsconfig.json",
-        "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
-        "eslint:fix": "npm run eslint -- --fix",
-        "prettier": "npx prettier . --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
-        "prettier:fix": "npm run prettier -- --write",
-        "lint": "npm run eslint && npm run prettier",
-        "lint:fix": "npm run eslint:fix && npm run prettier:fix"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/prosopo/captcha.git"
-    },
-    "author": "PROSOPO LIMITED",
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/prosopo/captcha/issues"
-    },
-    "homepage": "https://github.com/prosopo/captcha#readme",
-    "sideEffects": false,
-    "dependencies": {
-        "@polkadot/api": "10.13.1",
-        "@polkadot/keyring": "12.6.2",
-        "@polkadot/rpc-provider": "10.13.1",
-        "@prosopo/api": "1.0.1",
-        "@prosopo/common": "1.0.1",
-        "@prosopo/contract": "1.0.1",
-        "@prosopo/captcha-contract": "1.0.1",
-        "@prosopo/util": "1.0.1",
-        "@prosopo/types": "1.0.1"
-    },
-    "devDependencies": {
-        "tslib": "2.6.2",
-        "typescript": "5.1.6"
-    }
+	"name": "@prosopo/server",
+	"version": "2.0.0",
+	"description": "NodeJS package for server side communication with the prosopo captcha client",
+	"main": "./dist/index.js",
+	"type": "module",
+	"engines": {
+		"node": ">=20",
+		"npm": ">=9"
+	},
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/cjs/index.cjs"
+		}
+	},
+	"scripts": {
+		"test": "echo \"No test specified\"",
+		"clean": "tsc --build --clean",
+		"build": "tsc --build --verbose",
+		"build:cjs": "npx vite --config vite.cjs.config.ts build"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/prosopo/captcha.git"
+	},
+	"author": "PROSOPO LIMITED",
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/prosopo/captcha/issues"
+	},
+	"homepage": "https://github.com/prosopo/captcha#readme",
+	"sideEffects": false,
+	"dependencies": {
+		"@polkadot/api": "10.13.1",
+		"@polkadot/keyring": "12.6.2",
+		"@polkadot/rpc-provider": "10.13.1",
+		"@polkadot/util": "12.6.2",
+		"@prosopo/api": "2.0.0",
+		"@prosopo/common": "2.0.0",
+		"@prosopo/contract": "2.0.0",
+
+		"@prosopo/util": "2.0.0",
+		"@prosopo/types": "2.0.0"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.0.0",
+		"tslib": "2.6.2",
+		"typescript": "5.1.6"
+	}
 }

package/vite.cjs.config.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,9 +12,8 @@
 // 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 { ViteCommonJSConfig } from '@prosopo/config'
-import path from 'path'
+import { ViteCommonJSConfig } from "@prosopo/config";
 
 export default function () {
-    return ViteCommonJSConfig('server', path.resolve('./tsconfig.cjs.json'))
+	return ViteCommonJSConfig("server", path.resolve("./tsconfig.cjs.json"));
 }

package/typedoc.config.js

@@ -1,19 +0,0 @@
-// Copyright 2021-2024 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.
-export default {
-    entryPoints: ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.js', 'src/**/*.jsx', 'src/**/*.json'],
-    includes: 'src',
-    extends: '../../typedoc.base.config.js',
-    readme: 'README.md',
-}