@prosopo/provider 0.3.5 → 0.3.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/provider",
-    "version": "0.3.5",
+    "version": "0.3.37",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -21,9 +21,9 @@
         "build:cjs": "npx vite --config vite.cjs.config.ts build",
         "build:debug": "tsc --build --verbose",
         "build:config": "tsc --project",
+        "test": "npx vitest run --config ./vite.test.config.ts",
         "mnemonic": "ts-node ./scripts/generateMnemonic.ts",
         "coverage": "npx c8 npm run test",
-        "populate-data": "ts-node ./tests/dataUtils/populateDatabase.ts",
         "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
         "eslint:fix": "npm run eslint -- --fix",
         "prettier": "npx prettier . --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
@@ -37,21 +37,21 @@
         "@polkadot/types": "10.11.2",
         "@polkadot/util": "12.6.2",
         "@polkadot/util-crypto": "12.6.2",
-        "@prosopo/captcha-contract": "0.3.5",
-        "@prosopo/common": "0.3.5",
-        "@prosopo/config": "0.3.5",
-        "@prosopo/contract": "0.3.5",
-        "@prosopo/database": "0.3.5",
-        "@prosopo/datasets": "0.3.5",
-        "@prosopo/env": "0.3.5",
-        "@prosopo/types": "0.3.5",
-        "@prosopo/types-database": "0.3.5",
-        "@prosopo/types-env": "0.3.5",
+        "@prosopo/captcha-contract": "0.3.37",
+        "@prosopo/common": "0.3.37",
+        "@prosopo/config": "0.3.37",
+        "@prosopo/contract": "0.3.37",
+        "@prosopo/database": "0.3.37",
+        "@prosopo/datasets": "0.3.37",
+        "@prosopo/env": "0.3.37",
+        "@prosopo/tx": "0.3.37",
+        "@prosopo/types": "0.3.37",
+        "@prosopo/types-database": "0.3.37",
+        "@prosopo/types-env": "0.3.37",
         "cron": "^2.1.0",
         "cron-parser": "^4.5.0",
         "express": "^4.18.1",
         "jsonwebtoken": "^9.0.1",
-        "nodejs-polars": "^0.6.0",
         "yargs": "^17.5.1",
         "yargs-parser": "^21.0.1"
     },
@@ -64,9 +64,9 @@
         "c8": "^7.11.3",
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
+        "dotenv": "^16.0.1",
         "fs-extra": "^10.1.0",
         "sinon": "^15.2.0",
-        "ts-node": "^10.9.1",
         "tslib": "2.6.2",
         "typescript": "5.1.6"
     },
@@ -74,7 +74,7 @@
         "type": "git",
         "url": "git+ssh://git@github.com/prosopo/provider.git"
     },
-    "description": "> NOTE: The easiest way to deploy the Prosopo contract and run the Provider node is via the [integration repository](https://github.com/prosopo/captcha/). The following instructions explain how to set up the repositories manually.",
+    "description": "The easiest way to deploy the Prosopo contract and run the Provider node is via the [captcha repository](https://github.com/prosopo/captcha/).",
     "bugs": {
         "url": "https://github.com/prosopo/captcha/issues"
     },

package/vite.test.config.ts

@@ -0,0 +1,32 @@
+// 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.
+import { ViteTestConfig } from '@prosopo/config'
+import dotenv from 'dotenv'
+import fs from 'fs'
+import path from 'path'
+process.env.NODE_ENV = 'test'
+// if .env.test exists at this level, use it, otherwise use the one at the root
+const envFile = `.env.${process.env.NODE_ENV || 'development'}`
+let envPath = envFile
+if (fs.existsSync(envFile)) {
+    envPath = path.resolve(envFile)
+} else if (fs.existsSync(`../../${envFile}`)) {
+    envPath = path.resolve(`../../${envFile}`)
+} else {
+    throw new Error(`No ${envFile} file found`)
+}
+
+dotenv.config({ path: envPath })
+
+export default ViteTestConfig

package/dist/cjs/tasks/calculateSolutions.cjs

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const types = require("@prosopo/types");
-const common = require("@prosopo/common");
-const tasks = require("./tasks.cjs");
-const util = require("../util.cjs");
-const datasets = require("@prosopo/datasets");
-class CalculateSolutionsTask extends tasks.Tasks {
-  constructor(env) {
-    super(env);
-    this.logger = common.getLogger(env.config.logLevel, "CalculateSolutionsTask");
-  }
-  /**
-   * Apply new captcha solutions to captcha dataset and recalculate merkle tree
-   */
-  async run() {
-    try {
-      const taskRunning = await util.checkIfTaskIsRunning(types.ScheduledTaskNames.CalculateSolution, this.db);
-      if (!taskRunning) {
-        const provider = (await this.contract.methods.getProvider(this.contract.pair.address, {})).value.unwrap().unwrap();
-        const unsolvedCaptchas = await this.db.getAllCaptchasByDatasetId(
-          provider.datasetId.toString(),
-          types.CaptchaStates.Unsolved
-        );
-        if (!unsolvedCaptchas) {
-          return 0;
-        }
-        const unsolvedSorted = unsolvedCaptchas.sort(datasets.captchaSort);
-        this.logger.info(`There are ${unsolvedSorted.length} unsolved CAPTCHA challenges`);
-        const requiredNumberOfSolutions = this.captchaSolutionConfig.requiredNumberOfSolutions;
-        const winningPercentage = this.captchaSolutionConfig.solutionWinningPercentage;
-        const winningNumberOfSolutions = Math.round(requiredNumberOfSolutions * (winningPercentage / 100));
-        if (unsolvedSorted && unsolvedSorted.length > 0) {
-          const captchaIds = unsolvedSorted.map((captcha) => captcha.captchaId);
-          const solutions = await this.db.getAllDappUserSolutions(captchaIds) || [];
-          const solutionsToUpdate = util.calculateNewSolutions(solutions, winningNumberOfSolutions);
-          if (solutionsToUpdate.rows().length > 0) {
-            this.logger.info(
-              `There are ${solutionsToUpdate.rows().length} CAPTCHA challenges to update with solutions`
-            );
-            try {
-              const captchaIdsToUpdate = [...solutionsToUpdate["captchaId"].values()];
-              const commitmentIds = solutions.filter((s) => captchaIdsToUpdate.indexOf(s.captchaId) > -1).map((s) => s.commitmentId);
-              const dataset = await this.db.getDataset(provider.datasetId.toString());
-              dataset.captchas = util.updateSolutions(solutionsToUpdate, dataset.captchas, this.logger);
-              await this.providerSetDataset(dataset);
-              await this.db.flagProcessedDappUserSolutions(captchaIdsToUpdate);
-              await this.db.flagProcessedDappUserCommitments(commitmentIds);
-              await this.db.removeCaptchas(captchaIdsToUpdate);
-              return solutionsToUpdate.rows().length;
-            } catch (error) {
-              this.logger.error(error);
-            }
-          }
-          return 0;
-        } else {
-          this.logger.info(`There are no CAPTCHA challenges that require their solutions to be updated`);
-          return 0;
-        }
-      }
-      return 0;
-    } catch (error) {
-      throw new common.ProsopoEnvError("GENERAL.CALCULATE_CAPTCHA_SOLUTION", { context: { error } });
-    }
-  }
-}
-exports.CalculateSolutionsTask = CalculateSolutionsTask;

package/dist/tasks/calculateSolutions.d.ts

@@ -1,7 +0,0 @@
-import { ProviderEnvironment } from '@prosopo/types-env';
-import { Tasks } from './tasks.js';
-export declare class CalculateSolutionsTask extends Tasks {
-    constructor(env: ProviderEnvironment);
-    run(): Promise<number>;
-}
-//# sourceMappingURL=calculateSolutions.d.ts.map

package/dist/tasks/calculateSolutions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateSolutions.d.ts","sourceRoot":"","sources":["../../src/tasks/calculateSolutions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGlC,qBAAa,sBAAuB,SAAQ,KAAK;gBACjC,GAAG,EAAE,mBAAmB;IAQ9B,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;CAoE/B"}

package/dist/tasks/calculateSolutions.js

@@ -1,65 +0,0 @@
-import { CaptchaStates } from '@prosopo/types';
-import { ProsopoEnvError, getLogger } from '@prosopo/common';
-import { ScheduledTaskNames } from '@prosopo/types';
-import { Tasks } from './tasks.js';
-import { calculateNewSolutions, checkIfTaskIsRunning, updateSolutions } from '../util.js';
-import { captchaSort } from '@prosopo/datasets';
-export class CalculateSolutionsTask extends Tasks {
-    constructor(env) {
-        super(env);
-        this.logger = getLogger(env.config.logLevel, 'CalculateSolutionsTask');
-    }
-    async run() {
-        try {
-            const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.CalculateSolution, this.db);
-            if (!taskRunning) {
-                const provider = (await this.contract.methods.getProvider(this.contract.pair.address, {})).value
-                    .unwrap()
-                    .unwrap();
-                const unsolvedCaptchas = await this.db.getAllCaptchasByDatasetId(provider.datasetId.toString(), CaptchaStates.Unsolved);
-                if (!unsolvedCaptchas) {
-                    return 0;
-                }
-                const unsolvedSorted = unsolvedCaptchas.sort(captchaSort);
-                this.logger.info(`There are ${unsolvedSorted.length} unsolved CAPTCHA challenges`);
-                const requiredNumberOfSolutions = this.captchaSolutionConfig.requiredNumberOfSolutions;
-                const winningPercentage = this.captchaSolutionConfig.solutionWinningPercentage;
-                const winningNumberOfSolutions = Math.round(requiredNumberOfSolutions * (winningPercentage / 100));
-                if (unsolvedSorted && unsolvedSorted.length > 0) {
-                    const captchaIds = unsolvedSorted.map((captcha) => captcha.captchaId);
-                    const solutions = (await this.db.getAllDappUserSolutions(captchaIds)) || [];
-                    const solutionsToUpdate = calculateNewSolutions(solutions, winningNumberOfSolutions);
-                    if (solutionsToUpdate.rows().length > 0) {
-                        this.logger.info(`There are ${solutionsToUpdate.rows().length} CAPTCHA challenges to update with solutions`);
-                        try {
-                            const captchaIdsToUpdate = [...solutionsToUpdate['captchaId'].values()];
-                            const commitmentIds = solutions
-                                .filter((s) => captchaIdsToUpdate.indexOf(s.captchaId) > -1)
-                                .map((s) => s.commitmentId);
-                            const dataset = await this.db.getDataset(provider.datasetId.toString());
-                            dataset.captchas = updateSolutions(solutionsToUpdate, dataset.captchas, this.logger);
-                            await this.providerSetDataset(dataset);
-                            await this.db.flagProcessedDappUserSolutions(captchaIdsToUpdate);
-                            await this.db.flagProcessedDappUserCommitments(commitmentIds);
-                            await this.db.removeCaptchas(captchaIdsToUpdate);
-                            return solutionsToUpdate.rows().length;
-                        }
-                        catch (error) {
-                            this.logger.error(error);
-                        }
-                    }
-                    return 0;
-                }
-                else {
-                    this.logger.info(`There are no CAPTCHA challenges that require their solutions to be updated`);
-                    return 0;
-                }
-            }
-            return 0;
-        }
-        catch (error) {
-            throw new ProsopoEnvError('GENERAL.CALCULATE_CAPTCHA_SOLUTION', { context: { error } });
-        }
-    }
-}
-//# sourceMappingURL=calculateSolutions.js.map

package/dist/tasks/calculateSolutions.js.map

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